Date: Thu, 05 Feb 2026 21:51:30 +0000 From: Alexander Ziaee <ziaee@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: da4c7b4518dd - stable/15 - contrib/spleen: Update to 2.2.O Message-ID: <698510e2.18ef6.644e3e17@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=da4c7b4518ddc7c395ea476b1c543ee01034962c commit da4c7b4518ddc7c395ea476b1c543ee01034962c Author: Alexander Ziaee <ziaee@FreeBSD.org> AuthorDate: 2026-02-01 15:25:11 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> CommitDate: 2026-02-05 21:50:33 +0000 contrib/spleen: Update to 2.2.O This release adds several new characters critical to the manual pages that were previously missing on high-dpi displays: em-dash, en-dash, hyphen, angle brackets, white square, dagger, and double dagger. It also features improved alignment for numerous characters in different sizes. Thanks: Fredric Cambus MFC after: 3 days Discussed with: emaste (cherry picked from commit 0d602f923ed8a889c3a848ab9f19aa52f917f6ee) --- contrib/spleen/ChangeLog | 24 + contrib/spleen/LICENSE | 2 +- contrib/spleen/README.md | 15 +- contrib/spleen/spleen-12x24.bdf | 364 ++++++++++++-- contrib/spleen/spleen-16x32.bdf | 391 ++++++++++++++- contrib/spleen/spleen-32x64.bdf | 1003 ++++++++++++++++++++++++++++++++------- contrib/spleen/spleen-5x8.bdf | 8 +- contrib/spleen/spleen-6x12.bdf | 8 +- contrib/spleen/spleen-8x16.bdf | 219 ++++++++- 9 files changed, 1787 insertions(+), 247 deletions(-) diff --git a/contrib/spleen/ChangeLog b/contrib/spleen/ChangeLog index bbe2cd4d422e..f5e090671741 100644 --- a/contrib/spleen/ChangeLog +++ b/contrib/spleen/ChangeLog @@ -1,3 +1,27 @@ +Spleen 2.2.0 (2026-02-01) + +- Add stand alone caron in the 8x16, 12x24, 16x32, and 32x64 versions +- Fix stand alone breve in the 12x24 version +- Add white square symbol in the 8x16, 16x32, and 32x64 versions +- Add dagger and double dagger symbols in the 8x16, 12x24, 16x32, and + 32x64 versions +- Fix black and white squares alignment in the 16x32 and 32x64 versions +- Add black and white square characters in the 12x24 version +- Add hyphen, along with en and em dashes in the 8x16, 12x24, 16x32, and + 32x64 versions +- Add mathematical left and right angle brackets in the 8x16, 12x24, 16x32, + and 32x64 versions +- Fix right parenthesis alignment in the 32x64 version +- Fix right curly bracket alignment in the 12x24 version +- Fix less-than sign alignment in the 12x24 version + +- Makefile: replace BSD Make .for loops with portable dependency rules, + the project can now be built with both BSD Make and GNU Make +- Add 'woff' and 'woff2' targets to generate WOFF and WOFF2 versions +- Add tests for validating and sanitizing OTF, WOFF and WOFF2 fonts + + + Spleen 2.1.0 (2024-03-22) - Document how wsfont header files (for OpenBSD and NetBSD) are generated diff --git a/contrib/spleen/LICENSE b/contrib/spleen/LICENSE index 4387948e8467..6928cd0fc323 100644 --- a/contrib/spleen/LICENSE +++ b/contrib/spleen/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018-2024, Frederic Cambus +Copyright (c) 2018-2026, 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 a80773ec8420..12771f96019e 100644 --- a/contrib/spleen/README.md +++ b/contrib/spleen/README.md @@ -26,8 +26,8 @@ Spleen is a monospaced bitmap font available in 6 sizes: Each size is provided in the Glyph Bitmap Distribution Format (BDF), and release tarballs contain the fonts in the following formats: `PCF`, `PSF` -(for the Linux console), `OTB`, `OTF`, `.dfont` for macOS users, and `FON` -for Windows users. +(for the Linux console), `OTB`, `OTF`, `WOFF`, `WOFF2`, `.dfont` for macOS +users, and `FON` for Windows users. All font sizes contain all ISO/IEC 8859-1 characters (Basic Latin and Latin-1 Supplement Unicode block), Latin Extended-A characters, as well as Box Drawing, @@ -198,6 +198,15 @@ disabled. - Spleen 16x32: 24 Pt (32 pixels) - Spleen 32x64: 48 Pt (64 pixels) +### Web Fonts + +Release tarballs provide WOFF and WOFF2 versions suitable for use on the Web. + +As with the OpenType versions from which they are generated, WOFF and WOFF2 +fonts should be used at their native pixel sizes, with font smoothing and +anti-aliasing disabled when possible, to preserve the original bitmap +appearance. + ## License Spleen is released under the BSD 2-Clause license. See `LICENSE` file for @@ -246,7 +255,7 @@ GitHub: https://github.com/fcambus/spleen [11]: https://www.freshports.org/x11-fonts/spleen/ [12]: https://aur.archlinux.org/packages/spleen-font/ [13]: https://github.com/void-linux/void-packages/tree/master/srcpkgs/font-spleen -[14]: https://github.com/NixOS/nixpkgs/tree/master/pkgs/data/fonts/spleen +[14]: https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/sp/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/ diff --git a/contrib/spleen/spleen-12x24.bdf b/contrib/spleen/spleen-12x24.bdf index 1c4fa12beb9a..5e757ae3d8ad 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.1.0 -COMMENT * Copyright (c) 2018-2024, Frederic Cambus +COMMENT * Spleen 12x24 2.2.0 +COMMENT * Copyright (c) 2018-2026, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-08-15 -COMMENT * Last Updated: 2024-03-22 +COMMENT * Last Updated: 2026-01-31 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.1.0" +FONT_VERSION "2.2.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-2024, Frederic Cambus" +COPYRIGHT "Copyright (c) 2018-2026, Frederic Cambus" DEFAULT_CHAR 32 _GBDFED_INFO "Edited with gbdfed 1.6." ENDPROPERTIES -CHARS 916 +CHARS 926 STARTCHAR SPACE ENCODING 32 SWIDTH 500 0 @@ -916,7 +916,6 @@ BITMAP 0000 0000 0000 -0060 00C0 0180 0300 @@ -924,13 +923,14 @@ BITMAP 0C00 1800 3000 +6000 +3000 1800 0C00 0600 0300 0180 00C0 -0060 0000 0000 0000 @@ -2928,28 +2928,28 @@ DWIDTH 12 0 BBX 12 24 0 -5 BITMAP 0000 -3C00 +7800 +0C00 +0600 +0600 +0600 +0600 +0600 +0600 0600 0300 -0300 -0300 -0300 -0300 -0300 -0300 -0180 -00E0 -00E0 -0180 -0300 -0300 -0300 -0300 -0300 -0300 +01C0 +01C0 0300 0600 -3C00 +0600 +0600 +0600 +0600 +0600 +0600 +0C00 +7800 0000 ENDCHAR STARTCHAR TILDE @@ -11725,13 +11725,44 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR CARON +ENCODING 711 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +30C0 +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 BREVE ENCODING 728 SWIDTH 500 0 DWIDTH 12 0 BBX 12 24 0 -5 BITMAP -30C0 +1980 1980 0F00 0000 @@ -14236,6 +14267,99 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR HYPHEN +ENCODING 8208 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +1F80 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR EN DASH +ENCODING 8211 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +3FC0 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR EM DASH +ENCODING 8212 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +3FC0 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR DOUBLE VERTICAL LINE ENCODING 8214 SWIDTH 500 0 @@ -14391,6 +14515,68 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR DAGGER +ENCODING 8224 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0600 +0600 +0600 +3FC0 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0000 +0000 +0000 +ENDCHAR +STARTCHAR DOUBLE DAGGER +ENCODING 8225 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0600 +0600 +0600 +3FC0 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +0600 +3FC0 +0600 +0600 +0600 +0000 +0000 +0000 +ENDCHAR STARTCHAR BULLET ENCODING 8226 SWIDTH 500 0 @@ -19661,6 +19847,68 @@ FFF0 FFF0 FFF0 ENDCHAR +STARTCHAR BLACK SQUARE +ENCODING 9632 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +3FC0 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR WHITE SQUARE +ENCODING 9633 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +3FC0 +30C0 +30C0 +30C0 +30C0 +30C0 +30C0 +30C0 +30C0 +30C0 +30C0 +3FC0 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR BLACK DIAMOND ENCODING 9670 SWIDTH 500 0 @@ -20281,6 +20529,68 @@ FFE0 0000 0000 ENDCHAR +STARTCHAR MATHEMATICAL LEFT ANGLE BRACKET +ENCODING 10216 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0300 +0300 +0600 +0600 +0C00 +0C00 +1800 +1800 +1800 +0C00 +0C00 +0600 +0600 +0300 +0300 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR MATHEMATICAL RIGHT ANGLE BRACKET +ENCODING 10217 +SWIDTH 500 0 +DWIDTH 12 0 +BBX 12 24 0 -5 +BITMAP +0000 +0000 +0000 +0000 +0C00 +0C00 +0600 +0600 +0300 +0300 +0180 +0180 +0180 +0300 +0300 +0600 +0600 +0C00 +0C00 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR BRAILLE PATTERN BLANK ENCODING 10240 SWIDTH 500 0 diff --git a/contrib/spleen/spleen-16x32.bdf b/contrib/spleen/spleen-16x32.bdf index 4d27a4ba1939..48cbf3223799 100644 --- a/contrib/spleen/spleen-16x32.bdf +++ b/contrib/spleen/spleen-16x32.bdf @@ -1,11 +1,11 @@ STARTFONT 2.1 COMMENT /* -COMMENT * Spleen 16x32 2.1.0 -COMMENT * Copyright (c) 2018-2024, Frederic Cambus +COMMENT * Spleen 16x32 2.2.0 +COMMENT * Copyright (c) 2018-2026, Frederic Cambus COMMENT * https://www.cambus.net/ COMMENT * COMMENT * Created: 2018-08-12 -COMMENT * Last Updated: 2024-03-22 +COMMENT * Last Updated: 2026-01-29 COMMENT * COMMENT * Spleen is released under the BSD 2-Clause license. COMMENT * See LICENSE file for details. @@ -18,7 +18,7 @@ FONTBOUNDINGBOX 16 32 0 -6 STARTPROPERTIES 20 FAMILY_NAME "Spleen" WEIGHT_NAME "Medium" -FONT_VERSION "2.1.0" +FONT_VERSION "2.2.0" FOUNDRY "misc" SLANT "R" SETWIDTH_NAME "Normal" @@ -33,11 +33,11 @@ CHARSET_ENCODING "1" MIN_SPACE 16 FONT_ASCENT 26 FONT_DESCENT 6 -COPYRIGHT "Copyright (c) 2018-2024, Frederic Cambus" +COPYRIGHT "Copyright (c) 2018-2026, Frederic Cambus" DEFAULT_CHAR 32 _GBDFED_INFO "Edited with gbdfed 1.6." ENDPROPERTIES -CHARS 969 +CHARS 978 STARTCHAR SPACE ENCODING 32 SWIDTH 500 0 @@ -14780,6 +14780,45 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR CARON +ENCODING 711 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0E70 +07E0 +03C0 +0180 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR BREVE ENCODING 728 SWIDTH 500 0 @@ -18407,6 +18446,123 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR HYPHEN +ENCODING 8208 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +1FF8 +1FF8 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR EN DASH +ENCODING 8211 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +3FFC +3FFC +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR EM DASH +ENCODING 8212 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +3FFC +3FFC +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR DOUBLE VERTICAL LINE ENCODING 8214 SWIDTH 500 0 @@ -18602,6 +18758,84 @@ BITMAP 0000 0000 ENDCHAR +STARTCHAR DAGGER +ENCODING 8224 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0180 +0180 +0180 +0180 +1FF8 +1FF8 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR DOUBLE DAGGER +ENCODING 8225 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0180 +0180 +0180 +0180 +1FF8 +1FF8 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +0180 +1FF8 +1FF8 +0180 +0180 +0180 +0180 +0000 +0000 +0000 +0000 +ENDCHAR STARTCHAR BULLET ENCODING 8226 SWIDTH 500 0 @@ -25987,23 +26221,62 @@ BITMAP 0000 0000 0000 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 -3FF0 +0000 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +1FF8 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +ENDCHAR +STARTCHAR WHITE SQUARE +ENCODING 9633 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 0000 0000 0000 +1FF8 +1FF8 +1818 +1818 +1818 +1818 +1818 +1818 +1818 +1818 +1818 +1818 +1FF8 +1FF8 +0000 +0000 0000 0000 0000 @@ -27260,6 +27533,84 @@ F800 0000 0000 ENDCHAR +STARTCHAR MATHEMATICAL LEFT ANGLE BRACKET +ENCODING 10216 +SWIDTH 500 0 +DWIDTH 16 0 +BBX 16 32 0 -6 +BITMAP +0000 +0000 +0000 +0000 +0000 +0000 +0070 +00E0 +00E0 +01C0 +01C0 +0380 +0380 +0700 +0700 +0E00 +0E00 +0700 +0700 +0380 *** 1574 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698510e2.18ef6.644e3e17>