Hi tech@,
I created a new size for Spleen, to bridge the gap between the 5x8 and
the 8x16 versions. The idea is to have something more readable than the
5x8 version while still being small enough to be usable on OLED displays.
Similar to "Spleen 5x8" it only contains the printable ASCII characters
(96 glyphes).
In order to enable and test the font, this option should be added to the
kernel configuration file: option FONT_SPLEEN6x12
Comments? OK?
Index: sys/dev/wsfont/wsfont.c
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/wsfont.c,v
retrieving revision 1.56
diff -u -p -r1.56 wsfont.c
--- sys/dev/wsfont/wsfont.c 11 Jul 2019 18:07:54 -0000 1.56
+++ sys/dev/wsfont/wsfont.c 8 Jul 2020 10:16:31 -0000
@@ -48,6 +48,11 @@
#include <dev/wsfont/spleen5x8.h>
#endif
+#ifdef FONT_SPLEEN6x12
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen6x12.h>
+#endif
+
#ifdef FONT_SPLEEN8x16
#define HAVE_FONT 1
#endif
@@ -150,17 +155,20 @@ static struct font builtin_fonts[] = {
#ifdef FONT_SPLEEN5x8
BUILTIN_FONT(spleen5x8, 4),
#endif
+#ifdef FONT_SPLEEN6x12
+ BUILTIN_FONT(spleen6x12, 5),
+#endif
#ifdef FONT_SPLEEN8x16
- BUILTIN_FONT(spleen8x16, 5),
+ BUILTIN_FONT(spleen8x16, 6),
#endif
#ifdef FONT_SPLEEN12x24
- BUILTIN_FONT(spleen12x24, 6),
+ BUILTIN_FONT(spleen12x24, 7),
#endif
#ifdef FONT_SPLEEN16x32
- BUILTIN_FONT(spleen16x32, 7),
+ BUILTIN_FONT(spleen16x32, 8),
#endif
#ifdef FONT_SPLEEN32x64
- BUILTIN_FONT(spleen32x64, 8),
+ BUILTIN_FONT(spleen32x64, 9),
#endif
#undef BUILTIN_FONT
};
Index: sys/dev/wsfont/spleen6x12.h
===================================================================
RCS file: sys/dev/wsfont/spleen6x12.h
diff -N sys/dev/wsfont/spleen6x12.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sys/dev/wsfont/spleen6x12.h 8 Jul 2020 10:16:31 -0000
@@ -0,0 +1,1294 @@
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 2018-2020 Frederic Cambus <fcam...@openbsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+static u_char spleen6x12_data[];
+
+struct wsdisplay_font spleen6x12 = {
+ .name = "Spleen 6x12",
+ .index = 0,
+ .firstchar = ' ',
+ .numchars = 128 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 6,
+ .fontheight = 12,
+ .stride = 1,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .cookie = NULL,
+ .data = spleen6x12_data
+};
+
+static u_char spleen6x12_data[] = {
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x50, /* .*.*.... */
+ 0x50, /* .*.*.... */
+ 0x50, /* .*.*.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x50, /* .*.*.... */
+ 0xf8, /* *****... */
+ 0x50, /* .*.*.... */
+ 0x50, /* .*.*.... */
+ 0x50, /* .*.*.... */
+ 0xf8, /* *****... */
+ 0x50, /* .*.*.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x20, /* ..*..... */
+ 0x78, /* .****... */
+ 0xa0, /* *.*..... */
+ 0xa0, /* *.*..... */
+ 0x70, /* .***.... */
+ 0x28, /* ..*.*... */
+ 0x28, /* ..*.*... */
+ 0x28, /* ..*.*... */
+ 0xf0, /* ****.... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x08, /* ....*... */
+ 0x48, /* .*..*... */
+ 0x50, /* .*.*.... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x28, /* ..*.*... */
+ 0x48, /* .*..*... */
+ 0x40, /* .*...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x30, /* ..**.... */
+ 0x48, /* .*..*... */
+ 0x48, /* .*..*... */
+ 0x30, /* ..**.... */
+ 0x60, /* .**..... */
+ 0x94, /* *..*.*.. */
+ 0x88, /* *...*... */
+ 0x74, /* .***.*.. */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x18, /* ...**... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x20, /* ..*..... */
+ 0x18, /* ...**... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xc0, /* **...... */
+ 0x20, /* ..*..... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0xc0, /* **...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x48, /* .*..*... */
+ 0x30, /* ..**.... */
+ 0xfc, /* ******.. */
+ 0x30, /* ..**.... */
+ 0x48, /* .*..*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0xf8, /* *****... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x98, /* *..**... */
+ 0xa8, /* *.*.*... */
+ 0xc8, /* **..*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x60, /* .**..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x70, /* .***.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x08, /* ....*... */
+ 0x30, /* ..**.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x90, /* *..*.... */
+ 0x90, /* *..*.... */
+ 0x90, /* *..*.... */
+ 0xf8, /* *****... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x88, /* *...*... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x20, /* ..*..... */
+ 0x10, /* ...*.... */
+ 0x08, /* ....*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x40, /* .*...... */
+ 0x20, /* ..*..... */
+ 0x10, /* ...*.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xb8, /* *.***... */
+ 0xb8, /* *.***... */
+ 0xb8, /* *.***... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf8, /* *****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xb8, /* *.***... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf8, /* *****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0xc0, /* **...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x90, /* *..*.... */
+ 0xe0, /* ***..... */
+ 0x90, /* *..*.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0xd8, /* **.**... */
+ 0xf8, /* *****... */
+ 0xa8, /* *.*.*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0xc8, /* **..*... */
+ 0xc8, /* **..*... */
+ 0xa8, /* *.*.*... */
+ 0xa8, /* *.*.*... */
+ 0x98, /* *..**... */
+ 0x98, /* *..**... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x18, /* ...**... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x70, /* .***.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xa8, /* *.*.*... */
+ 0xf8, /* *****... */
+ 0xd8, /* **.**... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x50, /* .*.*.... */
+ 0x20, /* ..*..... */
+ 0x50, /* .*.*.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x50, /* .*.*.... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x40, /* .*...... */
+ 0x20, /* ..*..... */
+ 0x10, /* ...*.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x08, /* ....*... */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf8, /* *****... */
+ 0x80, /* *....... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x38, /* ..***... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0xf0, /* ****.... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x60, /* .**..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x30, /* ..**.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x10, /* ...*.... */
+ 0x00, /* ........ */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x60, /* .**..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x90, /* *..*.... */
+ 0xa0, /* *.*..... */
+ 0xc0, /* **...... */
+ 0xa0, /* *.*..... */
+ 0x90, /* *..*.... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x30, /* ..**.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0xa8, /* *.*.*... */
+ 0xa8, /* *.*.*... */
+ 0xa8, /* *.*.*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf0, /* ****.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xf0, /* ****.... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x88, /* *...*... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x80, /* *....... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x78, /* .****... */
+ 0x80, /* *....... */
+ 0x70, /* .***.... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0xe0, /* ***..... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x40, /* .*...... */
+ 0x30, /* ..**.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x50, /* .*.*.... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0xa8, /* *.*.*... */
+ 0xf8, /* *****... */
+ 0xd8, /* **.**... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x70, /* .***.... */
+ 0x70, /* .***.... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x88, /* *...*... */
+ 0x78, /* .****... */
+ 0x08, /* ....*... */
+ 0x08, /* ....*... */
+ 0xf0, /* ****.... */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0xf8, /* *****... */
+ 0x08, /* ....*... */
+ 0x10, /* ...*.... */
+ 0x20, /* ..*..... */
+ 0x40, /* .*...... */
+ 0xf8, /* *****... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x18, /* ...**... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x60, /* .**..... */
+ 0x60, /* .**..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x18, /* ...**... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x20, /* ..*..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x60, /* .**..... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x18, /* ...**... */
+ 0x18, /* ...**... */
+ 0x10, /* ...*.... */
+ 0x10, /* ...*.... */
+ 0x60, /* .**..... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x48, /* .*..*... */
+ 0xb0, /* *.**.... */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
+};
