spleen

Monospaced bitmap fonts for consoles, terminals, and code editors
Log | Files | Refs | README | LICENSE

commit d397d639c6f2c34c98837c29997b4dc78739c659
parent 3849bdddcdd282cecac7250b276103c4ee92b226
Author: Frederic Cambus <fred@statdns.com>
Date:   Sun, 21 Jun 2020 22:08:19 +0200

Merge branch 'master' into 6x12.

Diffstat:
MChangeLog | 13+++++++++++++
MMakefile | 2+-
Mspleen-12x24.bdf | 136+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
Mspleen-16x32.bdf | 20++++++++++----------
Mspleen-32x64.bdf | 328+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
Mspleen-5x8.bdf | 4++--
Mspleen-8x16.bdf | 10+++++-----
Awsfont/Makefile | 25+++++++++++++++++++++++++
Awsfont/spleen12x24.c | 29+++++++++++++++++++++++++++++
Awsfont/spleen16x32.c | 29+++++++++++++++++++++++++++++
Awsfont/spleen32x64.c | 29+++++++++++++++++++++++++++++
Awsfont/spleen5x8.c | 32++++++++++++++++++++++++++++++++
Awsfont/spleen8x16.c | 29+++++++++++++++++++++++++++++
13 files changed, 640 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,16 @@ +Spleen 1.7.1 (2020-06-21) + +- Add some Powerline characters (arrows symbols and padlock) (5x8 version) +- Fix duplicate character names for Powerline symbols +- Uppercase ISO in the FONT property so fonts can be processed through + ucs2any(1) +- Add "Black Diamond" and "Lozenge" characters for all sizes +- Add "Black Heart Suit" and "Black Diamond Suit" characters for all sizes +- Remove strain pixel on the '5' digit (5x8 version) +- Improve the Esszet character (8x16, 12x24, 16x32, and 32x64 versions) + + + Spleen 1.7.0 (2020-02-13) - Improve generated PSF files so that box-drawing characters are correctly diff --git a/Makefile b/Makefile @@ -1,5 +1,5 @@ # -# Spleen 1.7.0 +# Spleen 1.7.1 # Copyright (c) 2018-2020, Frederic Cambus # https://www.cambus.net/ # diff --git a/spleen-12x24.bdf b/spleen-12x24.bdf @@ -1,11 +1,11 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 12x24 1.7.0 +COMMENT * Spleen 12x24 1.7.1 COMMENT * Copyright (c) 2018-2020, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-08-15 -COMMENT * Last Updated: 2020-06-12 +COMMENT * Last Updated: 2020-06-21 COMMENT * COMMENT * Spleen is released under the BSD 2-Clause license. COMMENT * See LICENSE file for details. @@ -15,7 +15,7 @@ SIZE 24 72 72 FONTBOUNDINGBOX 12 24 0 -5 STARTPROPERTIES 19 FAMILY_NAME "Spleen" -FONT_VERSION "1.7.0" +FONT_VERSION "1.7.1" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" @@ -34,7 +34,7 @@ COPYRIGHT "Copyright (c) 2018-2020, Frederic Cambus" DEFAULT_CHAR 32 _GBDFED_INFO "Edited with gbdfed 1.6." ENDPROPERTIES -CHARS 758 +CHARS 762 STARTCHAR SPACE ENCODING 32 SWIDTH 500 0 @@ -4981,13 +4981,13 @@ BITMAP 6180 6180 6300 -7F00 +6F00 6380 60C0 6060 6060 6060 -7860 +6860 6CC0 6780 0000 @@ -15132,6 +15132,68 @@ FFF0 FFF0 FFF0 ENDCHAR +STARTCHAR BLACK DIAMOND +ENCODING 9670 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0400 +0E00 +1F00 +3F80 +7FC0 +FFE0 +7FC0 +3F80 +1F00 +0E00 +0400 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR LOZENGE +ENCODING 9674 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0400 +0E00 +1B00 +3180 +60C0 +C060 +60C0 +3180 +1B00 +0E00 +0400 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR TRIGRAM FOR HEAVEN ENCODING 9776 SWIDTH 500 0 @@ -15380,6 +15442,68 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR BLACK HEART SUIT +ENCODING 9829 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +3180 +7BC0 +FFE0 +FFE0 +FFE0 +FFE0 +7FC0 +7FC0 +3F80 +1F00 +0E00 +0400 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR BLACK DIAMOND SUIT +ENCODING 9830 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0400 +0E00 +1F00 +3F80 +7FC0 +FFE0 +7FC0 +3F80 +1F00 +0E00 +0400 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR BRAILLE PATTERN BLANK ENCODING 10240 SWIDTH 500 0 diff --git a/spleen-16x32.bdf b/spleen-16x32.bdf @@ -1,11 +1,11 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 16x32 1.7.0 +COMMENT * Spleen 16x32 1.7.1 COMMENT * Copyright (c) 2018-2020, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-08-12 -COMMENT * Last Updated: 2020-06-13 +COMMENT * Last Updated: 2020-06-20 COMMENT * COMMENT * Spleen is released under the BSD 2-Clause license. COMMENT * See LICENSE file for details. @@ -15,7 +15,7 @@ SIZE 32 72 72 FONTBOUNDINGBOX 16 32 0 -6 STARTPROPERTIES 19 FAMILY_NAME "Spleen" -FONT_VERSION "1.7.0" +FONT_VERSION "1.7.1" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" @@ -6256,18 +6256,18 @@ BITMAP 3030 3030 3070 -3FE0 -3FC0 -31F0 +30E0 +33C0 +33F0 3078 301C 300C 300C 300C -3C0C -3E1C -37F8 -33F0 +360C +371C +33F8 +31F0 0000 0000 0000 diff --git a/spleen-32x64.bdf b/spleen-32x64.bdf @@ -1,11 +1,11 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 32x64 1.7.0 +COMMENT * Spleen 32x64 1.7.1 COMMENT * Copyright (c) 2018-2020, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-09-11 -COMMENT * Last Updated: 2020-06-12 +COMMENT * Last Updated: 2020-06-21 COMMENT * COMMENT * Spleen is released under the BSD 2-Clause license. COMMENT * See LICENSE file for details. @@ -15,7 +15,7 @@ SIZE 64 72 72 FONTBOUNDINGBOX 32 64 0 -12 STARTPROPERTIES 19 FAMILY_NAME "Spleen" -FONT_VERSION "1.7.0" +FONT_VERSION "1.7.1" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" @@ -34,7 +34,7 @@ COPYRIGHT "Copyright (c) 2018-2020, Frederic Cambus" DEFAULT_CHAR 32 _GBDFED_INFO "Edited with gbdfed 1.6." ENDPROPERTIES -CHARS 758 +CHARS 762 STARTCHAR SPACE ENCODING 32 SWIDTH 500 0 @@ -11357,31 +11357,31 @@ BITMAP 0F000F00 0F000F00 0F001F00 -0F003F00 -0FFFFE00 -0FFFFC00 -0FFFF800 -0FFFF000 -0F03FC00 -0F00FF00 -0F003FC0 +0F001F00 +0F003E00 +0F00FE00 +0F0FFC00 +0F0FFF00 +0F0FFF80 +0F0FFFC0 0F000FE0 -0F0003F0 +0F0003E0 +0F0001F0 0F0001F0 0F0000F0 0F0000F0 0F0000F0 0F0000F0 0F0000F0 -0F8000F0 -0FC000F0 -0FE000F0 -0FF001F0 -0FFC03E0 -0F7FFFE0 -0F3FFFC0 -0F1FFF80 -0F0FFE00 +0F0000F0 +0F3C00F0 +0F3C00F0 +0F3E01F0 +0F3F03F0 +0F1FFFE0 +0F1FFFE0 +0F0FFFC0 +0F03FF00 00000000 00000000 00000000 @@ -34612,6 +34612,148 @@ FFFFFFFF FFFFFFFF FFFFFFFF ENDCHAR +STARTCHAR BLACK DIAMOND +ENCODING 9670 +SWIDTH 500 0 +DWIDTH 32 0 +BBX 32 64 0 -12 +BITMAP +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00030000 +00078000 +000FC000 +001FE000 +003FF000 +007FF800 +00FFFC00 +01FFFE00 +03FFFF00 +07FFFF80 +0FFFFFC0 +1FFFFFE0 +3FFFFFF0 +7FFFFFF8 +FFFFFFFC +FFFFFFFC +7FFFFFF8 +3FFFFFF0 +1FFFFFE0 +0FFFFFC0 +07FFFF80 +03FFFF00 +01FFFE00 +00FFFC00 +007FF800 +003FF000 +001FE000 +000FC000 +00078000 +00030000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +ENDCHAR +STARTCHAR LOZENGE +ENCODING 9674 +SWIDTH 500 0 +DWIDTH 32 0 +BBX 32 64 0 -12 +BITMAP +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00030000 +00078000 +000FC000 +001FE000 +003FF000 +007CF800 +00F87C00 +01F03E00 +03E01F00 +07C00F80 +0F8007C0 +1F0003E0 +3E0001F0 +7C0000F8 +F800007C +F800007C +7C0000F8 +3E0001F0 +1F0003E0 +0F8007C0 +07C00F80 +03E01F00 +01F03E00 +00F87C00 +007CF800 +003FF000 +001FE000 +000FC000 +00078000 +00030000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +ENDCHAR STARTCHAR TRIGRAM FOR HEAVEN ENCODING 9776 SWIDTH 500 0 @@ -35180,6 +35322,148 @@ BITMAP 00000000 00000000 ENDCHAR +STARTCHAR BLACK HEART SUIT +ENCODING 9829 +SWIDTH 500 0 +DWIDTH 32 0 +BBX 32 64 0 -12 +BITMAP +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +07F03F80 +1FF87FE0 +3FFCFFF0 +7FFCFFF8 +7FFFFFF8 +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +FFFFFFFC +7FFFFFF8 +7FFFFFF8 +3FFFFFF0 +3FFFFFF0 +1FFFFFE0 +0FFFFFC0 +07FFFF80 +03FFFF00 +01FFFE00 +00FFFC00 +007FF800 +003FF000 +001FE000 +000FC000 +00078000 +00030000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +ENDCHAR +STARTCHAR BLACK DIAMOND SUIT +ENCODING 9830 +SWIDTH 500 0 +DWIDTH 32 0 +BBX 32 64 0 -12 +BITMAP +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00030000 +00078000 +000FC000 +001FE000 +003FF000 +007FF800 +00FFFC00 +01FFFE00 +03FFFF00 +07FFFF80 +0FFFFFC0 +1FFFFFE0 +3FFFFFF0 +7FFFFFF8 +FFFFFFFC +FFFFFFFC +7FFFFFF8 +3FFFFFF0 +1FFFFFE0 +0FFFFFC0 +07FFFF80 +03FFFF00 +01FFFE00 +00FFFC00 +007FF800 +003FF000 +001FE000 +000FC000 +00078000 +00030000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +ENDCHAR STARTCHAR BRAILLE PATTERN BLANK ENCODING 10240 SWIDTH 500 0 diff --git a/spleen-5x8.bdf b/spleen-5x8.bdf @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 5x8 1.7.0 +COMMENT * Spleen 5x8 1.7.1 COMMENT * Copyright (c) 2018-2020, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * @@ -15,7 +15,7 @@ SIZE 8 72 72 FONTBOUNDINGBOX 5 8 0 -1 STARTPROPERTIES 19 FAMILY_NAME "Spleen" -FONT_VERSION "1.7.0" +FONT_VERSION "1.7.1" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" diff --git a/spleen-8x16.bdf b/spleen-8x16.bdf @@ -1,11 +1,11 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 8x16 1.7.0 +COMMENT * Spleen 8x16 1.7.1 COMMENT * Copyright (c) 2018-2020, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-08-11 -COMMENT * Last Updated: 2020-06-13 +COMMENT * Last Updated: 2020-06-21 COMMENT * COMMENT * Spleen is released under the BSD 2-Clause license. COMMENT * See LICENSE file for details. @@ -15,7 +15,7 @@ SIZE 16 72 72 FONTBOUNDINGBOX 8 16 0 -4 STARTPROPERTIES 19 FAMILY_NAME "Spleen" -FONT_VERSION "1.7.0" +FONT_VERSION "1.7.1" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" @@ -3704,11 +3704,11 @@ BITMAP CC CC CC -F8 +D8 CC C6 C6 -E6 +D6 DC 00 00 diff --git a/wsfont/Makefile b/wsfont/Makefile @@ -0,0 +1,25 @@ +# +# Spleen 1.7.1 +# Copyright (c) 2018-2020, Frederic Cambus +# https://www.cambus.net/ +# +# Created: 2020-06-20 +# Last Updated: 2020-06-20 +# +# Spleen is released under the BSD 2-Clause license. +# See LICENSE file for details. +# + +SIZES = 5x8 8x16 12x24 16x32 32x64 + +all: +.for size in $(SIZES) + $(CC) $(CFLAGS) spleen${size}.c -o spleen${size} + spleen${size} > spleen-${size} + spleen${size} | uuencode spleen-${size} > spleen-${size}.uue +.endfor + +clean: +.for size in $(SIZES) + rm -f spleen${size} spleen-${size} *.uue +.endfor diff --git a/wsfont/spleen12x24.c b/wsfont/spleen12x24.c @@ -0,0 +1,29 @@ +/* + * Spleen 1.7.1 + * Copyright (c) 2018-2020, Frederic Cambus + * https://www.cambus.net/ + * + * Created: 2020-06-20 + * Last Updated: 2020-06-20 + * + * Spleen is released under the BSD 2-Clause license. + * See LICENSE file for details. + */ + +#include <stdio.h> +#include <time.h> + +#include <dev/wscons/wsconsio.h> +#include <dev/wsfont/spleen12x24.h> + +int main() { + size_t loop; + + for (loop = 0; loop < 32 * 2 * 24; loop++) + printf("%c", 0); + + for (loop = 0; loop < 224 * 2 * 24; loop++) + printf("%c", spleen12x24_data[loop]); + + return 0; +} diff --git a/wsfont/spleen16x32.c b/wsfont/spleen16x32.c @@ -0,0 +1,29 @@ +/* + * Spleen 1.7.1 + * Copyright (c) 2018-2020, Frederic Cambus + * https://www.cambus.net/ + * + * Created: 2020-06-20 + * Last Updated: 2020-06-20 + * + * Spleen is released under the BSD 2-Clause license. + * See LICENSE file for details. + */ + +#include <stdio.h> +#include <time.h> + +#include <dev/wscons/wsconsio.h> +#include <dev/wsfont/spleen16x32.h> + +int main() { + size_t loop; + + for (loop = 0; loop < 32 * 2 * 32; loop++) + printf("%c", 0); + + for (loop = 0; loop < 224 * 2 * 32; loop++) + printf("%c", spleen16x32_data[loop]); + + return 0; +} diff --git a/wsfont/spleen32x64.c b/wsfont/spleen32x64.c @@ -0,0 +1,29 @@ +/* + * Spleen 1.7.1 + * Copyright (c) 2018-2020, Frederic Cambus + * https://www.cambus.net/ + * + * Created: 2020-06-20 + * Last Updated: 2020-06-20 + * + * Spleen is released under the BSD 2-Clause license. + * See LICENSE file for details. + */ + +#include <stdio.h> +#include <time.h> + +#include <dev/wscons/wsconsio.h> +#include <dev/wsfont/spleen32x64.h> + +int main() { + size_t loop; + + for (loop = 0; loop < 32 * 4 * 64; loop++) + printf("%c", 0); + + for (loop = 0; loop < 224 * 4 * 64; loop++) + printf("%c", spleen32x64_data[loop]); + + return 0; +} diff --git a/wsfont/spleen5x8.c b/wsfont/spleen5x8.c @@ -0,0 +1,32 @@ +/* + * Spleen 1.7.1 + * Copyright (c) 2018-2020, Frederic Cambus + * https://www.cambus.net/ + * + * Created: 2020-06-20 + * Last Updated: 2020-06-20 + * + * Spleen is released under the BSD 2-Clause license. + * See LICENSE file for details. + */ + +#include <stdio.h> +#include <time.h> + +#include <dev/wscons/wsconsio.h> +#include <dev/wsfont/spleen5x8.h> + +int main() { + size_t loop; + + for (loop = 0; loop < 32 * 8; loop++) + printf("%c", 0); + + for (loop = 0; loop < 96 * 8; loop++) + printf("%c", spleen5x8_data[loop]); + + for (loop = 0; loop < 128 * 8; loop++) + printf("%c", 0); + + return 0; +} diff --git a/wsfont/spleen8x16.c b/wsfont/spleen8x16.c @@ -0,0 +1,29 @@ +/* + * Spleen 1.7.1 + * Copyright (c) 2018-2020, Frederic Cambus + * https://www.cambus.net/ + * + * Created: 2020-06-20 + * Last Updated: 2020-06-20 + * + * Spleen is released under the BSD 2-Clause license. + * See LICENSE file for details. + */ + +#include <stdio.h> +#include <time.h> + +#include <dev/wscons/wsconsio.h> +#include <dev/wsfont/spleen8x16.h> + +int main() { + size_t loop; + + for (loop = 0; loop < 32 * 16; loop++) + printf("%c", 0); + + for (loop = 0; loop < 224 * 16; loop++) + printf("%c", spleen8x16_data[loop]); + + return 0; +}