X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R030-Mouth.el;h=a49e646f0c4a3d7c7e3153e1e5090b0bf5dc1fdc;hb=52838d5d5614c339626bec4abba4699995150678;hp=a0badc8ce4c9eb1f0a55f76bdd6f0e3bc112dab8;hpb=c7d8e22758b61dad509b977db7b0edea6dd15cff;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index a0badc8..a49e646 100644
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -316,7 +316,8 @@
     (ucs			. #x53F3)	; 右
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x53FD)	; 叽
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (chinese-cns11643-4 . #x216A)	; ø»—¡±
@@ -510,7 +511,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (non-morohashi	3270 9)
     (chinese-gb2312	. #x5F34)	; ø»…¡›
     (chinese-isoir165	. #x5F34)	; ø»Ž‰«
     (ucs		. #x53FD)	; 叽
@@ -1497,11 +1497,18 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (chinese-cns11643-1 . #x4946)	; ø»‘½±
     (ideograph-daikanwa . 03365)	; ø¸€´¥
     (ucs		. #x5433)	; 吳
     ))
 (define-char
+  '((->ucs		. #x5433)	; 吳
+    (morohashi-daikanwa	3365 0 0)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-cns11643-1 . #x4946)	; ø»‘½±
+    ))
+(define-char
   '((morohashi-daikanwa	3365 1)
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
@@ -1509,7 +1516,7 @@
     (japanese-jisx0208-1978	. #x3862)	; ø»‚ž³
     (japanese-jisx0208		. #x3862)	; ø»†²»
     (japanese-jisx0208-1990	. #x3862)	; ø½Š˜¯
-    (mojikyo			. 050117)	; ø¸Œ…
+    (mojikyo			. 050117)	; ý €Œ…
     (ucs			. #x5449)	; 呉
     ))
 (define-char
@@ -1519,6 +1526,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-3 . #x247C)	; ø»•œ™
+    (mojikyo		. 059172)	; ý €Žœ¤
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -1585,7 +1593,8 @@
     (ucs		. #x5437)	; 吷
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x5438)	; 吸
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-1 . #x494E)	; ø»‘½¹
@@ -1602,7 +1611,7 @@
     (chinese-isoir165		. #x4E7C)	; ø»±µ
     (chinese-cns11643-6		. #x264E)	; ø»›¼³
     (japanese-jisx0208-1990	. #x355B)	; ø½Š”Ž
-    (mojikyo			. 050118)	; ø¸Œ†
+    (mojikyo			. 050118)	; ý €Œ†
     (ucs			. #x5438)	; 吸
     ))
 (define-char
@@ -1715,7 +1724,7 @@
     (chinese-isoir165		. #x3866)	; ø»‘‹
     (chinese-cns11643-1		. #x494B)	; ø»‘½¶
     (japanese-jisx0208-1990	. #x3970)	; ø½Šš›
-    (mojikyo			. 050119)	; ø¸Œ‡
+    (mojikyo			. 050119)	; ý €Œ‡
     (ucs			. #x544A)	; 告
     ))
 (define-char
@@ -1760,6 +1769,8 @@
     (total-strokes	 . 7)
     (chinese-cns11643-4 . #x235C)	; ø»—¤Ÿ
     (ideograph-daikanwa . 03385)	; ø¸€´¹
+    (mojikyo		. 003385)	; ý €€´¹
+    (ucs		. #x549E)	; 咞
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -2078,25 +2089,6 @@
     (ucs		. #x544F)	; 呏
     ))
 (define-char
-  '((morohashi-daikanwa	3424 7 9)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (chinese-gb2312	. #x4445)	; ø»„º‚
-    (chinese-isoir165	. #x4445)	; ø»¢’
-    (chinese-cns11643-3 . #x247D)	; ø»•œš
-    (ucs		. #x5450)	; 呐
-    ))
-(define-char
-  '((morohashi-daikanwa	3424 8 9)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (chinese-gb2312	. #x5F3C)	; ø»…¡£
-    (chinese-isoir165	. #x5F3C)	; ø»Ž‰³
-    (ucs		. #x5452)	; 呒
-    ))
-(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -2104,6 +2096,7 @@
     (chinese-cns11643-3		. #x2522)	; ø»•œ
     (japanese-jisx0208-1990	. #x465D)	; ø½Š­Ž
     (ideograph-daikanwa		. 48970)	; ø¸‹½Š
+    (ucs			. #x5451)	; 呑
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -2116,13 +2109,24 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
-    (ucs		. #x5451)	; 呑
+    (total-strokes	 . 7)
+    (chinese-gb2312	. #x4445)	; ø»„º‚
+    (chinese-isoir165	. #x4445)	; ø»¢’
+    (chinese-cns11643-3 . #x247D)	; ø»•œš
+    (ucs		. #x5450)	; 呐
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-gb2312	. #x5F3C)	; ø»…¡£
+    (chinese-isoir165	. #x5F3C)	; ø»Ž‰³
+    (ucs		. #x5452)	; 呒
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 0)
     (chinese-gb2312	. #x5F3D)	; ø»…¡¤
     (chinese-isoir165	. #x5F3D)	; ø»Ž‰´
     (ucs		. #x5453)	; 呓
@@ -2131,7 +2135,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 1)
     (chinese-gb2312	. #x5F3E)	; ø»…¡¥
     (chinese-isoir165	. #x5F3E)	; ø»Ž‰µ
     (chinese-cns11643-2 . #x233B)	; ø»“¶
@@ -2141,7 +2144,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 2)
     (chinese-gb2312		. #x453B)	; ø»„»–
     (chinese-isoir165		. #x453B)	; ø»£¦
     (japanese-jisx0213-2	. #x2364)	; ø»¤ ¿
@@ -2151,7 +2153,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 3)
     (chinese-gb2312	. #x5F3F)	; ø»…¡¦
     (chinese-isoir165	. #x5F3F)	; ø»Ž‰¶
     (ucs		. #x5456)	; 呖
@@ -2160,7 +2161,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 4)
     (chinese-gb2312	. #x5F42)	; ø»…¡©
     (chinese-isoir165	. #x5F42)	; ø»Ž‰¹
     (ucs		. #x5457)	; 呗
@@ -2169,7 +2169,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 5)
     (chinese-gb2312	. #x5431)	; ø»…‘Ž
     (chinese-isoir165	. #x5431)	; ø»¹ž
     (ucs		. #x5458)	; 员
@@ -2178,7 +2177,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 6)
     (chinese-gb2312	. #x5F43)	; ø»…¡ª
     (chinese-isoir165	. #x5F43)	; ø»Ž‰º
     (ucs		. #x5459)	; 呙
@@ -2187,7 +2185,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 8)
     (chinese-gb2312	. #x473A)	; ø»„¾‘
     (chinese-isoir165	. #x473A)	; ø»¦¡
     (ucs		. #x545B)	; 呛
@@ -2196,7 +2193,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (non-morohashi	3424 9 9)
     (chinese-gb2312	. #x4E58)	; ø»…‰
     (chinese-isoir165	. #x4E58)	; ø»±‘
     (ucs		. #x545C)	; 呜
@@ -2395,16 +2391,24 @@
     (chinese-isoir165		. #x565C)	; ø»½…
     (chinese-cns11643-1		. #x4C52)	; ø»’‚—
     (japanese-jisx0208-1990	. #x3C7E)	; ø½ŠŸƒ
-    (mojikyo			. 050120)	; ø¸Œˆ
+    (mojikyo			. 050120)	; ý €Œˆ
     (ucs			. #x5468)	; 周
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x5469)	; 呩
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (japanese-jisx0212	. #x3479)	; ø»‹¢
     (chinese-cns11643-3 . #x2774)	; ø»• «
     (ideograph-daikanwa . 03442)	; ø¸€µ²
+    ))
+(define-char
+  '((morohashi-daikanwa	3442 0 1)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (japanese-jisx0212	. #x3479)	; ø»‹¢
+    (mojikyo		. 003442)	; ý €€µ²
     (ucs		. #x5469)	; 呩
     ))
 (define-char
@@ -3195,22 +3199,30 @@
     (ideograph-daikanwa . 03524)	; ø¸€·„
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((morohashi-daikanwa	ho 64)
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (chinese-cns11643-3 . #x2772)	; ø»• ©
-    (ideograph-daikanwa . 48258)	; ø¸‹²‚
+    (ideographic-variants
+     ((char . ((ucs		   . #x54A4)	; 咤
+	       ))
+      ))
+    (japanese-jisx0212		. #x352A)	; ø»‹±
+    (japanese-jisx0213-1	. #x2E78)	; ø»¢§™
+    (mojikyo			. 050005)	; ý €Œ•
+    (ucs			. #x549C)	; 咜
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (mojikyo		. 059178)	; ý €Žœª
     (ucs		. #x5497)	; 咗
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (non-morohashi	3524 9 0)
     (chinese-cns11643-2 . #x256C)	; ø»““£
     (ucs		. #x5498)	; 咘
     ))
@@ -3218,7 +3230,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (non-morohashi	3524 9 1)
     (chinese-gb2312	. #x417C)	; ø»„¶Ÿ
     (chinese-isoir165	. #x417C)	; ø»ž¯
     (ucs		. #x5499)	; 咙
@@ -3227,7 +3238,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (non-morohashi	3524 9 2)
     (chinese-gb2312	. #x5F4B)	; ø»…¡²
     (chinese-isoir165	. #x5F4B)	; ø»ŽŠ‚
     (chinese-cns11643-1 . #x4C50)	; ø»’‚•
@@ -3237,7 +3247,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (non-morohashi	3524 9 3)
     (chinese-gb2312	. #x5F4C)	; ø»…¡³
     (chinese-isoir165	. #x5F4C)	; ø»ŽŠƒ
     (ucs		. #x549B)	; 咛
@@ -3246,28 +3255,33 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (comment		. "<variant> of &M#54A4;")
-    (non-morohashi	3524 9 4)
-    (japanese-jisx0212		. #x352A)	; ø»‹±
-    (japanese-jisx0213-1	. #x2E78)	; ø»¢§™
-    (ucs			. #x549C)	; 咜
+    (chinese-gb2312	. #x5F50)	; ø»…¡·
+    (chinese-isoir165	. #x5F50)	; ø»ŽŠ‡
+    (ucs		. #x549D)	; 咝
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x9EFE)	; 黾
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (non-morohashi	3524 9 5)
-    (chinese-gb2312	. #x5F50)	; ø»…¡·
-    (chinese-isoir165	. #x5F50)	; ø»ŽŠ‡
-    (ucs		. #x549D)	; 咝
+    (->mojikyo		. 051084)	; 黾
+    (ucs-radical	. 205)
+    (chinese-cns11643-3 . #x2772)	; ø»• ©
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x549E)	; 咞
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (chinese-cns11643-3 . #x2B5C)	; ø»•¦‹
     (ideograph-daikanwa . 03525)	; ø¸€·…
-    (ucs		. #x549E)	; 咞
+    ))
+(define-char
+  '((->ucs		. #x549E)	; 咞
+    (morohashi-daikanwa	3525 0 1)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (chinese-cns11643-3 . #x2B5C)	; ø»•¦‹
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -4242,8 +4256,21 @@
     (ucs		. #x54CF)	; 哏
     ))
 (define-char
-  '((morohashi-daikanwa	3629 4 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (chinese-cns11643-5 . #x2843)	; ø»™µ 
+    (ideograph-daikanwa . 48972)	; ø¸‹½Œ
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (chinese-cns11643-6 . #x2F53)	; ø»œŠ†
+    (ideograph-daikanwa . 48973)	; ø¸‹½
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-gb2312	. #x5F51)	; ø»…¡¸
@@ -4252,8 +4279,7 @@
     (ucs		. #x54D0)	; 哐
     ))
 (define-char
-  '((morohashi-daikanwa	3629 5 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-gb2312	. #x5F55)	; ø»…¡¼
@@ -4261,8 +4287,7 @@
     (ucs		. #x54D2)	; 哒
     ))
 (define-char
-  '((morohashi-daikanwa	3629 6 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-gb2312	. #x5F58)	; ø»…¡¿
@@ -4270,8 +4295,7 @@
     (ucs		. #x54D3)	; 哓
     ))
 (define-char
-  '((morohashi-daikanwa	3629 7 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-gb2312	. #x5F59)	; ø»…¢€
@@ -4279,8 +4303,7 @@
     (ucs		. #x54D4)	; 哔
     ))
 (define-char
-  '((morohashi-daikanwa	3629 8 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-gb2312	. #x5F5C)	; ø»…¢ƒ
@@ -4291,21 +4314,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (chinese-cns11643-5 . #x2843)	; ø»™µ 
-    (ideograph-daikanwa . 48972)	; ø¸‹½Œ
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F53)	; ø»œŠ†
-    (ideograph-daikanwa . 48973)	; ø¸‹½
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (non-morohashi	3629 9 0)
     (chinese-cns11643-2 . #x2945)	; ø»“˜´
     (ucs		. #x54D6)	; 哖
     ))
@@ -4313,7 +4321,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 1)
     (chinese-gb2312	. #x3B29)	; ø»„¬˜
     (chinese-isoir165	. #x3B29)	; ø»”¨
     (ucs		. #x54D7)	; 哗
@@ -4322,7 +4329,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 2)
     (japanese-jisx0208-1978	. #x5326)	; ø»ƒ…¡
     (japanese-jisx0208		. #x5326)	; ø»‡™©
     (ucs			. #x54D8)	; 哘
@@ -4331,7 +4337,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 3)
     (chinese-gb2312	. #x5F60)	; ø»…¢‡
     (chinese-isoir165	. #x5F60)	; ø»ŽŠ—
     (ucs		. #x54D9)	; 哙
@@ -4340,7 +4345,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 4)
     (chinese-gb2312	. #x5F61)	; ø»…¢ˆ
     (chinese-isoir165	. #x5F61)	; ø»ŽŠ˜
     (chinese-cns11643-3 . #x2B58)	; ø»•¦‡
@@ -4350,14 +4354,13 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 5)
+    (mojikyo		. 059181)	; ý €Žœ­
     (ucs		. #x54DB)	; 哛
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 6)
     (chinese-gb2312	. #x5F62)	; ø»…¢‰
     (chinese-isoir165	. #x5F62)	; ø»ŽŠ™
     (ucs		. #x54DC)	; 哜
@@ -4366,7 +4369,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 7)
     (chinese-gb2312	. #x5F66)	; ø»…¢
     (chinese-isoir165	. #x5F66)	; ø»ŽŠ
     (ucs		. #x54DD)	; 哝
@@ -4375,7 +4377,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 8)
     (chinese-gb2312	. #x5F68)	; ø»…¢
     (chinese-isoir165	. #x5F68)	; ø»ŽŠŸ
     (chinese-cns11643-2 . #x294F)	; ø»“˜¾
@@ -4385,7 +4386,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (non-morohashi	3629 9 9)
     (chinese-gb2312	. #x5334)	; ø»…³
     (chinese-isoir165	. #x5334)	; ø»¸ƒ
     (ucs		. #x54DF)	; 哟
@@ -4397,12 +4397,19 @@
     (chinese-cns11643-6 . #x2F51)	; ø»œŠ„
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((->ucs		. #x54E0)	; 哠
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x353D)	; ø»‹‚„
-    (chinese-cns11643-2 . #x2E46)	; ø»“ ‹
     (ideograph-daikanwa . 03630)	; ø¸€¸®
+    ))
+(define-char
+  '((morohashi-daikanwa	3630 0 2)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x2E46)	; ø»“ ‹
     (ucs		. #x54E0)	; 哠
     ))
 (define-char
@@ -5236,14 +5243,15 @@
     (japanese-jisx0208-1978	. #x4562)	; ø»‚±¹
     (japanese-jisx0208		. #x4562)	; ø»‡†
     (japanese-jisx0208-1990	. #x4562)	; ø½Š«µ
-    (mojikyo			. 050121)	; ø¸Œ‰
+    (mojikyo			. 050121)	; ý €Œ‰
     ))
 (define-char
   '((->ucs		. #x5510)	; 唐
-    (morohashi-daikanwa	3709 1 1)
+    (morohashi-daikanwa	3709 1 0)
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (->mojikyo		. 050121)	; ø»‚±¹
     (chinese-cns11643-6 . #x357E)	; ø»œ“¥
     ))
 (define-char
@@ -6983,8 +6991,21 @@
     (ideograph-daikanwa . 03883)	; ø¸€¼«
     ))
 (define-char
-  '((morohashi-daikanwa	3883 2 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-5 . #x3141)	; ø»š‚¬
+    (ideograph-daikanwa . 48976)	; ø¸‹½
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-4 . #x306F)	; ø»—·¸
+    (ucs		. #x35B5)	; 㖵
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-gb2312	. #x5F75)	; ø»…¢œ
@@ -6992,23 +7013,20 @@
     (ucs		. #x5567)	; 啧
     ))
 (define-char
-  '((morohashi-daikanwa	3883 3 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-3 . #x3459)	; ø»•³–
     (ucs		. #x5568)	; 啨
     ))
 (define-char
-  '((morohashi-daikanwa	3883 4 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (ucs		. #x5569)	; 啩
     ))
 (define-char
-  '((morohashi-daikanwa	3883 5 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-gb2312	. #x453E)	; ø»„»™
@@ -7017,8 +7035,7 @@
     (ucs		. #x556A)	; 啪
     ))
 (define-char
-  '((morohashi-daikanwa	3883 6 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (kangxi-radical	 . 24)	; ⼗
     (kangxi-strokes	 . 9)
@@ -7028,8 +7045,7 @@
     (ucs		. #x556C)	; 啬
     ))
 (define-char
-  '((morohashi-daikanwa	3883 7 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-gb2312	. #x5F79)	; ø»…¢ 
@@ -7037,8 +7053,7 @@
     (ucs		. #x556D)	; 啭
     ))
 (define-char
-  '((morohashi-daikanwa	3883 8 9)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (kangxi-strokes	 . 11)
     (total-strokes	 . 11)
@@ -7048,24 +7063,9 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (chinese-cns11643-5 . #x3141)	; ø»š‚¬
-    (ideograph-daikanwa . 48976)	; ø¸‹½
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (chinese-cns11643-4 . #x306F)	; ø»—·¸
-    (ucs		. #x35B5)	; 㖵
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
     (kangxi-radical	 . 122)	; â½¹
     (kangxi-strokes	 . 3)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 0)
     (chinese-isoir165	. #x2F7D)	; ø»„”
     (ucs		. #x5570)	; 啰
     ))
@@ -7073,28 +7073,27 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 1)
+    (mojikyo		. 059209)	; ý €Ž‰
     (ucs		. #x5571)	; 啱
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 2)
+    (mojikyo		. 059210)	; ý €ŽŠ
     (ucs		. #x5572)	; 啲
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 3)
+    (mojikyo		. 059211)	; ý €Ž‹
     (ucs		. #x5573)	; 啳
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 4)
     (chinese-isoir165	. #x2C38)	; ø»Œ¾µ
     (ucs		. #x5574)	; 啴
     ))
@@ -7102,7 +7101,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 5)
     (chinese-gb2312	. #x6023)	; ø»…¢¨
     (chinese-isoir165	. #x6023)	; ø»ŽŠ¸
     (chinese-cns11643-2 . #x3374)	; ø»“¨
@@ -7112,7 +7110,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 6)
     (chinese-gb2312	. #x6024)	; ø»…¢©
     (chinese-isoir165	. #x6024)	; ø»ŽŠ¹
     (chinese-cns11643-2 . #x3375)	; ø»“¨
@@ -7122,7 +7119,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 8)
     (chinese-gb2312	. #x5025)	; ø»…‹Š
     (chinese-isoir165	. #x5025)	; ø»³š
     (ucs		. #x5578)	; 啸
@@ -7131,7 +7127,7 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (non-morohashi	3883 9 9)
+    (mojikyo		. 059213)	; ý €Ž
     (ucs		. #x5579)	; 啹
     ))
 (define-char
@@ -8232,29 +8228,68 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-1 . #x5E56)	; ø»’œ·
     (ideograph-daikanwa . 03987)	; ø¸€¾“
+    (mojikyo		. 003987)	; ý €€¾“
+    ))
+(define-char
+  '((->ucs		. #x55AB)	; 喫
+    (morohashi-daikanwa	3987 0 1)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (mojikyo		. 059224)	; ý €Ž˜
+    ))
+(define-char
+  '((->ucs		. #x55AB)	; 喫
+    (morohashi-daikanwa	3987 0 1 0)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x5E56)	; ø»’œ·
+    (mojikyo		. 059290)	; ý €Žžš
     ))
 (define-char
-  '((morohashi-daikanwa	3987 1)
+  '((morohashi-daikanwa	3987 0 2)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (mojikyo		. 053220)	; ý €Œ¿¤
+    (ucs		. #x55AB)	; 喫
+    ))
+(define-char
+  '((->ucs		. #x55AB)	; 喫
+    (morohashi-daikanwa	3987 1)
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0208-1978	. #x354A)	; ø»‚š
     (japanese-jisx0208		. #x354A)	; ø»†®‰
-    (chinese-cns11643-6		. #x4731)	; ø»œ¬´
     (japanese-jisx0208-1990	. #x354A)	; ø½Š“½
-    (mojikyo			. 050122)	; ø¸ŒŠ
-    (ucs			. #x55AB)	; 喫
+    (mojikyo			. 050122)	; ý €ŒŠ
+    ))
+(define-char
+  '((->ucs		. #x55AB)	; 喫
+    (morohashi-daikanwa	3987 1 1)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (->mojikyo		. 050122)	; ø»‚š
+    (chinese-cns11643-6 . #x4731)	; ø»œ¬´
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x473C)	; ø»œ¬¿
     (ideograph-daikanwa . 03988)	; ø¸€¾”
     ))
 (define-char
+  '((morohashi-daikanwa	3988 0 1)
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-6 . #x473C)	; ø»œ¬¿
+    ))
+(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8571,7 +8606,6 @@
     (ideographic-strokes . 9)
     (kangxi-strokes	 . 8)
     (total-strokes	 . 12)
-    (non-morohashi	3883 9 7)
     (chinese-gb2312	. #x6025)	; ø»…¢ª
     (chinese-isoir165	. #x6025)	; ø»ŽŠº
     (chinese-cns11643-2 . #x3A4E)	; ø»“±»
@@ -8581,7 +8615,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (non-morohashi	4025 9 0)
     (chinese-gb2312	. #x4567)	; ø»„¼‚
     (chinese-isoir165	. #x4567)	; ø»¤’
     (ucs		. #x55B7)	; 喷
@@ -9748,7 +9781,7 @@
     (japanese-jisx0208-1978	. #x4332)	; ø»‚®
     (japanese-jisx0208		. #x4332)	; ø»‡‚•
     (japanese-jisx0208-1990	. #x4332)	; ø½Š¨‰
-    (mojikyo			. 050123)	; ø¸Œ‹
+    (mojikyo			. 050123)	; ý €Œ‹
     ))
 (define-char
   '((->ucs		. #x5606)	; 嘆
@@ -11596,7 +11629,7 @@
     (ideograph-daikanwa . 04321)	; ø¸ƒ¡
     ))
 (define-char
-  '((morohashi-daikanwa	4321 0 *)
+  '((morohashi-daikanwa	4321 0 0)
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
@@ -11845,24 +11878,12 @@
     (japanese-jisx0208		. #x346F)	; ø»†­
     (chinese-cns11643-4		. #x4932)	; ø»˜›©
     (japanese-jisx0208-1990	. #x346F)	; ø½Š“„
-    (mojikyo			. 050124)	; ø¸ŒŒ
-    ))
-(define-char
-  '((morohashi-daikanwa	4349 1 2)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (->mojikyo		. 050124)	; ø»‚™ˆ
-    (chinese-gb2312	. #x4677)	; ø»„½°
-    (chinese-isoir165	. #x4677)	; ø»¦€
-    (chinese-cns11643-1 . #x7042)	; ø»’¶¿
-    (ucs		. #x5668)	; 器
+    (mojikyo			. 050124)	; ý €ŒŒ
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (non-morohashi	4349 9 0)
     (chinese-gb2312	. #x6060)	; ø»…£¥
     (chinese-isoir165	. #x6060)	; ø»Ž‹µ
     (ucs		. #x565C)	; 噜
@@ -11871,7 +11892,7 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (non-morohashi	4349 9 1)
+    (mojikyo		. 053232)	; ý €Œ¿°
     (ucs		. #x565D)	; 噝
     ))
 (define-char
@@ -12137,8 +12158,13 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-gb2312		. #x4677)	; ø»„½°
+    (chinese-isoir165		. #x4677)	; ø»¦€
+    (chinese-cns11643-1		. #x7042)	; ø»’¶¿
     (japanese-jisx0213-1	. #x2F36)	; ø»¢§µ
     (ideograph-daikanwa		. 04376)	; ø¸„˜
+    (ucs			. #x5668)	; 器
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