fonts: WIP.

8 files changed, 92 insertions, 56 deletions

diff --git a/fauxtari.7 b/fauxtari.7
index de88ee2..8d81cb9 100644
--- a/fauxtari.7
+++ b/fauxtari.7
@@ -29,12 +29,16 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .TH "FAUXTARI" 7 "2024-07-24" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
-fauxtari \- Atari 8-bit-based font for Linux console and X11
+fauxtari \- Atari 8-bit-based font for Linux console and X11/Wayland/Mac/Windows
 .SH DESCRIPTION
 .sp
 \fBfauxtari\fP is a set of monospaced bitmap fonts for use with the
-Linux console or X11. Most of the glyphs are taken from the Atari
-XL/XE ROM font; see \fBGLYPHS\fP, below.
+Linux console or graphical environments such as X11. Most of the
+glyphs are taken from the Atari XL/XE ROM font; see \fBGLYPHS\fP, below.
+.sp
+Three font formats are provided: \fBpsf\fP, for use with the console;
+\fBbdf\fP, for use with "old\-school" X11 apps such as \fBxterm\fP(1);
+and \fBttf\fP for use with modern X11/Wayland/Mac/Windows apps.
 .SH APPEARANCE
 .sp
 The console (\fBpsf\fP files) and X11 (\fBbdf\fP files) fonts each come
@@ -134,6 +138,8 @@ _
 .sp
 Of course, the smaller font sizes might be too small to read, especially
 on smaller displays.
+.sp
+The TrueType font is scalable, but always retains the pixelated look.
 .SH CONSOLE
 .sp
 If the \fBpsf\fP fonts have been installed to the standard console font
@@ -154,7 +160,35 @@ Replace the 16 with 8 or 24, for the other sizes. For Slackware Linux,
 you can make this the default in \fB/etc/rc.d/rc.font\fP, or just put it
 in \fB/etc/rc.d/rc.local\fP\&. Other Linux distributions will have their
 own ways to set this up (especially systemd\-based ones).
