contrib/spleen: Update to Spleen 2.1.0

Merge commit 'e364562a4012d6d9cb334795b97e929cfa2a5dff'

(cherry picked from commit 18270a76e24e7f17f533a7a683eed3327a3c135a)

contrib/spleen/ChangeLog

@@ -1,3 +1,34 @@
+Spleen 2.1.0 (2024-03-22)
+
+- Document how wsfont header files (for OpenBSD and NetBSD) are generated
+- Add base cyrillic (basic alphabet + most used extended) characters (Thanks
+  Slava Voronzoff!)
+- Fix latin small letter 'u' smoothing in the 32x64 version
+- Fix smoothing on more variants of 'u' in the 32x64 version
+
+
+
+Spleen 2.0.2 (2023-12-25)
+
+- Fix MALE and FEMALE character ordering in the 16x32 and 32x64
+  versions (Thanks Mike Cui)
+- Update README to add a link to the Alpine Linux package
+
+
+
+Spleen 2.0.1 (2023-11-17)
+
+- Add a 'com' target to generate SPLEEN.COM, the DOS version of Spleen
+- Also add 'com' in the 'all' target
+- Update README to add a link to the Guix package
+- In the Spleen loader for DOS, put 4C00h in ax and not 4Ch
+- README.md: add Gentoo package link
+- Switch to using Oxipng as it compresses even more than OptiPNG
+- Add a new FAQ file answering frequently asked questions about Spleen
+- Remove C0 control characters range in the 8x16, 16x32, and 32x64 versions
+
+
+
 Spleen 2.0.0 (2023-05-28)
 
 - Add full support for CP437 (IBM PC) in the 8x16, 16x32, and 32x64 versions

contrib/spleen/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2023, Frederic Cambus
+Copyright (c) 2018-2024, Frederic Cambus
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

contrib/spleen/README.md

@@ -104,6 +104,9 @@ Spleen packages are available for:
 - [Debian][15]
 - [Ubuntu][16]
 - [MacPorts][17]
+- [Guix][18]
+- [Gentoo][19]
+- [Alpine Linux][20]
 
 ## Manual installation
 
@@ -114,6 +117,8 @@ Clone the repository, convert the files to the Portable Compiled Format
 
 Alternatively, release tarballs provide PCF files for each size.
 
+OTB versions are also available.
+
 ### macOS
 
 macOS users should use the `.dfont` files provided in the release tarballs.
@@ -150,7 +155,7 @@ Update **.Xdefaults** and add one of the following directives:
 Launch **xterm**.
 
 Ubuntu has bitmap fonts support disabled by default, instructions to enable
-it are available [here][18].
+it are available [here][21].
 
 ### Linux console
 
@@ -178,9 +183,12 @@ For example, to load Spleen 16x32:
 ### OpenType versions
 
 Spleen release tarballs now contains OTF versions generated automatically
-from the BDF files, using [bdf2sfd][19]. Each font has a different name,
+from the BDF files, using [bdf2sfd][22]. Each font has a different name,
 allowing them to be installed alongside.
 
+Please note that OTF versions should be used as last resort, always prefer
+bitmap versions if they are supported on your platform.
+
 They should be used in the exact size specified below, with anti-aliasing
 disabled.
 
@@ -203,26 +211,27 @@ Spleen is developed by Frederic Cambus.
 
 ## Resources
 
-- [Spleen - Monospaced bitmap fonts][20] (2018)
-- [New console font Spleen made default][21] (2019)
-- [NetBSD, CTWM, and Spleen][22] (2021)
+- [Spleen - Monospaced bitmap fonts][23] (2018)
+- [New console font Spleen made default][24] (2019)
+- [NetBSD, CTWM, and Spleen][25] (2021)
+- [Spleen 2.0.0 released with full CP437 support][26] (2023)
 
 GitHub: https://github.com/fcambus/spleen
 
 ## Trivia
 
