added spanish font & prepositions; removed some trailing spaces

svn-id: r8549

2 files changed, 524 insertions, 389 deletions

diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 777eb5d4ca..bf6598e8cf 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -96,7 +96,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) {
 	int pos = 0;
 	int width = 1;
 	byte chr;
-	int oldID = getCurID(); 
+	int oldID = getCurID();
 
 	while ((chr = text[pos++]) != 0) {
 		if (chr == 0xD)
@@ -139,7 +139,7 @@ void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
 	int lastspace = -1;
 	int curw = 1;
 	byte chr;
-	int oldID = getCurID(); 
+	int oldID = getCurID();
 
 	while ((chr = str[pos++]) != 0) {
 		if (chr == '@')
@@ -333,397 +333,529 @@ static byte englishCharsetDataV2[] = {
 // German Zak font
 static byte germanCharsetDataV2[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00, 
-	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00, 
-	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01, 
-	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f, 
-	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
-	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 
-	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 
-	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 
-	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 
-	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 
-	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 
-	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18, 
-	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00, 
-	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, 
-	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00, 
-	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00, 
-	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 
-	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 
-	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 
-	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 
-	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00, 
-	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00, 
-	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00, 
-	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x0e, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0e, 0x00, 
-	0x7c, 0x82, 0xba, 0xa2, 0xa2, 0xba, 0x82, 0x7c, 
-	0x70, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x70, 0x00, 
-	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 
-	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00, 
-	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00, 
-	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00, 
-	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00, 
-	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00, 
-	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00, 
-	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00, 
-	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00, 
-	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00, 
-	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x66, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 
-	0x00, 0x10, 0x30, 0x7f, 0x7f, 0x30, 0x10, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 
-	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c, 
-	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00, 
-	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 
-	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00, 
-	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00, 
-	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78, 
-	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 
-	0x66, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x00, 
-	0x42, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x1c, 0x36, 0x36, 0x7c, 0x66, 0x66, 0x7c, 0x40, 
-	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08, 
+	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00,
+	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00,
+	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01,
+	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f,
+	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0,
+	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18,
+	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18,
+	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00,
+	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18,
+	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18,
+	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00,
+	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00,
+	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00,
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00,
+	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
+	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00,
+	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00,
+	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00,
+	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x0e, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0e, 0x00,
+	0x7c, 0x82, 0xba, 0xa2, 0xa2, 0xba, 0x82, 0x7c,
+	0x70, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x70, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00,
+	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00,
+	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00,
+	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00,
+	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00,
+	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00,
+	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00,
+	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00,
+	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00,
+	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00,
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x66, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00,
+	0x00, 0x10, 0x30, 0x7f, 0x7f, 0x30, 0x10, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00,
+	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c,
+	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06,
+	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00,
+	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00,
+	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00,
+	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78,
+	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00,
+	0x66, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x00,
+	0x42, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x1c, 0x36, 0x36, 0x7c, 0x66, 0x66, 0x7c, 0x40,
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
 };
 
 // French Zak font.
 static byte frenchCharsetDataV2[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00, 
-	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00, 
-	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01, 
-	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f, 
-	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
-	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 
-	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 
-	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 
-	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 
-	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 
-	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 
-	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18, 
-	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00, 
-	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, 
-	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00, 
-	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00, 
-	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 
-	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 
-	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 
-	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 
-	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00, 
-	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00, 
-	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00, 
-	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x10, 0x08, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x18, 0x24, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x3c, 0x60, 0x60, 0x3c, 0x18, 0x38, 
-	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 
-	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00, 
-	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00, 
-	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00, 
-	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00, 
-	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00, 
-	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00, 
-	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00, 
-	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00, 
-	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00, 
-	0x08, 0x10, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x18, 0x24, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 
-	0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 
-	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c, 
-	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00, 
-	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 
-	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00, 
-	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00, 
-	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78, 
-	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 
-	0x18, 0x24, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x18, 0x24, 0x00, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
-	0x10, 0x08, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x18, 0x24, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00,
+	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00,
+	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01,
+	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f,
+	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0,
+	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18,
+	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18,
+	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00,
+	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18,
+	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18,
+	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00,
+	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00,
+	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00,
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00,
+	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
+	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00,
+	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00,
+	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00,
+	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x10, 0x08, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x18, 0x24, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x3c, 0x18, 0x38,
+	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00,
+	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00,
+	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00,
+	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00,
+	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00,
+	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00,
+	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00,
+	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00,
+	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00,
+	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00,
+	0x08, 0x10, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x18, 0x24, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00,
+	0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00,
+	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c,
+	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06,
+	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00,
+	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00,
+	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00,
+	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78,
+	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00,
+	0x18, 0x24, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x18, 0x24, 0x00, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x10, 0x08, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x18, 0x24, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
 };
 
 // Italian Zak font.
 static byte italianCharsetDataV2[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00, 
-	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00, 
-	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01, 
-	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f, 
-	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
-	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 
-	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 
-	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 
-	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 
-	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 
-	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 
-	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18, 
-	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00, 
-	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, 
-	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00, 
-	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00, 
-	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 
-	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 
-	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 
-	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 
-	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00, 
-	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00, 
-	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00, 
-	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00, 
-	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
-	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 
-	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, 
-	0x10, 0x08, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x08, 0x10, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, 
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 
-	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 
-	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
-	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00, 
-	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00, 
-	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00, 
-	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00, 
-	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00, 
-	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00, 
-	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00, 
-	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00, 
-	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00, 
-	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00, 
-	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00, 
-	0x08, 0x10, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x18, 0x24, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 
-	0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
-	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 
-	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
-	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c, 
-	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c, 
-	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00, 
-	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
-	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 
-	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
-	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 
-	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 
-	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00, 
-	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
-	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00, 
-	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 
-	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78, 
-	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 
-	0x10, 0x08, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
-	0x10, 0x08, 0x00, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
-	0x10, 0x08, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x18, 0x24, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00, 
-	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00,
+	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00,
+	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01,
+	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f,
+	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0,
+	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18,
+	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18,
+	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00,
+	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18,
+	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18,
+	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00,
+	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00,
+	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00,
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00,
+	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
+	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00,
+	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00,
+	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00,
+	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x10, 0x08, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x08, 0x10, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00,
+	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00,
+	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00,
+	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00,
+	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00,
+	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00,
+	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00,
+	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00,
+	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00,
+	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00,
+	0x08, 0x10, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x10, 0x08, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x18, 0x24, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00,
+	0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00,
+	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c,
+	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06,
+	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00,
+	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00,
+	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00,
+	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78,
+	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00,
+	0x10, 0x08, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x10, 0x08, 0x00, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x10, 0x08, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x18, 0x24, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
+};
+
+// Spanish Zak font.
+static byte spanishCharsetDataV2[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00,
+	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00,
+	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01,
+	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f,
+	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0,
+	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18,
+	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18,
+	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00,
+	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18,
+	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18,
+	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00,
+	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00,
+	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00,
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00,
+	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
+	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00,
+	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00,
+	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00,
+	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00,
+	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00,
+	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x0e, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0e, 0x00,
+	0x7c, 0x82, 0xba, 0xa2, 0xa2, 0xba, 0x82, 0x7c,
+	0x70, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x70, 0x00,
+	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00,
+	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00,
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00,
+	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00,
+	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00,
+	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00,
+	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00,
+	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00,
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00,
+	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00,
+	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00,
+	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00,
+	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00,
+	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00,
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x66, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00,
+	0x00, 0x10, 0x30, 0x7f, 0x7f, 0x30, 0x10, 0x00,
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00,
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00,
+	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00,
+	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c,
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c,
+	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06,
+	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00,
+	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00,
+	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00,
+	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00,
+	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78,
+	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00,
+	0x66, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x66, 0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x00,
+	0x42, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x1c, 0x36, 0x36, 0x7c, 0x66, 0x66, 0x7c, 0x40,
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
 };
 #endif
 
@@ -739,6 +871,9 @@ void CharsetRendererV2::setCurID(byte id) {
 	case IT_ITA:
 		_fontPtr = italianCharsetDataV2;
 		break;
+	case ES_ESP:
+		_fontPtr = spanishCharsetDataV2;
+		break;
 	default:
 		_fontPtr = englishCharsetDataV2;
 		break;
@@ -752,8 +887,8 @@ void CharsetRendererV2::setCurID(byte id) {
 	//
 	int count = 0, len;
 	byte b;
-	const byte *data = italianCharsetDataV2;
-	const int size = sizeof(italianCharsetDataV2);
+	const byte *data = spanishCharsetDataV2;
+	const int size = sizeof(spanishCharsetDataV2);
 	for (int offset = 0; offset < size; offset++) {
 		if (data[offset+1] == 0x00 && data[offset+2] == 0xB2 &&
 			data[offset+5] == 0x00 && data[offset+6] == 0xB0) {
@@ -994,7 +1129,7 @@ void CharsetRendererClassic::drawBitsN(VirtScreen *vs, byte *dst, const byte *sr
 	byte numbits, bits;
 	bool useMask = (vs->number == 0 && !_ignoreCharsetMask);
 
-	assert(bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8); 
+	assert(bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8);
 	bits = *src++;
 	numbits = 8;
 
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 396156d75f..e265c1ee8d 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -946,7 +946,7 @@ void Scumm_v2::o2_drawSentence() {
 			{ " ", " dans", " avec", " sur", " <" },	// French
 			{ " ", " in", " con", " su", " a" },	// Italian
 			{ " ", " in", " with", " on", " to" },	// Portugese
-			{ " ", " in", " with", " on", " to" },	// Spanish
+			{ " ", " an", " con", " on", " a" },	// Spanish
 			{ " ", " in", " with", " on", " to" },	// Japanese
 			{ " ", " in", " with", " on", " to" },	// Chinese
 			{ " ", " in", " with", " on", " to" }	// Korean