From nobody Thu May 04 15:47:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QByr72fQRz49DwX; Thu, 4 May 2023 15:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QByr725Svz3hp4; Thu, 4 May 2023 15:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683215255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/mCBEALQuG3Ho7ie9gb+DOXrDLmkz6GqJDU3uJ8Sj4=; b=aHKZ3JC94EiUCKz3SVGQ5+t3YQSALFjXjL3hGnDbqQAH6KPsIE59rkZmQPEygqcD+jjf2F TSKX5K5m78NGAKpX4SG0AE/M5Cj6NPhNKMHDaWrIH7ajKjHVcK2LbBox6zaAUI3UXORSD8 a7EwaB41EVZakVGPPQ754HK1p45ugyQlTVxQGf7tfczH3LZx4OBlAV9faxNZXB0jjzAcFW nkUM0QiISfuRg4MwQIjiyEuqxPY/vtnoHNy4Q6IA+IWQ3acaCCDSOEQPsC0xEKhZ4s+1ei bYeSpv5O6ou+s0qNWcr7lNdx9BCWBTnCBwJMu2G42xyksVpjLYz2QFe73iKoxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683215255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/mCBEALQuG3Ho7ie9gb+DOXrDLmkz6GqJDU3uJ8Sj4=; b=ulJTfuvAgLWaUw9gBmgJzhimcl2GHZKsoqZWREf+ivWiOL/kuS/8mXjkKToPRBhDFBMRgL n9Q27JCmbMRvUtvouPJr6ARf+AIoHN6el8a3QPsG+07s60Jj319itNbTus/g86ZhuPSu0v sMXgr6xn3sta9y11newex9/NPia9rtRLeRvKdbbLl3d2F0i5YmsS1XRBnRYSfLlRCp4AwM NSM5u7J/S+Mk7j6/eJqrQi5D48zYaQhXaEQyl+XQuDVFMNjEpXh+yrIfF06W7bNwNkn3dM xooNzpLA1GJpfpsnCZ6bbbcyGFFp0UgSvvm9MC3D2jAWGcIuOH88/YvLYXY4Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683215255; a=rsa-sha256; cv=none; b=I/Q8CNgBynK+R8W0bnQqP6JSk2oWVGWWv2FS//l6wGMMli7CHvuyKcvvFqrxg8J4G07W/j jcziaE0U/1ByDSCuEWdXDooiJlCwMIePdb6VgYh8FH+HP5AORCO6WnKy/vV/R+lWdxt303 Pp2m2JyW5gjFGZU90dC77dZYPr/YaJR33Cdp/hKoywBsXHPoRu+SWdX3SPbZ1eBg5zW+HR ZHZbELFs4Z+OuSxJedmoGKLq6WYs0bIPp/iPBljcmRjyySrAugDHJdrHSb9xbCp1Y5fLeP RaeLRrGklLKGS6GCfIqYncKg8WSq/RbDoipfATpDygHKcFDseW5r34jEhPokKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QByr717RwzJ4x; Thu, 4 May 2023 15:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 344FlZVY069792; Thu, 4 May 2023 15:47:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344FlYn2069791; Thu, 4 May 2023 15:47:34 GMT (envelope-from git) Date: Thu, 4 May 2023 15:47:34 GMT Message-Id: <202305041547.344FlYn2069791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0d66206fff44 - main - Add 'contrib/spleen/' from commit '5eab6333fa27e2b6954c6927859d462a004e57bb' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d66206fff44f864ea8a4b220c3a53b4caa959a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0d66206fff44f864ea8a4b220c3a53b4caa959a0 commit 0d66206fff44f864ea8a4b220c3a53b4caa959a0 Merge: 3582acbad303 5eab6333fa27 Author: Ed Maste AuthorDate: 2023-05-04 15:46:25 +0000 Commit: Ed Maste CommitDate: 2023-05-04 15:46:40 +0000 Add 'contrib/spleen/' from commit '5eab6333fa27e2b6954c6927859d462a004e57bb' git-subtree-dir: contrib/spleen git-subtree-mainline: 3582acbad303bb69895457a8a7dae0f485efe8ea git-subtree-split: 5eab6333fa27e2b6954c6927859d462a004e57bb Reviewed by: imp [earlier] Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20653 contrib/spleen/AUTHORS | 5 + contrib/spleen/ChangeLog | 264 + contrib/spleen/LICENSE | 24 + contrib/spleen/README.md | 236 + contrib/spleen/spleen-12x24.bdf | 26081 +++++++++++++++++ contrib/spleen/spleen-16x32.bdf | 32918 +++++++++++++++++++++ contrib/spleen/spleen-32x64.bdf | 59894 ++++++++++++++++++++++++++++++++++++++ contrib/spleen/spleen-5x8.bdf | 7121 +++++ contrib/spleen/spleen-6x12.bdf | 9009 ++++++ contrib/spleen/spleen-8x16.bdf | 20465 +++++++++++++ 10 files changed, 156017 insertions(+) diff --cc contrib/spleen/AUTHORS index 000000000000,1fdb3485e79a..1fdb3485e79a mode 000000,100644..100644 --- a/contrib/spleen/AUTHORS +++ b/contrib/spleen/AUTHORS diff --cc contrib/spleen/ChangeLog index 000000000000,2688c8a9dc50..2688c8a9dc50 mode 000000,100644..100644 --- a/contrib/spleen/ChangeLog +++ b/contrib/spleen/ChangeLog diff --cc contrib/spleen/LICENSE index 000000000000,7f639bf61a6d..7f639bf61a6d mode 000000,100644..100644 --- a/contrib/spleen/LICENSE +++ b/contrib/spleen/LICENSE diff --cc contrib/spleen/README.md index 000000000000,000000000000..629a13711038 new file mode 100644 --- /dev/null +++ b/contrib/spleen/README.md @@@ -1,0 -1,0 +1,236 @@@ ++``` ++ ++ :::::::::::::::::::: ++ ::: ::: ++ _____ _______ __. ________ ________ ________. ::: ++ _) _//__ __/ __ / |.\ __ /.\ __ /.\ _. | ::: ++ .\____ /.\ )/ / || )/ | )/ | \| | ::: ++ | )/ | __/| \ _____| _____| | |_ ::: ++ |____ |_____| |_____/____\\ |____\\ | |____/ ::: ++ - -- -- \_____| -H7--------------------------- `----' ----- ::: - - ++ ::: ::: ++ :::::::::::::::::::: ++ ++``` ++ ++# Spleen ++ ++Spleen is a monospaced bitmap font available in 6 sizes: ++ ++- 5x8 ++- 6x12 ++- 8x16 ++- 12x24 ++- 16x32 ++- 32x64 ++ ++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. ++ ++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, ++Block Elements, and Braille Patterns Unicode blocks, except for the 5x8 and the ++6x12 versions. ++ ++Due to character size constraints, the 5x8 version only contains printable ++ASCII characters, the Braille Patterns Unicode block, and light Box Drawing ++characters. Please also note that there is no OpenType version for this size. ++ ++As of Spleen 1.8.0, there is now a 6x12 version containing the same Unicode ++blocks as the 5x8 version and the Latin-1 Supplement Unicode block. ++ ++Spleen also has support for Powerline symbols out of the box. ++ ++The font name is a reference to Baudelaire. ++ ++## Screenshots ++ ++The following screenshots show Spleen 16x32 displaying code and prose. ++ ++![Spleen - Hello][1] ++ ++![Spleen - L'etranger][2] ++ ++ASCII characters for all sizes: ++ ++Spleen 5x8: ++ ++![Spleen - ASCII characters - 5x8][3] ++ ++Spleen 6x12: ++ ++![Spleen - ASCII characters - 6x12][4] ++ ++Spleen 8x16: ++ ++![Spleen - ASCII characters - 8x16][5] ++ ++Spleen 12x24: ++ ++![Spleen - ASCII characters - 12x24][6] ++ ++Spleen 16x32: ++![Spleen - ASCII characters - 16x32][7] ++ ++Spleen 32x64: ++![Spleen - ASCII characters - 32x64][8] ++ ++## XLFD font names ++ ++``` ++-misc-spleen-medium-r-normal--8-80-72-72-c-50-iso10646-1 ++-misc-spleen-medium-r-normal--12-120-72-72-c-60-iso10646-1 ++-misc-spleen-medium-r-normal--16-160-72-72-c-80-iso10646-1 ++-misc-spleen-medium-r-normal--24-240-72-72-c-120-iso10646-1 ++-misc-spleen-medium-r-normal--32-320-72-72-c-160-iso10646-1 ++-misc-spleen-medium-r-normal--64-640-72-72-c-320-iso10646-1 ++``` ++ ++## Packages ++ ++Spleen packages are available for: ++ ++- [OpenBSD][9] ++- [NetBSD][10] ++- [FreeBSD][11] ++- [Arch Linux][12] ++- [Void Linux][13] ++- [Nix][14] ++- [Debian][15] ++- [Ubuntu][16] ++- [MacPorts][17] ++ ++## Manual installation ++ ++### *BSD and Linux ++ ++Clone the repository, convert the files to the Portable Compiled Format ++(PCF) using **bdftopcf** and run **mkfontdir** in the directory. ++ ++Alternatively, release tarballs provide PCF files for each size. ++ ++### macOS ++ ++macOS users should use the `.dfont` files provided in the release tarballs. ++ ++### Windows ++ ++Windows users should use the `.fon` or `.otf` files provided in the release ++tarballs. ++ ++## Usage ++ ++### *BSD and Linux ++ ++Update the font path to include **Spleen**: ++ ++ xset +fp /usr/local/share/fonts/spleen/ ++ ++Update **.Xdefaults** and add one of the following directives: ++ ++ xterm*faceName: spleen:pixelsize=8:antialias=false ++ xterm*faceName: spleen:pixelsize=12:antialias=false ++ xterm*faceName: spleen:pixelsize=16:antialias=false ++ xterm*faceName: spleen:pixelsize=24:antialias=false ++ xterm*faceName: spleen:pixelsize=32:antialias=false ++ xterm*faceName: spleen:pixelsize=64:antialias=false ++ ++Launch **xterm**. ++ ++Ubuntu has bitmap fonts support disabled by default, instructions to enable ++it are available [here][18]. ++ ++### Linux console ++ ++Release tarballs provide PSF files for each size, `setfont` can be used ++to load and set the desired font. ++ ++### NetBSD console ++ ++NetBSD has .fnt files for each size which can be loaded using wsfontload(8). ++ ++For example, to load Spleen 16x32: ++ ++ wsfontload -N spleen-16x32 -w 16 -h 32 /usr/share/wscons/fonts/spleen-16x32.fnt ++ wsconsctl -dw font=spleen-16x32 ++ ++### FreeBSD console ++ ++The FreeBSD package contains .fnt files which can be loaded using ++vidcontrol(1). ++ ++For example, to load Spleen 16x32: ++ ++ vidcontrol -f /usr/local/share/fonts/spleen/spleen-16x32.fnt ++ ++### OpenType versions ++ ++Spleen release tarballs now contains OTF versions generated automatically ++from the BDF files, using [bdf2sfd][19]. Each font has a different name, ++allowing them to be installed alongside. ++ ++They should be used in the exact size specified below, with anti-aliasing ++disabled. ++ ++- Spleen 6x12: 9 Pt (12 pixels) ++- Spleen 8x16: 12 Pt (16 pixels) ++- Spleen 12x24: 18 Pt (24 pixels) ++- Spleen 16x32: 24 Pt (32 pixels) ++- Spleen 32x64: 48 Pt (64 pixels) ++ ++## License ++ ++Spleen is released under the BSD 2-Clause license. See `LICENSE` file for ++details. ++ ++## Author ++ ++Spleen is developed by Frederic Cambus. ++ ++- Site: https://www.cambus.net ++ ++## Resources ++ ++- [Spleen - Monospaced bitmap fonts][20] (2018) ++- [New console font Spleen made default][21] (2019) ++- [NetBSD, CTWM, and Spleen][22] (2021) ++ ++GitHub: https://github.com/fcambus/spleen ++ ++## Trivia ++ ++- Spleen is the default font for OpenBSD consoles since January 2019 ++- Spleen was imported in the NetBSD src tree in March 2019 ++- Spleen 12x24 was used in the Haiku [kernel debugger][23] (on high resolution ++ displays) from May 2021 to June 2022 ++- [msTERM][24], a Terminal program for MailStation devices uses Spleen 5x8 ++- [FBInk][25], a library to print text & images to an eInk Linux framebuffer ++ embeds Spleen 16x32 ++ ++[1]: https://www.cambus.net/content/2018/09/spleen-hello.png ++[2]: https://www.cambus.net/content/2018/09/spleen-etranger.png ++[3]: https://www.cambus.net/files/spleen/spleen-5x8.png ++[4]: https://www.cambus.net/files/spleen/spleen-6x12.png ++[5]: https://www.cambus.net/files/spleen/spleen-8x16.png ++[6]: https://www.cambus.net/files/spleen/spleen-12x24.png ++[7]: https://www.cambus.net/files/spleen/spleen-16x32.png ++[8]: https://www.cambus.net/files/spleen/spleen-32x64.png ++[9]: https://openports.pl/path/fonts/spleen ++[10]: https://pkgsrc.se/fonts/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 ++[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://git.haiku-os.org/haiku/commit/?id=29a109bd6c01ce71bb61177ee9ff0417e74c1e18 ++[24]: https://github.com/jcs/msTERM ++[25]: https://github.com/NiLuJe/FBInk diff --cc contrib/spleen/spleen-12x24.bdf index 000000000000,081694e4c63d..081694e4c63d mode 000000,100644..100644 --- a/contrib/spleen/spleen-12x24.bdf +++ b/contrib/spleen/spleen-12x24.bdf diff --cc contrib/spleen/spleen-16x32.bdf index 000000000000,08f888ba87b8..08f888ba87b8 mode 000000,100644..100644 --- a/contrib/spleen/spleen-16x32.bdf +++ b/contrib/spleen/spleen-16x32.bdf diff --cc contrib/spleen/spleen-32x64.bdf index 000000000000,d67331a3206e..d67331a3206e mode 000000,100644..100644 --- a/contrib/spleen/spleen-32x64.bdf +++ b/contrib/spleen/spleen-32x64.bdf diff --cc contrib/spleen/spleen-5x8.bdf index 000000000000,4cf57171ce82..4cf57171ce82 mode 000000,100644..100644 --- a/contrib/spleen/spleen-5x8.bdf +++ b/contrib/spleen/spleen-5x8.bdf diff --cc contrib/spleen/spleen-6x12.bdf index 000000000000,1b1b95f370ad..1b1b95f370ad mode 000000,100644..100644 --- a/contrib/spleen/spleen-6x12.bdf +++ b/contrib/spleen/spleen-6x12.bdf diff --cc contrib/spleen/spleen-8x16.bdf index 000000000000,4509fb709e0e..4509fb709e0e mode 000000,100644..100644 --- a/contrib/spleen/spleen-8x16.bdf +++ b/contrib/spleen/spleen-8x16.bdf