X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R017-Open-Box.el;h=8e600669386f1ea91c7681024f2733e4372c7a57;hb=b2b5a8475ddaa7fc3b5e909273cf0e3caf7ff1ef;hp=a5ed419d7f3ce19651176d074d41689f8f32905f;hpb=f86390529d8ff5a626ee64d9c30f53ffcbfdc6c9;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el
index a5ed419..8e60066 100644
--- a/lisp/utf-2000/Ideograph-R017-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el
@@ -1,430 +1,531 @@
 (define-char
-  '((ucs		. #x51F5)
-    (morohashi-daikanwa	1800)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (japanese-jisx0208-1978	#x51 #x61)	; ø»ƒƒ 
-    (chinese-gb2312		#x5B #x49)	; ø»…›¸
-    (japanese-jisx0208		#x51 #x61)	; ø»‡—¨
-    (chinese-cns11643-2		#x21 #x23)	; ø»“Œ¢
-    (ideograph-daikanwa		#x07 #x08)	; 凵
-    ))
-(define-char
-  '((morohashi-daikanwa	1801)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x5161)	; ø»ƒƒ 
+    (chinese-gb2312		. #x5B49)	; ø»…›¸
+    (japanese-jisx0208		. #x5161)	; ø»‡—¨
+    (chinese-isoir165		. #x5B49)	; ø»Ž„ˆ
+    (chinese-cns11643-2		. #x2123)	; ø»“Œ¢
+    (japanese-jisx0208-1990	. #x5161)	; ø½Š½œ
+    (chinese-big5		. #xC942)	; øº¡¥†
+    (ideograph-daikanwa		. 01800)	; ø¸€œˆ
+    (ucs			. #x51F5)	; 凵
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (ideograph-daikanwa #x07 #x09)	; ø¹œ‰
+    (ideograph-daikanwa . 01801)	; ø¸€œ‰
     ))
 (define-char
-  '((morohashi-daikanwa	1801 0 \?)
+  '((morohashi-daikanwa	1801 0 9)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (chinese-cns11643-5 #x21 #x29)	; ø»™ª´
+    (chinese-cns11643-5 . #x2129)	; ø»™ª´
     ))
 (define-char
-  '((morohashi-daikanwa	1802)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (chinese-cns11643-4 #x21 #x2E)	; ø»— µ
-    (ideograph-daikanwa #x07 #x0A)	; ø»— µ
+    (chinese-cns11643-4 . #x212E)	; ø»— µ
+    (ideograph-daikanwa . 01802)	; ø¸€œŠ
     ))
 (define-char
-  '((ucs		. #x51F6)
-    (morohashi-daikanwa	1803)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     (:cdp-combinator	3
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+		 (ucs		     . #x2FF6)	; ⿶
+		 )
+      )
+     ((ucs		  . #x51F5)	; 凵
+      )
+     ((chinese-big5-cdp	  . #x8B49)	; 
+      ))
     (shinjigen-1	. 578)
     (shinjigen-2	. 578)
-    (japanese-jisx0208-1978	#x36 #x27)	; ø»‚š¼
-    (chinese-gb2312		#x50 #x57)	; ø»…‹¼
-    (japanese-jisx0208		#x36 #x27)	; ø»†¯„
-    (chinese-cns11643-1		#x44 #x7E)	; ø»‘·“
-    (ideograph-daikanwa		#x07 #x0B)	; 凶
-    ))
-(define-char
-  '((morohashi-daikanwa	1804)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x3627)	; ø»‚š¼
+    (chinese-gb2312		. #x5057)	; ø»…‹¼
+    (japanese-jisx0208		. #x3627)	; ø»†¯„
+    (korean-ksc5601		. #x7D55)	; ø»Š¢ˆ
+    (chinese-isoir165		. #x5057)	; ø»´Œ
+    (chinese-cns11643-1		. #x447E)	; ø»‘·“
+    (japanese-jisx0208-1990	. #x3627)	; ø½Š”¸
+    (chinese-big5		. #xA4BF)	; øºŸ£´
+    (ideograph-daikanwa		. 01803)	; ø¸€œ‹
+    (ucs			. #x51F6)	; 凶
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-cns11643-5 #x21 #x39)	; ø»™«„
-    (ideograph-daikanwa #x07 #x0C)	; ø»™«„
+    (chinese-cns11643-5 . #x2139)	; ø»™«„
+    (ideograph-daikanwa . 01804)	; ø¸€œŒ
     ))
 (define-char
-  '((morohashi-daikanwa	1805)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-cns11643-6 #x21 #x53)	; ø»›µ¢
-    (ideograph-daikanwa #x07 #x0D)	; ø»›µ¢
+    (chinese-cns11643-6 . #x2153)	; ø»›µ¢
+    (ideograph-daikanwa . 01805)	; ø¸€œ
     ))
 (define-char
-  '((morohashi-daikanwa	1806)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-cns11643-6 #x21 #x54)	; ø»›µ£
-    (ideograph-daikanwa #x07 #x0E)	; ø»›µ£
+    (chinese-cns11643-6 . #x2154)	; ø»›µ£
+    (ideograph-daikanwa . 01806)	; ø¸€œŽ
     ))
 (define-char
-  '((ucs		. #x51F7)
-    (morohashi-daikanwa	1807)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (ucs		  . #x2FF6)	; ⿶
+      )
+     ((ucs		  . #x51F5)	; 凵
+      )
+     ((ucs		  . #x53C8)	; 又
+      ))
+    (ideograph-cbeta	. 04552)	; ø¸¡‡ˆ
+    (mojikyo		. 070631)	; ý €‘§
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (japanese-jisx0212	#x33 #x2F)	; ø»Š¾º
-    (chinese-cns11643-4 #x21 #x60)	; ø»—¡§
-    (ideograph-daikanwa #x07 #x0F)	; 凷
-    ))
-(define-char
-  '((morohashi-daikanwa	1808)
-    (ideographic-radical . 17)	; ⼐
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (ucs		  . #x2FF6)	; ⿶
+      )
+     ((ucs		  . #x51F5)	; 凵
+      )
+     ((ucs		  . #x571F)	; 土
+      ))
+    (japanese-jisx0212	. #x332F)	; ø»Š¾º
+    (chinese-cns11643-4 . #x2160)	; ø»—¡§
+    (ideograph-daikanwa . 01807)	; ø¸€œ
+    (ideograph-cbeta	. 00631)	; ø¸ ‰·
+    (ucs		. #x51F7)	; 凷
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-6 #x22 #x3F)	; ø»›¶¬
-    (ideograph-daikanwa #x07 #x10)	; ø»›¶¬
+    (chinese-cns11643-6 . #x223F)	; ø»›¶¬
+    (ideograph-daikanwa . 01808)	; ø¸€œ
     ))
 (define-char
-  '((ucs		. #x51F8)
-    (morohashi-daikanwa	1809)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (shinjigen-1	. 583)
     (shinjigen-2	. 583)
-    (japanese-jisx0208-1978	#x46 #x4C)	; ø»‚³
-    (chinese-gb2312		#x4D #x39)	; ø»…‡„
-    (japanese-jisx0208		#x46 #x4C)	; ø»‡‡‰
-    (chinese-cns11643-1		#x45 #x79)	; ø»‘¸¬
-    (ideograph-daikanwa		#x07 #x11)	; 凸
-    ))
-(define-char
-  '((ucs		. #x51F9)
-    (morohashi-daikanwa	1810)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x464C)	; ø»‚³
+    (chinese-gb2312		. #x4D39)	; ø»…‡„
+    (japanese-jisx0208		. #x464C)	; ø»‡‡‰
+    (korean-ksc5601		. #x7448)	; ø»Š”­
+    (chinese-isoir165		. #x4D39)	; ø»¯”
+    (chinese-cns11643-1		. #x4579)	; ø»‘¸¬
+    (japanese-jisx0208-1990	. #x464C)	; ø½Š¬½
+    (chinese-big5		. #xA559)	; øºŸ¥
+    (ideograph-daikanwa		. 01809)	; ø¸€œ‘
+    (ucs			. #x51F8)	; 凸
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (shinjigen-1	. 580)
     (shinjigen-2	. 580)
-    (japanese-jisx0208-1978	#x31 #x7A)	; ø»‚”¹
-    (chinese-gb2312		#x30 #x3C)	; ø»„œ¡
-    (japanese-jisx0208		#x31 #x7A)	; ø»†©
-    (chinese-cns11643-1		#x45 #x77)	; ø»‘¸ª
-    (ideograph-daikanwa		#x07 #x12)	; 凹
-    ))
-(define-char
-  '((ucs		. #x51FA)
-    (morohashi-daikanwa	1811)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x317A)	; ø»‚”¹
+    (chinese-gb2312		. #x303C)	; ø»„œ¡
+    (japanese-jisx0208		. #x317A)	; ø»†©
+    (korean-ksc5601		. #x686A)	; ø»Šƒ§
+    (chinese-isoir165		. #x303C)	; ø»„±
+    (chinese-cns11643-1		. #x4577)	; ø»‘¸ª
+    (japanese-jisx0208-1990	. #x317A)	; ø½ŠŽµ
+    (chinese-big5		. #xA557)	; øºŸ¥‹
+    (ideograph-daikanwa		. 01810)	; ø¸€œ’
+    (ucs			. #x51F9)	; 凹
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #x5C6E)	; å±®
+      )
+     ((ucs		  . #x51F5)	; 凵
+      ))
     (shinjigen-1	. 581)
     (shinjigen-2	. 581)
-    (japanese-jisx0208-1978	#x3D #x50)	; ø»‚¥·
-    (chinese-gb2312		#x33 #x76)	; ø»„¡µ
-    (japanese-jisx0208		#x3D #x50)	; ø»†¹¿
-    (chinese-cns11643-1		#x45 #x78)	; ø»‘¸«
-    (ideograph-daikanwa		#x07 #x13)	; 出
-    ))
-(define-char
-  '((morohashi-daikanwa	1812)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x3D50)	; ø»‚¥·
+    (chinese-gb2312		. #x3376)	; ø»„¡µ
+    (japanese-jisx0208		. #x3D50)	; ø»†¹¿
+    (korean-ksc5601		. #x7573)	; ø»Š–¶
+    (chinese-isoir165		. #x3376)	; ø»Š…
+    (chinese-cns11643-1		. #x4578)	; ø»‘¸«
+    (japanese-jisx0208-1990	. #x3D50)	; ø½ŠŸ³
+    (chinese-big5		. #xA558)	; øºŸ¥Œ
+    (ideograph-daikanwa		. 01811)	; ø¸€œ“
+    (ucs			. #x51FA)	; 出
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-5 #x21 #x54)	; ø»™«Ÿ
-    (ideograph-daikanwa #x07 #x14)	; ø»™«Ÿ
+    (chinese-cns11643-5 . #x2154)	; ø»™«Ÿ
+    (ideograph-daikanwa . 01812)	; ø¸€œ”
     ))
 (define-char
-  '((morohashi-daikanwa	1813)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-6 #x22 #x3E)	; ø»›¶«
-    (ideograph-daikanwa #x07 #x15)	; ø»›¶«
+    (chinese-cns11643-6 . #x223E)	; ø»›¶«
+    (ideograph-daikanwa . 01813)	; ø¸€œ•
     ))
 (define-char
-  '((ucs		. #x51FB)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (non-morohashi	1813 9)
-    (chinese-gb2312	#x3B #x77)	; ø»„­¦
+    (chinese-gb2312	. #x3B77)	; ø»„­¦
+    (chinese-isoir165	. #x3B77)	; ø»•¶
+    (ucs		. #x51FB)	; 击
     ))
 (define-char
-  '((morohashi-daikanwa	1814)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 #x23 #x65)	; ø»›¸°
-    (ideograph-daikanwa #x07 #x16)	; ø»›¸°
+    (ideograph-daikanwa . 01814)	; ø¸€œ–
     ))
 (define-char
-  '((morohashi-daikanwa	1815)
+  '((morohashi-daikanwa	1814 0 1)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 #x23 #x61)	; ø»›¸¬
-    (ideograph-daikanwa #x07 #x17)	; ø»›¸¬
+    (chinese-cns11643-6 . #x2365)	; ø»›¸°
     ))
 (define-char
-  '((morohashi-daikanwa	1816)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 #x23 #x62)	; ø»›¸­
-    (ideograph-daikanwa #x07 #x18)	; ø»›¸­
+    (ideograph-daikanwa . 01815)	; ø¸€œ—
     ))
 (define-char
-  '((morohashi-daikanwa	1817)
+  '((morohashi-daikanwa	1815 0 1)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 #x23 #x63)	; ø»›¸®
-    (ideograph-daikanwa #x07 #x19)	; ø»›¸®
+    (chinese-cns11643-6 . #x2361)	; ø»›¸¬
     ))
 (define-char
-  '((morohashi-daikanwa	1818)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-5 #x22 #x2A)	; ø»™¬“
-    (ideograph-daikanwa #x07 #x1A)	; ø»™¬“
+    (chinese-cns11643-6 . #x2362)	; ø»›¸­
+    (ideograph-daikanwa . 01816)	; ø¸€œ˜
     ))
 (define-char
-  '((morohashi-daikanwa	1819)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa #x07 #x1B)	; ø¹œ›
+    (ideograph-daikanwa . 01817)	; ø¸€œ™
     ))
 (define-char
-  '((morohashi-daikanwa	1820)
+  '((morohashi-daikanwa	1817 0 0)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa #x07 #x1C)	; ø¹œœ
+    (chinese-cns11643-6 . #x2363)	; ø»›¸®
     ))
 (define-char
-  '((morohashi-daikanwa	1821)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (chinese-cns11643-5 . #x222A)	; ø»™¬“
+    (ideograph-daikanwa . 01818)	; ø¸€œš
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideograph-daikanwa . 01819)	; ø¸€œ›
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideograph-daikanwa . 01820)	; ø¸€œœ
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa #x07 #x1D)	; ø¹œ
+    (ideograph-daikanwa . 01821)	; ø¸€œ
     ))
 (define-char
-  '((morohashi-daikanwa	1822)
+  '((=>ucs		. #x342B)	; 㐫
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-3 #x23 #x23)	; ø»•™¢
-    (ideograph-daikanwa #x07 #x1E)	; ø»•™¢
+    (ideograph-daikanwa . 01822)	; ø¸€œž
     ))
 (define-char
-  '((ucs		. #x51FC)
+  '((morohashi-daikanwa	1822 0 8)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (chinese-cns11643-3 . #x2323)	; ø»•™¢
+    (ucs		. #x342B)	; 㐫
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (chinese-cns11643-6 . #x2364)	; ø»›¸¯
+    (ideograph-daikanwa . 48936)	; ø¸‹¼¨
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 4)
+    (kangxi-radical	 . 85)	; ⽔
+    (kangxi-strokes	 . 2)
+    (total-strokes	 . 6)
     (non-morohashi	1822 9)
-    (chinese-gb2312	#x5B #x4A)	; ø»…›¹
+    (chinese-gb2312	. #x5B4A)	; ø»…›¹
+    (chinese-isoir165	. #x5B4A)	; ø»Ž„‰
+    (ucs		. #x51FC)	; 凼
     ))
 (define-char
-  '((morohashi-daikanwa	1823)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (ideograph-daikanwa #x07 #x1F)	; ø¹œŸ
+    (ideograph-daikanwa . 01823)	; ø¸€œŸ
     ))
 (define-char
-  '((morohashi-daikanwa	1824)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (ideograph-daikanwa #x07 #x20)	; ø¹œ 
+    (ideograph-daikanwa . 01824)	; ø¸€œ 
     ))
 (define-char
-  '((morohashi-daikanwa	1825)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-6 #x26 #x28)	; ø»›¼
-    (ideograph-daikanwa #x07 #x21)	; ø»›¼
+    (chinese-cns11643-6 . #x2628)	; ø»›¼
+    (ideograph-daikanwa . 01825)	; ø¸€œ¡
     ))
 (define-char
-  '((ucs		. #x51FD)
-    (morohashi-daikanwa	1826)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (shinjigen-1	. 584)
     (shinjigen-2	. 584)
-    (japanese-jisx0208-1978	#x48 #x21)	; ø»‚µ’
-    (chinese-gb2312		#x3A #x2F)	; ø»„«€
-    (japanese-jisx0208		#x48 #x21)	; ø»‡‰š
-    (chinese-cns11643-1		#x4C #x2A)	; ø»’¯
-    (ideograph-daikanwa		#x07 #x22)	; 函
-    ))
-(define-char
-  '((morohashi-daikanwa	1827)
-    (ideographic-radical . 17)	; ⼐
+    (japanese-jisx0208-1978	. #x4821)	; ø»‚µ’
+    (chinese-gb2312		. #x3A2F)	; ø»„«€
+    (japanese-jisx0208		. #x4821)	; ø»‡‰š
+    (korean-ksc5601		. #x795E)	; ø»Šœ™
+    (chinese-isoir165		. #x3A2F)	; ø»“
+    (chinese-cns11643-1		. #x4C2A)	; ø»’¯
+    (japanese-jisx0208-1990	. #x4821)	; ø½Š¯Ž
+    (chinese-big5		. #xA8E7)	; øºŸ®
+    (ideograph-daikanwa		. 01826)	; ø¸€œ¢
+    (ucs			. #x51FD)	; 函
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 #x29 #x5F)	; ø»œž
-    (ideograph-daikanwa #x07 #x23)	; ø»œž
+    (chinese-cns11643-6 . #x295F)	; ø»œž
+    (ideograph-daikanwa . 01827)	; ø¸€œ£
     ))
 (define-char
-  '((morohashi-daikanwa	1828)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (ideograph-daikanwa #x07 #x24)	; ø¹œ¤
+    (ideograph-daikanwa . 01828)	; ø¸€œ¤
     ))
 (define-char
-  '((morohashi-daikanwa	1829)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 #x29 #x60)	; ø»œŸ
-    (ideograph-daikanwa #x07 #x25)	; ø»œŸ
+    (chinese-cns11643-6 . #x2960)	; ø»œŸ
+    (ideograph-daikanwa . 01829)	; ø¸€œ¥
     ))
 (define-char
-  '((ucs		. #x51FE)
-    (morohashi-daikanwa	1830)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (comment		. "S1-0584 (函) の俗ø»†·­")
+    (<-vulgar-ideograph
+     (:sources	(shinjigen-1)
+      :char	((shinjigen-1	     . 584)
+		 (ideograph-daikanwa . 01826)	; ø¸€œ¢
+		 )
+      ))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (ucs		  . #x2FF6)	; ⿶
+      )
+     ((ucs		  . #x51F5)	; 凵
+      )
+     ((ucs		  . #x4E9F)	; 亟
+      ))
     (shinjigen-1	. 586)
     (shinjigen-2	. 586)
-    (japanese-jisx0208-1978	#x51 #x62)	; ø»ƒƒ¡
-    (japanese-jisx0208		#x51 #x62)	; ø»‡—©
-    (ideograph-daikanwa		#x07 #x26)	; 凾
+    (japanese-jisx0208-1978	. #x5162)	; ø»ƒƒ¡
+    (japanese-jisx0208		. #x5162)	; ø»‡—©
+    (japanese-jisx0208-1990	. #x5162)	; ø½Š½
+    (ideograph-daikanwa		. 01830)	; ø¸€œ¦
+    (ideograph-cbeta		. 00630)	; ø¸ ‰¶
+    (ucs			. #x51FE)	; 凾
     ))
 (define-char
-  '((->ucs		. #x51FE)
+  '((=>ucs		. #x51FE)	; 凾
     (morohashi-daikanwa	1830 0 1)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-3		#x27 #x5A)	; ø»• ‘
-    ))
-(define-char
-  '((morohashi-daikanwa	1831)
-    (ideographic-radical . 17)	; ⼐
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (ucs		  . #x2FF6)	; ⿶
+      )
+     ((ucs		  . #x51F5)	; 凵
+      )
+     ((ucs		  . #x4E9F)	; 亟
+      ))
+    (chinese-cns11643-3 . #x275A)	; ø»• ‘
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 #x2E #x73)	; ø»œ‰ˆ
-    (ideograph-daikanwa #x07 #x27)	; ø»œ‰ˆ
+    (chinese-cns11643-6 . #x2E73)	; ø»œ‰ˆ
+    (ideograph-daikanwa . 01831)	; ø¸€œ§
     ))
 (define-char
-  '((morohashi-daikanwa	1832)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 #x2E #x74)	; ø»œ‰‰
-    (ideograph-daikanwa #x07 #x28)	; ø»œ‰‰
+    (chinese-cns11643-6 . #x2E74)	; ø»œ‰‰
+    (ideograph-daikanwa . 01832)	; ø¸€œ¨
     ))
 (define-char
-  '((morohashi-daikanwa	1833)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 #x35 #x48)	; ø»œ’¯
-    (ideograph-daikanwa #x07 #x29)	; ø»œ’¯
+    (chinese-cns11643-6 . #x3548)	; ø»œ’¯
+    (ideograph-daikanwa . 01833)	; ø¸€œ©
     ))
 (define-char
-  '((morohashi-daikanwa	1834)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 #x3D #x44)	; ø»œž›
-    (ideograph-daikanwa #x07 #x2A)	; ø»œž›
+    (chinese-cns11643-6 . #x3D44)	; ø»œž›
+    (ideograph-daikanwa . 01834)	; ø¸€œª
     ))
 (define-char
-  '((morohashi-daikanwa	1835)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 #x3D #x45)	; ø»œžœ
-    (ideograph-daikanwa #x07 #x2B)	; ø»œžœ
+    (chinese-cns11643-6 . #x3D45)	; ø»œžœ
+    (ideograph-daikanwa . 01835)	; ø¸€œ«
     ))
 (define-char
-  '((morohashi-daikanwa	1836)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-5 #x36 #x5D)	; ø»šŠž
-    (ideograph-daikanwa #x07 #x2C)	; ø»šŠž
+    (ideograph-daikanwa . 01836)	; ø¸€œ¬
     ))
 (define-char
-  '((ucs		. #x51FF)
+  '((morohashi-daikanwa	1836 0 2)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (chinese-cns11643-5 . #x365D)	; ø»šŠž
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
     (non-morohashi	1836 9)
-    (chinese-gb2312	#x54 #x64)	; ø»…’
+    (chinese-gb2312	. #x5464)	; ø»…’
+    (chinese-isoir165	. #x5464)	; ø»º‘
+    (ucs		. #x51FF)	; 凿
     ))
 (define-char
-  '((morohashi-daikanwa	1837)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 #x5A #x7E)	; ø»‰»
-    (ideograph-daikanwa #x07 #x2D)	; ø»‰»
+    (chinese-cns11643-6 . #x5A7E)	; ø»‰»
+    (ideograph-daikanwa . 01837)	; ø¸€œ­
     ))
 (define-char
-  '((morohashi-daikanwa	1838)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (ideograph-daikanwa #x07 #x2E)	; ø¹œ®
+    (ideograph-daikanwa . 01838)	; ø¸€œ®
     ))
 (define-char
-  '((morohashi-daikanwa	1839)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 #x36 #x7B)	; ø»žŸ„
-    (ideograph-daikanwa #x07 #x2F)	; ø»žŸ„
+    (ideograph-daikanwa . 01839)	; ø¸€œ¯
     ))
 (define-char
-  '((morohashi-daikanwa	1840)
+  '((morohashi-daikanwa	1839 0 1)
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-5 #x5A #x76)	; ø»š¿¯
-    (ideograph-daikanwa #x07 #x30)	; ø»š¿¯
+    (chinese-cns11643-7 . #x367B)	; ø»žŸ„
     ))
 (define-char
-  '((morohashi-daikanwa	1841)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-5 #x5A #x75)	; ø»š¿®
-    (ideograph-daikanwa #x07 #x31)	; ø»š¿®
+    (ideograph-daikanwa . 01840)	; ø¸€œ°
     ))
 (define-char
-  '((morohashi-daikanwa	1842)
+  '((morohashi-daikanwa	1840 0 2)
     (ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (chinese-cns11643-5 . #x5A76)	; ø»š¿¯
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (chinese-cns11643-5 . #x5A75)	; ø»š¿®
+    (ideograph-daikanwa . 01841)	; ø¸€œ±
+    ))
+(define-char
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
-    (ideograph-daikanwa #x07 #x32)	; ø¹œ²
+    (ideograph-daikanwa . 01842)	; ø¸€œ²
     ))
 (define-char
-  '((morohashi-daikanwa	1843)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 17)
     (total-strokes	 . 19)
-    (chinese-cns11643-5 #x67 #x54)	; ø»›’“
-    (ideograph-daikanwa #x07 #x33)	; ø»›’“
+    (chinese-cns11643-5 . #x6754)	; ø»›’“
+    (ideograph-daikanwa . 01843)	; ø¸€œ³
     ))
 (define-char
-  '((morohashi-daikanwa	1844)
-    (ideographic-radical . 17)	; ⼐
+  '((ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
-    (ideograph-daikanwa #x07 #x34)	; ø¹œ´
+    (ideograph-daikanwa . 01844)	; ø¸€œ´
     ))