Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
ttyp0-font update
To:
Christopher Zimmermann <chrisz@openbsd.org>
Cc:
ports <ports@openbsd.org>, sr@strahinja.org
Date:
Mon, 3 Nov 2025 10:30:05 +0000

Download raw body.

Thread
This updates ttyp0-font to 2.1 (see 2.0 and 2.1 sections in
https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/CHANGELOG.txt),
and:

- adds a flavour 'dz' for dotted zero
- adds a flavour 'sc' to use Serbian forms for Cyrillic italic
(https://marc.info/?l=openbsd-misc&m=176215878123021&w=2)
- switches to upstream's new built-in handling for OTB
- since we have bdfresize anyway, adds upstream's new scaled
large fonts for hidpi
- adds comments to Makefile about what the flavours do

Upstream no longer builds non-unicode pcf by default. They could be
reenabled if wanted but I don't think we need them.

any comments? ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/Makefile,v
diff -u -p -r1.95 Makefile
--- Makefile	17 Oct 2025 12:12:46 -0000	1.95
+++ Makefile	3 Nov 2025 10:18:00 -0000
@@ -113,8 +113,11 @@
      SUBDIR += tt2020
      SUBDIR += ttyp0-font
      SUBDIR += ttyp0-font,ct
+     SUBDIR += ttyp0-font,ct,dz
+     SUBDIR += ttyp0-font,dz
      SUBDIR += ttyp0-font,nbd
      SUBDIR += ttyp0-font,nbs
+     SUBDIR += ttyp0-font,sc
      SUBDIR += ttyp0-font,sq
      SUBDIR += ttyp0-font,sz
      SUBDIR += ubuntu-fonts
Index: ttyp0-font/Makefile
===================================================================
RCS file: /cvs/ports/fonts/ttyp0-font/Makefile,v
diff -u -p -r1.3 Makefile
--- ttyp0-font/Makefile	21 Sep 2023 15:28:12 -0000	1.3
+++ ttyp0-font/Makefile	3 Nov 2025 10:18:00 -0000
@@ -1,6 +1,6 @@
 COMMENT =		monospace bitmap screen fonts
 
-PKGNAME =		ttyp0-1.3
+PKGNAME =		ttyp0-2.1
 DISTNAME =		uw-${PKGNAME}
 CATEGORIES =		fonts x11
 
@@ -14,51 +14,66 @@ PERMIT_PACKAGE =	Yes
 SITES =			https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 
 USE_GMAKE =		Yes
-MAKE_FLAGS =		PCFDIR=${PREFIX}/share/fonts/uw-ttyp0
+BUILD_DEPENDS =		sysutils/bdfresize
+MAKE_FLAGS =		GEN_OTB=1 \
+			GEN_PCF=1
 
 CONFIGURE_STYLE =	simple
+CONFIGURE_ARGS =	--otbdir=${PREFIX}/share/fonts/uw-ttyp0 \
+			--pcfdir=${PREFIX}/share/fonts/uw-ttyp0
 NO_TEST =		Yes
 USE_X11 =		Yes
 
-FLAVORS =		sq ct nbs nbd sz
+FLAVORS =		sq ct nbs nbd sz dz sc
 FLAVOR ?=
 
 .if ${FLAVOR:Msq}
-VARIANTS +=	"COPYTO AccStress PApostropheAscii"
-VARIANTS +=	"COPYTO PAmComma AccGraveAscii"
+# straight accent and apostrophe
+VARIANTS +=	"COPYTO PApostropheStraight PApostropheAscii"
+VARIANTS +=	"COPYTO AccGraveStraight AccGraveAscii"
 .endif
 
-.if ${FLAVOR:Msz}
+.if ${FLAVOR:Msz} && ${FLAVOR:Mdz}
+ERRORS +=	"Fatal: Select at most one of sz and dz"
+.elif ${FLAVOR:Msz}
+# slashed zero
 VARIANTS +=	"COPYTO Digit0Slashed Digit0"
+.elif ${FLAVOR:Mdz}
+# dotted zero
+VARIANTS +=	"COPYTO Digit0Dotted Digit0"
 .endif
 
 .if ${FLAVOR:Mct}
+# centered ASCII tilde
 VARIANTS +=	"COPYTO MTilde AccTildeAscii"
 .endif
 
 .if ${FLAVOR:Mnbs} && ${FLAVOR:Mnbd}
 ERRORS +=	"Fatal: Select at most one of nbs and nbd"
 .elif ${FLAVOR:Mnbs}
+#- display no-break space like normal space
 VARIANTS +=	"COPYTO Space SpaceNoBreak"
 .elif ${FLAVOR:Mnbd}
+#- display no-break space with a dot
 VARIANTS +=	"COPYTO DVisibleSpace SpaceNoBreak"
 .endif
 
+.if ${FLAVOR:Msc}
+# Serbian rather than eastern Cyrillic italics
+VARIANTS +=	"COPYTO CySmlBeSrb CySmlBe"
+VARIANTS +=	"IFFONT -I- COPYTO CySmlGheSrb CySmlGhe"
+VARIANTS +=	"IFFONT -I- COPYTO CySmlDeSrb CySmlDe"
+VARIANTS +=	"IFFONT -I- COPYTO CySmlPeSrb CySmlPe"
+VARIANTS +=	"IFFONT -I- COPYTO CySmlTeSrb CySmlTe"
+VARIANTS +=	"IFFONT -I- COPYTO CySmlGheAcuteMcd CySmlGheAcute"
+.endif
+
 post-configure:
 	for var in ${VARIANTS}; do \
 		echo $$var >>${WRKSRC}/VARIANTS.dat; \
 	done
 
-post-build:
-	mkdir ${WRKSRC}/genotb
-	for bdf in ${WRKSRC}/genbdf/t0-*-uni.bdf; do \
-		${X11BASE}/bin/fonttosfnt \
-		  -o ${WRKSRC}/genotb/`basename $$bdf .bdf`.otb \
-		  $$bdf; \
-	done
-
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/uw-ttyp0
-	${INSTALL_DATA} ${WRKSRC}/genotb/*.otb ${PREFIX}/share/fonts/uw-ttyp0
 
 .include <bsd.port.mk>
Index: ttyp0-font/distinfo
===================================================================
RCS file: /cvs/ports/fonts/ttyp0-font/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- ttyp0-font/distinfo	21 Nov 2020 16:47:17 -0000	1.1.1.1
+++ ttyp0-font/distinfo	3 Nov 2025 10:18:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (uw-ttyp0-1.3.tar.gz) = KIrPCK1ngzGtTz8laOe5H5yCo5Ka2DsuIFmjzdco4O4=
-SIZE (uw-ttyp0-1.3.tar.gz) = 702217
+SHA256 (uw-ttyp0-2.1.tar.gz) = mVBt2HlOGl1c1YEebB5V7u+Yn4w1Af25Jlvalyq6FjA=
+SIZE (uw-ttyp0-2.1.tar.gz) = 2658507
Index: ttyp0-font/patches/patch-TARGETS_PCF_dat
===================================================================
RCS file: ttyp0-font/patches/patch-TARGETS_PCF_dat
diff -N ttyp0-font/patches/patch-TARGETS_PCF_dat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ttyp0-font/patches/patch-TARGETS_PCF_dat	3 Nov 2025 10:18:00 -0000
@@ -0,0 +1,12 @@
+Index: TARGETS_PCF.dat
+--- TARGETS_PCF.dat.orig
++++ TARGETS_PCF.dat
+@@ -24,6 +24,8 @@
+ # line accordingly:
+ 
+ SIZES_PCF = 11 12 13 14 15 16 17 18 22 30 40 11b 12b 13b 14b 15b 16b 17b 18b 22b 30b 40b 15i 16i 17i 18i 30i 40i
++SIZES_PCF += 60 60b 60i
++SIZES_PCF += 80 80b 80i
+ 
+ # **********************************************************************
+ #
Index: ttyp0-font/pkg/DESCR
===================================================================
RCS file: /cvs/ports/fonts/ttyp0-font/pkg/DESCR,v
diff -u -p -r1.1.1.1 DESCR
--- ttyp0-font/pkg/DESCR	21 Nov 2020 16:47:17 -0000	1.1.1.1
+++ ttyp0-font/pkg/DESCR	3 Nov 2025 10:18:00 -0000
@@ -1,21 +1,30 @@
-UW ttyp0 is a family of bitmap programmer's fonts. It covers most of the Latin
-and Cyrillic alphabet, Greek, Armenian, Georgian (only Mkhedruli), Hebrew
-(without cantillation marks), Thai, most of IPA (but no UPA), standard
-punctuation, common symbols, some mathematics, line graphics, a few dingbats,
-and Powerline delimiter symbols. For many characters, several stylistic
-variants are provided (e.g., regular, dotted, or slashed zero, raised or
-centered tilde and asterisk, Russian, Serbian, or Bulgarian Cyrillic
-characters), that can be selected at build time. In addition to Unicode
-(ISO 10646-1), UW ttyp0 supports about thirty 8-bit encodings (code pages).
+UW ttyp0 is a family of monospaced bitmap fonts. It covers most of
+the Latin and Cyrillic alphabet, Greek, Armenian, Georgian (only
+Mkhedruli), Hebrew (without cantillation marks), Tifinagh, Thai,
+Braille, most of IPA (but no UPA), standard punctuation, common symbols,
+some mathematics, line graphics, a few dingbats, and Powerline delimiter
+symbols (about 3800 Unicode characters).
 
-UW ttyp0 comes in nine sizes from 6x11 to 11x22. In all of the sizes there are
-regular and bold versions; for some there is also a (somewhat experimental)
-italic.
+The UW ttyp0 fonts are available in bdf, pcf, and otb format for X11,
+and as console fonts for Linux, FreeBSD (vt and syscons), NetBSD, and
+OpenBSD. In addition to Unicode (ISO 10646-1), UW ttyp0 supports more
+than 50 8-bit encodings (code pages).
 
-Flavors:
+UW ttyp0 comes in eleven sizes from 6x11 to 18x40. 28x60 and 36x80 can
+be generated by naive scaling (meant only for high-resolution displays).
+All sizes have regular and bold versions; some also an italic.
+
+For many characters, several stylistic variants are provided (e.g.,
+regular, dotted, or slashed zero, raised or centered tilde and asterisk,
+Russian, Serbian, or Bulgarian Cyrillic characters), that can be
+selected at build time.
+
+Some of these variants are provided as flavors (most can be combined
+if building from ports):
+
+	sc		- use Serbian forms of Cyrillic italics
 	sq		- straight accent and apostrophe
-	sz		- slashed zero
+	sz/dz		- slashed zero/dotted zero
 	ct		- centered ASCII tilde
-	nbs		- display no-break space like normal space
+	nbs/nbd		- display no-break space like normal space/with a dot
 			  (this font displays it as a box by default)
-	nbd		- display no-break space with a dot
Index: ttyp0-font/pkg/PLIST
===================================================================
RCS file: /cvs/ports/fonts/ttyp0-font/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- ttyp0-font/pkg/PLIST	11 Mar 2022 19:00:27 -0000	1.2
+++ ttyp0-font/pkg/PLIST	3 Nov 2025 10:18:00 -0000
@@ -1,180 +1,66 @@
 share/fonts/
 @fontdir share/fonts/uw-ttyp0/
+share/fonts/uw-ttyp0/UW-Ttyp0-11-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-11-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-12-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-12-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-13-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-13-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-14-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-14-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-15-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-15-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-15-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-16-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-16-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-16-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-17-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-17-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-17-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-18-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-18-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-18-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-22-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-22-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-30-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-30-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-30-Regular.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-40-Bold.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-40-Italic.otb
+share/fonts/uw-ttyp0/UW-Ttyp0-40-Regular.otb
 @comment share/fonts/uw-ttyp0/fonts.dir
 @comment share/fonts/uw-ttyp0/fonts.scale
-share/fonts/uw-ttyp0/t0-11-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-11-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-11-uni.otb
 share/fonts/uw-ttyp0/t0-11-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-uni.otb
 share/fonts/uw-ttyp0/t0-11b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-12-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-12-uni.otb
 share/fonts/uw-ttyp0/t0-12-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-uni.otb
 share/fonts/uw-ttyp0/t0-12b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-13-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-13-uni.otb
 share/fonts/uw-ttyp0/t0-13-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-uni.otb
 share/fonts/uw-ttyp0/t0-13b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-14-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-14-uni.otb
 share/fonts/uw-ttyp0/t0-14-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-uni.otb
 share/fonts/uw-ttyp0/t0-14b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15-uni.otb
 share/fonts/uw-ttyp0/t0-15-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-uni.otb
 share/fonts/uw-ttyp0/t0-15b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-uni.otb
 share/fonts/uw-ttyp0/t0-15i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16-uni.otb
 share/fonts/uw-ttyp0/t0-16-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-uni.otb
 share/fonts/uw-ttyp0/t0-16b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-uni.otb
 share/fonts/uw-ttyp0/t0-16i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17-uni.otb
 share/fonts/uw-ttyp0/t0-17-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-uni.otb
 share/fonts/uw-ttyp0/t0-17b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-uni.otb
 share/fonts/uw-ttyp0/t0-17i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18-uni.otb
 share/fonts/uw-ttyp0/t0-18-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-uni.otb
 share/fonts/uw-ttyp0/t0-18b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-uni.otb
 share/fonts/uw-ttyp0/t0-18i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-22-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-22-uni.otb
 share/fonts/uw-ttyp0/t0-22-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-uni.otb
 share/fonts/uw-ttyp0/t0-22b-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-30-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-30b-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-30i-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-40-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-40b-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-40i-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-60-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-60b-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-60i-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-80-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-80b-uni.pcf.gz
+share/fonts/uw-ttyp0/t0-80i-uni.pcf.gz