git: 26336203d32c - stable/14 - contrib/spleen: Update to Spleen 2.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ed Maste <emaste_at_FreeBSD.org>
Date: Fri, 24 Jan 2025 19:57:24 UTC
The branch stable/14 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=26336203d32c7936d7743cbec20f2da733db227e

commit 26336203d32c7936d7743cbec20f2da733db227e
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-01-21 02:55:47 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-01-24 19:57:10 +0000

    contrib/spleen: Update to Spleen 2.1.0
    
    Merge commit 'e364562a4012d6d9cb334795b97e929cfa2a5dff'
    
    (cherry picked from commit 18270a76e24e7f17f533a7a683eed3327a3c135a)
---
 contrib/spleen/ChangeLog        |    31 +
 contrib/spleen/LICENSE          |     2 +-
 contrib/spleen/README.md        |    69 +-
 contrib/spleen/spleen-12x24.bdf |  2368 ++-
 contrib/spleen/spleen-16x32.bdf | 19138 +++++++++++---------
 contrib/spleen/spleen-32x64.bdf | 36002 +++++++++++++++++++++-----------------
 contrib/spleen/spleen-5x8.bdf   |     8 +-
 contrib/spleen/spleen-6x12.bdf  |  1456 +-
 contrib/spleen/spleen-8x16.bdf  | 10156 ++++++-----
 9 files changed, 39463 insertions(+), 29767 deletions(-)

diff --git a/contrib/spleen/ChangeLog b/contrib/spleen/ChangeLog
index dd49696db5f4..bbe2cd4d422e 100644
--- a/contrib/spleen/ChangeLog
+++ b/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
diff --git a/contrib/spleen/LICENSE b/contrib/spleen/LICENSE
index 7f639bf61a6d..4387948e8467 100644
--- a/contrib/spleen/LICENSE
+++ b/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
diff --git a/contrib/spleen/README.md b/contrib/spleen/README.md
index ce2e6addc305..a80773ec8420 100644
--- a/contrib/spleen/README.md
+++ b/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
diff --git a/contrib/spleen/spleen-12x24.bdf b/contrib/spleen/spleen-12x24.bdf
index 24ae2e78f4b2..1c4fa12beb9a 100644
--- a/contrib/spleen/spleen-12x24.bdf
+++ b/contrib/spleen/spleen-12x24.bdf
@@ -1,11 +1,11 @@
 STARTFONT 2.1
 COMMENT /*
-COMMENT  * Spleen 12x24 2.0.0
-COMMENT  * Copyright (c) 2018-2023, Frederic Cambus
+COMMENT  * Spleen 12x24 2.1.0
+COMMENT  * Copyright (c) 2018-2024, Frederic Cambus
 COMMENT  * https://www.cambus.net/
 COMMENT  *
 COMMENT  * Created:      2018-08-15
-COMMENT  * Last Updated: 2023-04-28
+COMMENT  * Last Updated: 2024-03-22
 COMMENT  *
 COMMENT  * Spleen is released under the BSD 2-Clause license.
 COMMENT  * See LICENSE file for details.
@@ -18,7 +18,7 @@ FONTBOUNDINGBOX 12 24 0 -5
 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,11 +33,11 @@ CHARSET_ENCODING "1"
 MIN_SPACE 12
 FONT_ASCENT 19
 FONT_DESCENT 5
-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
-CHARS 840
+CHARS 916
 STARTCHAR SPACE
 ENCODING 32
 SWIDTH 500 0
@@ -11880,6 +11880,2362 @@ BITMAP
 0000
 0000
 ENDCHAR
+STARTCHAR COMBINING BREVE
+ENCODING 774
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+1980
+1980
+0F00
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR COMBINING DIAERESIS
+ENCODING 776
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+30C0
+30C0
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER IO
+ENCODING 1025
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+30C0
+30C0
+0000
+1FE0
+3000
+6000
+6000
+6000
+6000
+6000
+7F80
+6000
+6000
+6000
+6000
+6000
+3000
+1FE0
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+ENCODING 1030
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+3FC0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+3FC0
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER YI
+ENCODING 1031
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+30C0
+30C0
+0000
+3FC0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+3FC0
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER SHORT U
+ENCODING 1038
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+1980
+1980
+0F00
+0000
+6060
+6060
+6060
+6060
+6060
+6060
+3060
+1FE0
+0060
+0060
+0060
+0060
+0060
+00E0
+7FC0
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER A
+ENCODING 1040
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1F80
+30C0
+6060
+6060
+6060
+6060
+6060
+7FE0
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER BE
+ENCODING 1041
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+7F80
+6000
+6000
+6000
+6000
+6000
+6000
+7F80
+60C0
+6060
+6060
+6060
+6060
+60C0
+7F80
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER VE
+ENCODING 1042
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+7F80
+60C0
+6060
+6060
+6060
+6060
+60C0
+7F80
+60C0
+6060
+6060
+6060
+6060
+60C0
+7F80
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER GHE
+ENCODING 1043
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1FE0
+3000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER DE
+ENCODING 1044
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+0FC0
+18C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+3FC0
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER IE
+ENCODING 1045
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1FE0
+3000
+6000
+6000
+6000
+6000
+6000
+7F80
+6000
+6000
+6000
+6000
+6000
+3000
+1FE0
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER ZHE
+ENCODING 1046
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+6660
+6660
+6660
+6660
+6660
+6660
+36C0
+1F80
+36C0
+6660
+6660
+6660
+6660
+6660
+6660
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER ZE
+ENCODING 1047
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+7F80
+00C0
+0060
+0060
+0060
+00C0
+1F80
+00C0
+0060
+0060
+0060
+0060
+0060
+00C0
+7F80
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER I
+ENCODING 1048
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+6060
+60E0
+60E0
+61E0
+61E0
+6360
+6360
+6660
+6660
+6C60
+6C60
+7860
+7860
+7060
+7060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER SHORT I
+ENCODING 1049
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+1980
+1980
+0F00
+0000
+6060
+60E0
+60E0
+61E0
+61E0
+6360
+6360
+6660
+6660
+6C60
+6C60
+7860
+7860
+7060
+7060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER KA
+ENCODING 1050
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+6060
+6060
+6060
+6060
+6060
+60C0
+6180
+7F00
+6180
+60C0
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER EL
+ENCODING 1051
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1FE0
+3060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER EM
+ENCODING 1052
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+6060
+70E0
+79E0
+6F60
+6660
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER EN
+ENCODING 1053
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+7FE0
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER O
+ENCODING 1054
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1F80
+30C0
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+30C0
+1F80
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER PE
+ENCODING 1055
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+7FE0
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+6060
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER ER
+ENCODING 1056
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+7F80
+60C0
+6060
+6060
+6060
+6060
+60C0
+7F80
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+0000
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR CYRILLIC CAPITAL LETTER ES
+ENCODING 1057
+SWIDTH 500 0
+DWIDTH 12 0
+BBX 12 24 0 -5
+BITMAP
+0000
+0000
+0000
+0000
+1FE0
+3000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+3000
+1FE0
+0000
+0000
+0000
+0000
*** 88287 LINES SKIPPED ***