-- Spleen was imported in the OpenBSD src tree in [September 2018][23]
-- Spleen is the default font for OpenBSD consoles since [January 2019][24]
-- Spleen was imported in the NetBSD src tree in [March 2019][25]
-- Spleen 12x24 was used in the Haiku [kernel debugger][26] (on high resolution
+- Spleen was imported in the OpenBSD src tree in [September 2018][27]
+- Spleen is the default font for OpenBSD consoles since [January 2019][28]
+- Spleen was imported in the NetBSD src tree in [March 2019][29]
+- Spleen 12x24 was used in the Haiku [kernel debugger][30] (on high resolution
   displays) from May 2021 to June 2022
-- Spleen was imported in the FreeBSD base system in [May 2023][27]
-- [msTERM][28], a Terminal program for MailStation devices uses Spleen 5x8
-- [FBInk][29], a library to print text & images to an eInk Linux framebuffer
+- Spleen was imported in the FreeBSD base system in [May 2023][31]
+- [msTERM][32], a Terminal program for MailStation devices uses Spleen 5x8
+- [FBInk][33], a library to print text & images to an eInk Linux framebuffer
   embeds Spleen 16x32
-- [U8g2][30], a monochrome graphics library for embedded devices includes
+- [U8g2][34], a monochrome graphics library for embedded devices includes
   all Spleen sizes
-- [Ansilove][31], an ANSI and ASCII art to PNG converter includes Spleen
+- [Ansilove][35], an ANSI and ASCII art to PNG converter includes Spleen
 
 [1]: https://www.cambus.net/content/2018/09/spleen-hello.png
 [2]: https://www.cambus.net/content/2018/09/spleen-etranger.png
@@ -241,17 +250,21 @@ GitHub: https://github.com/fcambus/spleen
 [15]: https://packages.debian.org/search?keywords=spleen
 [16]: https://packages.ubuntu.com/search?keywords=spleen
 [17]: https://ports.macports.org/port/font-spleen/
-[18]: https://wiki.ubuntu.com/Fonts#Enabling_Bitmapped_Fonts
-[19]: https://github.com/fcambus/bdf2sfd
-[20]: https://www.cambus.net/spleen-monospaced-bitmap-fonts/
-[21]: https://undeadly.org/cgi?action=article;sid=20190110064857
-[22]: https://www.cambus.net/netbsd-ctwm-and-spleen/
-[23]: https://freshbsd.org/openbsd/src/commit/5raMrDMpYlPYW01H
-[24]: https://freshbsd.org/openbsd/src/commit/MoBCxKiAlFajRvSm
-[25]: https://freshbsd.org/netbsd/src/commit/TAJuMl9caBpVjGfB
-[26]: https://git.haiku-os.org/haiku/commit/?id=29a109bd6c01ce71bb61177ee9ff0417e74c1e18
-[27]: https://cgit.freebsd.org/src/commit/?id=0d66206fff44
-[28]: https://github.com/jcs/msTERM
-[29]: https://github.com/NiLuJe/FBInk
-[30]: https://github.com/olikraus/u8g2/wiki/fntgrpspleen
-[31]: https://www.ansilove.org
+[18]: https://packages.guix.gnu.org/packages/font-spleen/
+[19]: https://packages.gentoo.org/packages/media-fonts/spleen
+[20]: https://pkgs.alpinelinux.org/packages?name=font-spleen
+[21]: https://wiki.ubuntu.com/Fonts#Enabling_Bitmapped_Fonts
+[22]: https://github.com/fcambus/bdf2sfd
+[23]: https://www.cambus.net/spleen-monospaced-bitmap-fonts/
+[24]: https://undeadly.org/cgi?action=article;sid=20190110064857
+[25]: https://www.cambus.net/netbsd-ctwm-and-spleen/
+[26]: https://www.cambus.net/spleen-2.0.0-released-with-full-cp437-support/
+[27]: https://freshbsd.org/openbsd/src/commit/5raMrDMpYlPYW01H
+[28]: https://freshbsd.org/openbsd/src/commit/MoBCxKiAlFajRvSm
+[29]: https://freshbsd.org/netbsd/src/commit/TAJuMl9caBpVjGfB
+[30]: https://git.haiku-os.org/haiku/commit/?id=29a109bd6c01ce71bb61177ee9ff0417e74c1e18
+[31]: https://cgit.freebsd.org/src/commit/?id=0d66206fff44
+[32]: https://github.com/jcs/msTERM
+[33]: https://github.com/NiLuJe/FBInk
+[34]: https://github.com/olikraus/u8g2/wiki/fntgrpspleen
+[35]: https://www.ansilove.org

contrib/spleen/spleen-5x8.bdf

@@ -1,7 +1,7 @@
 STARTFONT 2.1
 COMMENT /*
-COMMENT  * Spleen 5x8 2.0.0
-COMMENT  * Copyright (c) 2018-2023, Frederic Cambus
+COMMENT  * Spleen 5x8 2.1.0
+COMMENT  * Copyright (c) 2018-2024, Frederic Cambus
 COMMENT  * https://www.cambus.net/
 COMMENT  *
 COMMENT  * Created:      2018-08-08
@@ -18,7 +18,7 @@ FONTBOUNDINGBOX 5 8 0 -1
 STARTPROPERTIES 20
 FAMILY_NAME "Spleen"
 WEIGHT_NAME "Medium"
-FONT_VERSION "2.0.0"
+FONT_VERSION "2.1.0"
 FOUNDRY "misc"
 SLANT "R"
 SETWIDTH_NAME "Normal"
@@ -33,7 +33,7 @@ CHARSET_ENCODING "1"
 MIN_SPACE 5
 FONT_DESCENT 1
 FONT_ASCENT 7
-COPYRIGHT "Copyright (c) 2018-2023, Frederic Cambus"
+COPYRIGHT "Copyright (c) 2018-2024, Frederic Cambus"
 DEFAULT_CHAR 32
 _GBDFED_INFO "Edited with gbdfed 1.6."
 ENDPROPERTIES