-.SH X11
+.SH X11/ETC
+.SS TTF (scalable)
+.sp
+The scalable font is called \fBFauxtari Scalable Mono\fP, and should be
+selectable from graphical applications that allow choosing the font.
+You may also see \fBFauxtari Fixed Mono\fP in the list; this is the \fBbdf\fP
+font.
+.sp
+It can also be used in \fBurxvt\fP and \fBxterm\fP (provided \fBxterm\fP
+was built with support for TTF fonts):
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+urxvt \-fn \(aqxft:Fauxtari Scalable Mono:pixelsize=16\(aq
+
+xterm \-fa \(aqFauxtari Scalable Mono\(aq \-fs 16
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+The font can be scaled to any size, though it will look best if you
+stick with multiples of 8 pixels.
+.sp
+The scalable font should also work on Wayland, Macintosh, or Windows
+systems, though this hasn\(aqt been tested.
+.SS BDF (non\-scalable)
 .sp
 If the \fBbdf\fP fonts have been installed (via \fBmake install\fP when
 \fBbw\-atari8\-tools\fP is built), you should be able to launch a terminal
@@ -175,11 +209,11 @@ aliases (added to \fBfonts.alias\fP in the font directory); the full
 names are:
 .INDENT 0.0
 .IP \(bu 2
-\-bw\-fauxtari\-medium\-r\-normal\-\-8\-80\-75\-75\-c\-80\-iso10646\-1
+\-bw\-fauxtari fixed mono\-medium\-r\-normal\-\-8\-80\-75\-75\-c\-80\-iso10646\-1
 .IP \(bu 2
-\-bw\-fauxtari\-medium\-r\-normal\-\-16\-160\-75\-75\-c\-160\-iso10646\-1
+\-bw\-fauxtari fixed mono\-medium\-r\-normal\-\-16\-160\-75\-75\-c\-160\-iso10646\-1
 .IP \(bu 2
-\-bw\-fauxtari\-medium\-r\-normal\-\-24\-240\-75\-75\-c\-240\-iso10646\-1
+\-bw\-fauxtari fixed mono\-medium\-r\-normal\-\-24\-240\-75\-75\-c\-240\-iso10646\-1
 .UNINDENT
 .sp
 For \fBurxvt\fP(1), you might have to turn off the \fBboldFont\fP resource (set
@@ -196,23 +230,7 @@ urxvt \-fn fauxtari\-16 \-fb ""
 .UNINDENT
 .sp
 This keeps \fBurxvt\fP from using some other font (from its built\-in
-list, or from your \fBURxvt.font\fP resource) for bold characters. You
-could also try:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-urxvt \-fn \(aqxft:Fauxtari:size=16\(aq
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Note that the "size=" must be one of the available sizes (8, 16, or
-24). Or, rather, \fBurxvt\fP \fIwill\fP use one of these sizes, whichever is the
-next larger than the size you gave it (or, it\(aqll refuse to load the
-font, if the size is too large).
+list, or from your \fBURxvt.font\fP resource) for bold characters.
 .sp
 For \fBst\fP from suckless.org, run:
 .INDENT 0.0
diff --git a/fauxtari.rst b/fauxtari.rst
index be0562e..9e6c972 100644
--- a/fauxtari.rst
+++ b/fauxtari.rst
@@ -2,9 +2,9 @@
 fauxtari
 ========
 
-------------------------------------------------
-Atari 8-bit-based font for Linux console and X11
-------------------------------------------------
+--------------------------------------------------------------------
+Atari 8-bit-based font for Linux console and X11/Wayland/Mac/Windows
+--------------------------------------------------------------------
 
 .. include:: manhdr7.rst
 
@@ -12,8 +12,12 @@ DESCRIPTION
 ===========
 
 **fauxtari** is a set of monospaced bitmap fonts for use with the
-Linux console or X11. Most of the glyphs are taken from the Atari
-XL/XE ROM font; see **GLYPHS**, below.
+Linux console or graphical environments such as X11. Most of the
+glyphs are taken from the Atari XL/XE ROM font; see **GLYPHS**, below.
+
+Three font formats are provided: **psf**, for use with the console;
+**bdf**, for use with "old-school" X11 apps such as **xterm**\(1);
+and **ttf** for use with modern X11/Wayland/Mac/Windows apps.
 
 APPEARANCE
 ==========
@@ -44,6 +48,8 @@ on the screen, in the console or with a fullscreen X terminal:
 Of course, the smaller font sizes might be too small to read, especially
 on smaller displays.
 
+The TrueType font is scalable, but always retains the pixelated look.
+
 CONSOLE
 =======
 
@@ -58,8 +64,32 @@ you can make this the default in **/etc/rc.d/rc.font**, or just put it
 in **/etc/rc.d/rc.local**. Other Linux distributions will have their
 own ways to set this up (especially systemd-based ones).
 
-X11
-===
+X11/etc
+=======
+
+TTF (scalable)
+--------------
+
+The scalable font is called **Fauxtari Scalable Mono**, and should be
+selectable from graphical applications that allow choosing the font.
+You may also see **Fauxtari Fixed Mono** in the list; this is the **bdf**
+font.
+
+It can also be used in **urxvt** and **xterm** (provided **xterm**
+was built with support for TTF fonts)::
+
+  urxvt -fn 'xft:Fauxtari Scalable Mono:pixelsize=16'
+
+  xterm -fa 'Fauxtari Scalable Mono' -fs 16
+
+The font can be scaled to any size, though it will look best if you
+stick with multiples of 8 pixels.
+
+The scalable font should also work on Wayland, Macintosh, or Windows
+systems, though this hasn't been tested.
+
+BDF (non-scalable)
+------------------
 
 If the **bdf** fonts have been installed (via **make install** when
 **bw-atari8-tools** is built), you should be able to launch a terminal
@@ -71,11 +101,11 @@ Replace the 16 with 8 or 24, for the other sizes. These names are
 aliases (added to **fonts.alias** in the font directory); the full
 names are:
 
-- -bw-fauxtari-medium-r-normal--8-80-75-75-c-80-iso10646-1
+- -bw-fauxtari fixed mono-medium-r-normal--8-80-75-75-c-80-iso10646-1
 
-- -bw-fauxtari-medium-r-normal--16-160-75-75-c-160-iso10646-1
+- -bw-fauxtari fixed mono-medium-r-normal--16-160-75-75-c-160-iso10646-1
 
-- -bw-fauxtari-medium-r-normal--24-240-75-75-c-240-iso10646-1
+- -bw-fauxtari fixed mono-medium-r-normal--24-240-75-75-c-240-iso10646-1
 
 For **urxvt**\(1), you might have to turn off the **boldFont** resource (set
 it to an empty string), or run it as::
@@ -83,15 +113,7 @@ it to an empty string), or run it as::
   urxvt -fn fauxtari-16 -fb ""
 
 This keeps **urxvt** from using some other font (from its built-in
-list, or from your **URxvt.font** resource) for bold characters. You
-could also try::
-
-  urxvt -fn 'xft:Fauxtari:size=16'
-
-Note that the "size=" must be one of the available sizes (8, 16, or
-24). Or, rather, **urxvt** *will* use one of these sizes, whichever is the
-next larger than the size you gave it (or, it'll refuse to load the
-font, if the size is too large).
+list, or from your **URxvt.font** resource) for bold characters.
 
 For **st** from suckless.org, run::
 
diff --git a/fonts/fauxtari-16.bdf b/fonts/fauxtari-16.bdf
index 31f4863..0c25a7f 100644
--- a/fonts/fauxtari-16.bdf
+++ b/fonts/fauxtari-16.bdf
@@ -1,10 +1,10 @@
 STARTFONT 2.1
-FONT -BW-Fauxtari-Medium-R-Normal--16-160-75-75-C-160-iso10646-1
+FONT -BW-Fauxtari Fixed Mono-Medium-R-Normal--16-160-75-75-C-160-iso10646-1
 SIZE 16 75 75
 FONTBOUNDINGBOX 16 16 0 -4
 STARTPROPERTIES 17
 FOUNDRY "BW"
-FAMILY_NAME "Fauxtari"
+FAMILY_NAME "Fauxtari Fixed Mono"
 WEIGHT_NAME "Medium"
 SLANT "R"
 SETWIDTH_NAME "Normal"
diff --git a/fonts/fauxtari-24.bdf b/fonts/fauxtari-24.bdf
index a348274..8176cc3 100644
--- a/fonts/fauxtari-24.bdf
+++ b/fonts/fauxtari-24.bdf
@@ -1,10 +1,10 @@
 STARTFONT 2.1
-FONT -BW-Fauxtari-Medium-R-Normal--24-240-75-75-C-240-iso10646-1
+FONT -BW-Fauxtari Fixed Mono-Medium-R-Normal--24-240-75-75-C-240-iso10646-1
 SIZE 24 75 75
 FONTBOUNDINGBOX 24 24 0 -6
 STARTPROPERTIES 17
 FOUNDRY "BW"
-FAMILY_NAME "Fauxtari"
+FAMILY_NAME "Fauxtari Fixed Mono"
 WEIGHT_NAME "Medium"
 SLANT "R"
 SETWIDTH_NAME "Normal"
diff --git a/fonts/fauxtari-8.bdf b/fonts/fauxtari-8.bdf
index c74e4d9..da8f95d 100644
--- a/fonts/fauxtari-8.bdf
+++ b/fonts/fauxtari-8.bdf
@@ -1,10 +1,10 @@
 STARTFONT 2.1
-FONT -BW-Fauxtari-Medium-R-Normal--8-80-75-75-C-80-iso10646-1
+FONT -BW-Fauxtari Fixed Mono-Medium-R-Normal--8-80-75-75-C-80-iso10646-1
 SIZE 8 75 75
 FONTBOUNDINGBOX 8 8 0 -2
 STARTPROPERTIES 17
 FOUNDRY "BW"
-FAMILY_NAME "Fauxtari"
+FAMILY_NAME "Fauxtari Fixed Mono"
 WEIGHT_NAME "Medium"
 SLANT "R"
 SETWIDTH_NAME "Normal"
diff --git a/fonts/fixbdf.pl b/fonts/fixbdf.pl
index 5edbc36..863f1ab 100644
--- a/fonts/fixbdf.pl
+++ b/fonts/fixbdf.pl
@@ -8,7 +8,7 @@ $px = shift || die "$0: missing pixel size argument";
 $pointsize = $px * 10;
 $avgwidth = $px * 10; # square font!
 
-$font = "-BW-Fauxtari-Medium-R-Normal--$px-$pointsize-75-75-C-$avgwidth-iso10646-1";
+$font = "-BW-Fauxtari Fixed Mono-Medium-R-Normal--$px-$pointsize-75-75-C-$avgwidth-iso10646-1";
 
 while(<>) {
 	chomp;
@@ -18,7 +18,7 @@ while(<>) {
 		print <<EOF;
 STARTPROPERTIES $newprop
 FOUNDRY "BW"
-FAMILY_NAME "Fauxtari"
+FAMILY_NAME "Fauxtari Fixed Mono"
 WEIGHT_NAME "Medium"
 SLANT "R"
 SETWIDTH_NAME "Normal"
diff --git a/fonts/mkpsf.pl b/fonts/mkpsf.pl
index 7303d54..a5dbaf8 100644
--- a/fonts/mkpsf.pl
+++ b/fonts/mkpsf.pl
@@ -21,10 +21,6 @@
 # Arabic ROM, plus some info about it and a mention of the Hebrew ROM:
 # https://www.savetz.com/vintagecomputers/arabic65xe/
 
-# TODO;
-# BDF fonts too: psf2bdf --iso10646 --fontname <blah> ...
-# Arabic.
-
 use bytes;
 
 $fontname = "fauxtari";
diff --git a/install-bdf.sh b/install-bdf.sh
index ed6bf20..1853373 100644
--- a/install-bdf.sh
+++ b/install-bdf.sh
@@ -15,7 +15,7 @@ install_font() {
 	  mkfontscale
 	  if ! grep "^$ALIAS" fonts.alias &> /dev/null; then
 		  NAME="$( grep "^$BDF" fonts.dir | cut -d' ' -f2- )"
-		  echo "$ALIAS $NAME" >> fonts.alias
+		  echo "$ALIAS \"$NAME\"" >> fonts.alias
 	  fi
 	)
 }