5 files changed, 199 insertions, 1159 deletions

diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index f6aa9efd34f0..cce109d35a30 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.30
+PORTVERSION=	4.32
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:L}/${PORTNAME}-${PORTVERSION}|}
 
-PATCH_SITES=	${MASTER_SITES}
-
 MAINTAINER=	vlad@vlad.uz.ua
 COMMENT=	Terminus Font - a clean fixed width font
 
@@ -21,6 +19,7 @@ BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USE_PERL5_BUILD=yes
+USE_GMAKE=	yes
 
 OPTIONS=	AO2 "Variant of letter 'a'" off \
 		DV1 "Variant of cyrillic letters 'de' and 've'" off \
@@ -30,38 +29,36 @@ OPTIONS=	AO2 "Variant of letter 'a'" off \
 		KA2 "Variant of cyrillic letter 'ka'" off \
 		CM2 "Variant of letters with circumflex, caron and macron" off
 
+SUB_LIST=	FONTDIR="${PREFIX}/${FONTDIR}"
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	pcf
 FONTDIR=	lib/X11/fonts/${PORTNAME}
 PLIST_SUB+=	FONTDIR=${FONTDIR}
 
+post-extract:
 .if defined(WITH_AO2)
-PATCHFILES+=	terminus-font-4.30-ao2.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ao2.diff
 .endif
-
 .if defined(WITH_DV1)
-PATCHFILES+=	terminus-font-4.30-dv1.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/dv1.diff
 .endif
-
 .if defined(WITH_GE1)
-PATCHFILES+=	terminus-font-4.30-ge1.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ge1.diff
 .endif
-
 .if defined(WITH_GQ2)
-PATCHFILES+=	terminus-font-4.30-gq2.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/gq2.diff
 .endif
-
 .if defined(WITH_IJ1)
-PATCHFILES+=	terminus-font-4.30-ij1.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ij1.diff
 .endif
-
 .if defined(WITH_KA2)
-PATCHFILES+=	terminus-font-4.30-ka2.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ka2.diff
 .endif
-
 .if defined(WITH_CM2)
-PATCHFILES+=	terminus-font-4.30-cm2.diff.gz
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/cm2.diff
 .endif
 
 post-build:
@@ -75,5 +72,6 @@ post-install:
 	@cd ${PREFIX}/${FONTDIR}; mkfontdir
 	@${CP} ${PREFIX}/${FONTDIR}/fonts.dir ${PREFIX}/${FONTDIR}/fonts.scale || true
 	@command fc-cache -f -v ${PREFIX}/${FONTDIR} || true
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/terminus-font/distinfo b/x11-fonts/terminus-font/distinfo
index b4ec04364e99..436ad500c1b6 100644
--- a/x11-fonts/terminus-font/distinfo
+++ b/x11-fonts/terminus-font/distinfo
@@ -1,24 +1,2 @@
-MD5 (terminus-font-4.30.tar.gz) = 6f8bd95b593851f9f5c210a9d33cbbf1
-SHA256 (terminus-font-4.30.tar.gz) = ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a
-SIZE (terminus-font-4.30.tar.gz) = 267236
-MD5 (terminus-font-4.30-ao2.diff.gz) = f1193b61ff9ec832dfb4e5bb193df7d2
-SHA256 (terminus-font-4.30-ao2.diff.gz) = 4586eb56533c3fad417b13d64c88bb97a3604f68dac1fc4c90372c9c93cc82ac
-SIZE (terminus-font-4.30-ao2.diff.gz) = 4064
-MD5 (terminus-font-4.30-dv1.diff.gz) = a94f276f1ce268e81a1a85dbf1d97376
-SHA256 (terminus-font-4.30-dv1.diff.gz) = fc2c3a28e1542ec19083c0739c39fa2e914047173cd78e0da824c41ba2315399
-SIZE (terminus-font-4.30-dv1.diff.gz) = 1242
-MD5 (terminus-font-4.30-ge1.diff.gz) = 4313d28cdf524c3f8b0539e45031dacc
-SHA256 (terminus-font-4.30-ge1.diff.gz) = c84dab5738dbd174399e05ff62e4e7ebaf77c6b1ff24c8c423bd4a7cd47b5f90
-SIZE (terminus-font-4.30-ge1.diff.gz) = 1158
-MD5 (terminus-font-4.30-gq2.diff.gz) = f03b1e0185dabefaca6d209e628e6049
-SHA256 (terminus-font-4.30-gq2.diff.gz) = a021be2398dbc3895ad1bfc7367fd45c96fee42b1c98a53a52aa19732441c563
-SIZE (terminus-font-4.30-gq2.diff.gz) = 648
-MD5 (terminus-font-4.30-ij1.diff.gz) = 1700ce92665bd8c4f2082e68e1957570
-SHA256 (terminus-font-4.30-ij1.diff.gz) = 3c9d74b764d144e963e6d2e41969593a4888b2a3c131466226c0b455993f37ba
-SIZE (terminus-font-4.30-ij1.diff.gz) = 1494
-MD5 (terminus-font-4.30-ka2.diff.gz) = 9424c0fde2e72c3d7453b01caf92369e
-SHA256 (terminus-font-4.30-ka2.diff.gz) = e829803252a6250172902afa65a9cd207ffdf0b57248c26506b9e8abac0363ce
-SIZE (terminus-font-4.30-ka2.diff.gz) = 1067
-MD5 (terminus-font-4.30-cm2.diff.gz) = 02950bf29b803ff673f4434aceb539ea
-SHA256 (terminus-font-4.30-cm2.diff.gz) = eae31c02216ea9b586eea121b7ab70ac71a869c8a62551c719ef1fac397db744
-SIZE (terminus-font-4.30-cm2.diff.gz) = 1429
+SHA256 (terminus-font-4.32.tar.gz) = f05a8afb426af080bc94b6ac9846daac2a3f2e2883feaf96a503bb2e5507aea4
+SIZE (terminus-font-4.32.tar.gz) = 278839
diff --git a/x11-fonts/terminus-font/files/patch-aa b/x11-fonts/terminus-font/files/patch-aa
deleted file mode 100644
index d309a3f93bed..000000000000
--- a/x11-fonts/terminus-font/files/patch-aa
+++ /dev/null
@@ -1,733 +0,0 @@
---- Makefile-orig	2010-07-17 09:12:42.000000000 +0300
-+++ Makefile	2010-07-17 09:22:50.000000000 +0300
-@@ -6,6 +6,7 @@
- BDF2RAW	= $(PERL) ./bdftopsf.pl -h
- UCS2X11	= $(PERL) ./ucstoany.pl
- BDF2PCF	= bdftopcf
-+MKITALIC = mkitalic
- 
- R_88591	= ISO8859 1
- R_88592	= ISO8859 2
-@@ -58,21 +59,29 @@
- 
- PCF_12N	= ter-112n.pcf ter-212n.pcf ter-512n.pcf ter-712n.pcf ter-912n.pcf ter-c12n.pcf ter-d12n.pcf ter-f12n.pcf ter-g12n.pcf ter-k12n.pcf ter-p12n.pcf ter-u12n.pcf ter-x12n.pcf
- PCF_12B	= ter-112b.pcf ter-212b.pcf ter-512b.pcf ter-712b.pcf ter-912b.pcf ter-c12b.pcf ter-d12b.pcf ter-f12b.pcf ter-g12b.pcf ter-k12b.pcf ter-p12b.pcf ter-u12b.pcf ter-x12b.pcf
-+PCF_12I = ter-112i.pcf ter-212i.pcf ter-512i.pcf ter-712i.pcf ter-912i.pcf ter-c12i.pcf ter-d12i.pcf ter-f12i.pcf ter-g12i.pcf ter-k12i.pcf ter-p12i.pcf ter-u12i.pcf ter-x12i.pcf ter-112bi.pcf ter-212bi.pcf ter-512bi.pcf ter-712bi.pcf ter-912bi.pcf ter-c12bi.pcf ter-d12bi.pcf ter-f12bi.pcf ter-g12bi.pcf ter-k12bi.pcf ter-p12bi.pcf ter-u12bi.pcf ter-x12bi.pcf
- PCF_14N	= ter-114n.pcf ter-214n.pcf ter-514n.pcf ter-714n.pcf ter-914n.pcf ter-c14n.pcf ter-d14n.pcf ter-f14n.pcf ter-g14n.pcf ter-k14n.pcf ter-p14n.pcf ter-u14n.pcf ter-x14n.pcf
- PCF_14B	= ter-114b.pcf ter-214b.pcf ter-514b.pcf ter-714b.pcf ter-914b.pcf ter-c14b.pcf ter-d14b.pcf ter-f14b.pcf ter-g14b.pcf ter-k14b.pcf ter-p14b.pcf ter-u14b.pcf ter-x14b.pcf
-+PCF_14I = ter-114i.pcf ter-214i.pcf ter-514i.pcf ter-714i.pcf ter-914i.pcf ter-c14i.pcf ter-d14i.pcf ter-f14i.pcf ter-g14i.pcf ter-k14i.pcf ter-p14i.pcf ter-u14i.pcf ter-x14i.pcf ter-114bi.pcf ter-214bi.pcf ter-514bi.pcf ter-714bi.pcf ter-914bi.pcf ter-c14bi.pcf ter-d14bi.pcf ter-f14bi.pcf ter-g14bi.pcf ter-k14bi.pcf ter-p14bi.pcf ter-u14bi.pcf ter-x14bi.pcf
- PCF_16N	= ter-116n.pcf ter-216n.pcf ter-516n.pcf ter-716n.pcf ter-916n.pcf ter-c16n.pcf ter-d16n.pcf ter-f16n.pcf ter-g16n.pcf ter-k16n.pcf ter-p16n.pcf ter-u16n.pcf ter-x16n.pcf
- PCF_16B	= ter-116b.pcf ter-216b.pcf ter-516b.pcf ter-716b.pcf ter-916b.pcf ter-c16b.pcf ter-d16b.pcf ter-f16b.pcf ter-g16b.pcf ter-k16b.pcf ter-p16b.pcf ter-u16b.pcf ter-x16b.pcf
-+PCF_16I = ter-116i.pcf ter-216i.pcf ter-516i.pcf ter-716i.pcf ter-916i.pcf ter-c16i.pcf ter-d16i.pcf ter-f16i.pcf ter-g16i.pcf ter-k16i.pcf ter-p16i.pcf ter-u16i.pcf ter-x16i.pcf ter-116bi.pcf ter-216bi.pcf ter-516bi.pcf ter-716bi.pcf ter-916bi.pcf ter-c16bi.pcf ter-d16bi.pcf ter-f16bi.pcf ter-g16bi.pcf ter-k16bi.pcf ter-p16bi.pcf ter-u16bi.pcf ter-x16bi.pcf
- PCF_20N	= ter-120n.pcf ter-220n.pcf ter-520n.pcf ter-720n.pcf ter-920n.pcf ter-c20n.pcf ter-d20n.pcf ter-f20n.pcf ter-g20n.pcf ter-k20n.pcf ter-p20n.pcf ter-u20n.pcf ter-x20n.pcf
- PCF_20B	= ter-120b.pcf ter-220b.pcf ter-520b.pcf ter-720b.pcf ter-920b.pcf ter-c20b.pcf ter-d20b.pcf ter-f20b.pcf ter-g20b.pcf ter-k20b.pcf ter-p20b.pcf ter-u20b.pcf ter-x20b.pcf
-+PCF_20I = ter-120i.pcf ter-220i.pcf ter-520i.pcf ter-720i.pcf ter-920i.pcf ter-c20i.pcf ter-d20i.pcf ter-f20i.pcf ter-g20i.pcf ter-k20i.pcf ter-p20i.pcf ter-u20i.pcf ter-x20i.pcf ter-120bi.pcf ter-220bi.pcf ter-520bi.pcf ter-720bi.pcf ter-920bi.pcf ter-c20bi.pcf ter-d20bi.pcf ter-f20bi.pcf ter-g20bi.pcf ter-k20bi.pcf ter-p20bi.pcf ter-u20bi.pcf ter-x20bi.pcf
- PCF_22N	= ter-122n.pcf ter-222n.pcf ter-522n.pcf ter-722n.pcf ter-922n.pcf ter-c22n.pcf ter-d22n.pcf ter-f22n.pcf ter-g22n.pcf ter-k22n.pcf ter-p22n.pcf ter-u22n.pcf ter-x22n.pcf
- PCF_22B	= ter-122b.pcf ter-222b.pcf ter-522b.pcf ter-722b.pcf ter-922b.pcf ter-c22b.pcf ter-d22b.pcf ter-f22b.pcf ter-g22b.pcf ter-k22b.pcf ter-p22b.pcf ter-u22b.pcf ter-x22b.pcf
-+PCF_22I = ter-122i.pcf ter-224i.pcf ter-522i.pcf ter-722i.pcf ter-922i.pcf ter-c22i.pcf ter-d22i.pcf ter-f22i.pcf ter-g22i.pcf ter-k22i.pcf ter-p22i.pcf ter-u22i.pcf ter-x22i.pcf ter-122bi.pcf ter-222bi.pcf ter-522bi.pcf ter-722bi.pcf ter-922bi.pcf ter-c22bi.pcf ter-d22bi.pcf ter-f22bi.pcf ter-g22bi.pcf ter-k22bi.pcf ter-p22bi.pcf ter-u22bi.pcf ter-x22bi.pcf
- PCF_24N	= ter-124n.pcf ter-224n.pcf ter-524n.pcf ter-724n.pcf ter-924n.pcf ter-c24n.pcf ter-d24n.pcf ter-f24n.pcf ter-g24n.pcf ter-k24n.pcf ter-p24n.pcf ter-u24n.pcf ter-x24n.pcf
- PCF_24B	= ter-124b.pcf ter-224b.pcf ter-524b.pcf ter-724b.pcf ter-924b.pcf ter-c24b.pcf ter-d24b.pcf ter-f24b.pcf ter-g24b.pcf ter-k24b.pcf ter-p24b.pcf ter-u24b.pcf ter-x24b.pcf
-+PCF_24I = ter-124i.pcf ter-224i.pcf ter-524i.pcf ter-724i.pcf ter-924i.pcf ter-c24i.pcf ter-d24i.pcf ter-f24i.pcf ter-g24i.pcf ter-k24i.pcf ter-p24i.pcf ter-u24i.pcf ter-x24i.pcf ter-124bi.pcf ter-224bi.pcf ter-524bi.pcf ter-724bi.pcf ter-924bi.pcf ter-c24bi.pcf ter-d24bi.pcf ter-f24bi.pcf ter-g24bi.pcf ter-k24bi.pcf ter-p24bi.pcf ter-u24bi.pcf ter-x24bi.pcf
- PCF_28N	= ter-128n.pcf ter-228n.pcf ter-528n.pcf ter-728n.pcf ter-928n.pcf ter-c28n.pcf ter-d28n.pcf ter-f28n.pcf ter-g28n.pcf ter-k28n.pcf ter-p28n.pcf ter-u28n.pcf ter-x28n.pcf
- PCF_28B	= ter-128b.pcf ter-228b.pcf ter-528b.pcf ter-728b.pcf ter-928b.pcf ter-c28b.pcf ter-d28b.pcf ter-f28b.pcf ter-g28b.pcf ter-k28b.pcf ter-p28b.pcf ter-u28b.pcf ter-x28b.pcf
-+PCF_28I = ter-128i.pcf ter-228i.pcf ter-528i.pcf ter-728i.pcf ter-928i.pcf ter-c28i.pcf ter-d28i.pcf ter-f28i.pcf ter-g28i.pcf ter-k28i.pcf ter-p28i.pcf ter-u28i.pcf ter-x28i.pcf ter-128bi.pcf ter-228bi.pcf ter-528bi.pcf ter-728bi.pcf ter-928bi.pcf ter-c28bi.pcf ter-d28bi.pcf ter-f28bi.pcf ter-g28bi.pcf ter-k28bi.pcf ter-p28bi.pcf ter-u28bi.pcf ter-x28bi.pcf
- PCF_32N	= ter-132n.pcf ter-232n.pcf ter-532n.pcf ter-732n.pcf ter-932n.pcf ter-c32n.pcf ter-d32n.pcf ter-f32n.pcf ter-g32n.pcf ter-k32n.pcf ter-p32n.pcf ter-u32n.pcf ter-x32n.pcf
- PCF_32B	= ter-132b.pcf ter-232b.pcf ter-532b.pcf ter-732b.pcf ter-932b.pcf ter-c32b.pcf ter-d32b.pcf ter-f32b.pcf ter-g32b.pcf ter-k32b.pcf ter-p32b.pcf ter-u32b.pcf ter-x32b.pcf
--PCF	= $(PCF_12N) $(PCF_12B) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
-+PCF_32I = ter-132i.pcf ter-232i.pcf ter-532i.pcf ter-732i.pcf ter-932i.pcf ter-c32i.pcf ter-d32i.pcf ter-f32i.pcf ter-g32i.pcf ter-k32i.pcf ter-p32i.pcf ter-u32i.pcf ter-x32i.pcf ter-132bi.pcf ter-232bi.pcf ter-532bi.pcf ter-732bi.pcf ter-932bi.pcf ter-c32bi.pcf ter-d32bi.pcf ter-f32bi.pcf ter-g32bi.pcf ter-k32bi.pcf ter-p32bi.pcf ter-u32bi.pcf ter-x32bi.pcf
-+PCF  = $(PCF_12N) $(PCF_12B) $(PCF_12I) $(PCF_14N) $(PCF_14B) $(PCF_14I) $(PCF_16N) $(PCF_16B) $(PCF_16I) $(PCF_20N) $(PCF_20B) $(PCF_20I) $(PCF_22N) $(PCF_22B) $(PCF_22I) $(PCF_24N) $(PCF_24B) $(PCF_24I) $(PCF_28N) $(PCF_28B) $(PCF_28I) $(PCF_32N) $(PCF_32B) $(PCF_32I)
- PCF_N12	= $(PCF_12N) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
- 
- EEE	= ter-x12n.pcf ter-x12b.pcf ter-x14n.pcf ter-x14b.pcf ter-x16n.pcf ter-x16b.pcf ter-x20n.pcf ter-x20b.pcf ter-x22n.pcf ter-x22b.pcf
-@@ -1182,6 +1191,54 @@
- X_PT154	= uni/x11gr.uni uni/ascii-h.uni uni/pt-154.uni
- X_10646	= uni/x11gr.uni uni/10646-1.uni
- 
-+ter-u12i.bdf: ter-u12n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u12bi.bdf: ter-u12b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u14i.bdf: ter-u14n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u14bi.bdf: ter-u14b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u16i.bdf: ter-u16n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u16bi.bdf: ter-u16b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u20i.bdf: ter-u20n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u20bi.bdf: ter-u20b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u22i.bdf: ter-u20n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u22bi.bdf: ter-u20b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u24i.bdf: ter-u24n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u24bi.bdf: ter-u24b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u28i.bdf: ter-u28n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u28bi.bdf: ter-u28b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u32i.bdf: ter-u32n.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
-+ter-u32bi.bdf: ter-u32b.bdf
-+	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
-+
- ter-112n.pcf: ter-u12n.bdf $(X_88591)
- 	$(UCS2X11) ter-u12n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
- 
-@@ -1806,6 +1863,630 @@
- ter-x32b.pcf: ter-u32b.bdf $(X_10646)
- 	$(UCS2X11) ter-u32b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
- 
-+ter-112i.pcf: ter-u12i.bdf $(X_88591)
-+	$(UCS2X11) ter-u12i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-112bi.pcf: ter-u12bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u12bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-212i.pcf: ter-u12i.bdf $(X_88592)
-+	$(UCS2X11) ter-u12i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-212bi.pcf: ter-u12bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u12bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-512i.pcf: ter-u12i.bdf $(X_88595)
-+	$(UCS2X11) ter-u12i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-512bi.pcf: ter-u12bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u12bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-712i.pcf: ter-u12i.bdf $(X_88597)
-+	$(UCS2X11) ter-u12i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-712bi.pcf: ter-u12bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u12bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-912i.pcf: ter-u12i.bdf $(X_88599)
-+	$(UCS2X11) ter-u12i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-912bi.pcf: ter-u12bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u12bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c12i.pcf: ter-u12i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u12i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c12bi.pcf: ter-u12bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u12bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d12i.pcf: ter-u12i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u12i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d12bi.pcf: ter-u12bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u12bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f12i.pcf: ter-u12i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u12i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f12bi.pcf: ter-u12bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u12bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g12i.pcf: ter-u12i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u12i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g12bi.pcf: ter-u12bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u12bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k12i.pcf: ter-u12i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u12i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k12bi.pcf: ter-u12bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u12bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p12i.pcf: ter-u12i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u12i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p12bi.pcf: ter-u12bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u12bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u12i.pcf: ter-u12i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u12i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u12bi.pcf: ter-u12bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u12bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x12i.pcf: ter-u12i.bdf $(X_10646)
-+	$(UCS2X11) ter-u12i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x12bi.pcf: ter-u12bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u12bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-114i.pcf: ter-u14i.bdf $(X_88591)
-+	$(UCS2X11) ter-u14i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-114bi.pcf: ter-u14bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u14bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-214i.pcf: ter-u14i.bdf $(X_88592)
-+	$(UCS2X11) ter-u14i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-214bi.pcf: ter-u14bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u14bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-514i.pcf: ter-u14i.bdf $(X_88595)
-+	$(UCS2X11) ter-u14i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-514bi.pcf: ter-u14bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u14bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-714i.pcf: ter-u14i.bdf $(X_88597)
-+	$(UCS2X11) ter-u14i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-714bi.pcf: ter-u14bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u14bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-914i.pcf: ter-u14i.bdf $(X_88599)
-+	$(UCS2X11) ter-u14i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-914bi.pcf: ter-u14bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u14bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c14i.pcf: ter-u14i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u14i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c14bi.pcf: ter-u14bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u14bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d14i.pcf: ter-u14i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u14i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d14bi.pcf: ter-u14bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u14bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f14i.pcf: ter-u14i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u14i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f14bi.pcf: ter-u14bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u14bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g14i.pcf: ter-u14i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u14i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g14bi.pcf: ter-u14bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u14bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k14i.pcf: ter-u14i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u14i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k14bi.pcf: ter-u14bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u14bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p14i.pcf: ter-u14i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u14i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p14bi.pcf: ter-u14bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u14bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u14i.pcf: ter-u14i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u14i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u14bi.pcf: ter-u14bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u14bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x14i.pcf: ter-u14i.bdf $(X_10646)
-+	$(UCS2X11) ter-u14i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x14bi.pcf: ter-u14bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u14bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-116i.pcf: ter-u16i.bdf $(X_88591)
-+	$(UCS2X11) ter-u16i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-116bi.pcf: ter-u16bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u16bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-216i.pcf: ter-u16i.bdf $(X_88592)
-+	$(UCS2X11) ter-u16i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-216bi.pcf: ter-u16bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u16bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-516i.pcf: ter-u16i.bdf $(X_88595)
-+	$(UCS2X11) ter-u16i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-516bi.pcf: ter-u16bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u16bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-716i.pcf: ter-u16i.bdf $(X_88597)
-+	$(UCS2X11) ter-u16i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-716bi.pcf: ter-u16bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u16bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-916i.pcf: ter-u16i.bdf $(X_88599)
-+	$(UCS2X11) ter-u16i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-916bi.pcf: ter-u16bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u16bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c16i.pcf: ter-u16i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u16i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c16bi.pcf: ter-u16bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u16bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d16i.pcf: ter-u16i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u16i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d16bi.pcf: ter-u16bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u16bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f16i.pcf: ter-u16i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u16i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f16bi.pcf: ter-u16bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u16bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g16i.pcf: ter-u16i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u16i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g16bi.pcf: ter-u16bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u16bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k16i.pcf: ter-u16i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u16i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k16bi.pcf: ter-u16bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u16bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p16i.pcf: ter-u16i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u16i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p16bi.pcf: ter-u16bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u16bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u16i.pcf: ter-u16i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u16i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u16bi.pcf: ter-u16bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u16bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x16i.pcf: ter-u16i.bdf $(X_10646)
-+	$(UCS2X11) ter-u16i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x16bi.pcf: ter-u16bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u16bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-120i.pcf: ter-u20i.bdf $(X_88591)
-+	$(UCS2X11) ter-u20i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-120bi.pcf: ter-u20bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u20bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-220i.pcf: ter-u20i.bdf $(X_88592)
-+	$(UCS2X11) ter-u20i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-220bi.pcf: ter-u20bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u20bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-520i.pcf: ter-u20i.bdf $(X_88595)
-+	$(UCS2X11) ter-u20i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-520bi.pcf: ter-u20bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u20bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-720i.pcf: ter-u20i.bdf $(X_88597)
-+	$(UCS2X11) ter-u20i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-720bi.pcf: ter-u20bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u20bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-920i.pcf: ter-u20i.bdf $(X_88599)
-+	$(UCS2X11) ter-u20i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-920bi.pcf: ter-u20bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u20bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c20i.pcf: ter-u20i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u20i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c20bi.pcf: ter-u20bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u20bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d20i.pcf: ter-u20i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u20i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d20bi.pcf: ter-u20bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u20bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f20i.pcf: ter-u20i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u20i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f20bi.pcf: ter-u20bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u20bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g20i.pcf: ter-u20i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u20i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g20bi.pcf: ter-u20bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u20bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k20i.pcf: ter-u20i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u20i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k20bi.pcf: ter-u20bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u20bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p20i.pcf: ter-u20i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u20i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p20bi.pcf: ter-u20bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u20bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u20i.pcf: ter-u20i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u20i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u20bi.pcf: ter-u20bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u20bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x20i.pcf: ter-u20i.bdf $(X_10646)
-+	$(UCS2X11) ter-u20i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x20bi.pcf: ter-u20bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u20bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-122i.pcf: ter-u22i.bdf $(X_88591)
-+	$(UCS2X11) ter-u22i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-122bi.pcf: ter-u22bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u22bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-222i.pcf: ter-u22i.bdf $(X_88592)
-+	$(UCS2X11) ter-u22i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-222bi.pcf: ter-u22bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u22bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-522i.pcf: ter-u22i.bdf $(X_88595)
-+	$(UCS2X11) ter-u22i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-522bi.pcf: ter-u22bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u22bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-722i.pcf: ter-u22i.bdf $(X_88597)
-+	$(UCS2X11) ter-u22i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-722bi.pcf: ter-u22bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u22bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-922i.pcf: ter-u22i.bdf $(X_88599)
-+	$(UCS2X11) ter-u22i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-922bi.pcf: ter-u22bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u22bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c22i.pcf: ter-u22i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u22i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c22bi.pcf: ter-u22bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u22bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d22i.pcf: ter-u22i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u22i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d22bi.pcf: ter-u22bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u22bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f22i.pcf: ter-u22i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u22i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f22bi.pcf: ter-u22bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u22bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g22i.pcf: ter-u22i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u22i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g22bi.pcf: ter-u22bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u22bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k22i.pcf: ter-u22i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u22i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k22bi.pcf: ter-u22bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u22bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p22i.pcf: ter-u22i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u22i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p22bi.pcf: ter-u22bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u22bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u22i.pcf: ter-u22i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u22i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u22bi.pcf: ter-u22bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u22bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x22i.pcf: ter-u22i.bdf $(X_10646)
-+	$(UCS2X11) ter-u22i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x22bi.pcf: ter-u22bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u22bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-124i.pcf: ter-u24i.bdf $(X_88591)
-+	$(UCS2X11) ter-u24i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-124bi.pcf: ter-u24bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u24bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-224i.pcf: ter-u24i.bdf $(X_88592)
-+	$(UCS2X11) ter-u24i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-224bi.pcf: ter-u24bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u24bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-524i.pcf: ter-u24i.bdf $(X_88595)
-+	$(UCS2X11) ter-u24i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-524bi.pcf: ter-u24bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u24bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-724i.pcf: ter-u24i.bdf $(X_88597)
-+	$(UCS2X11) ter-u24i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-724bi.pcf: ter-u24bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u24bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-924i.pcf: ter-u24i.bdf $(X_88599)
-+	$(UCS2X11) ter-u24i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-924bi.pcf: ter-u24bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u24bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c24i.pcf: ter-u24i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u24i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c24bi.pcf: ter-u24bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u24bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d24i.pcf: ter-u24i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u24i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d24bi.pcf: ter-u24bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u24bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f24i.pcf: ter-u24i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u24i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f24bi.pcf: ter-u24bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u24bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g24i.pcf: ter-u24i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u24i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g24bi.pcf: ter-u24bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u24bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k24i.pcf: ter-u24i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u24i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k24bi.pcf: ter-u24bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u24bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p24i.pcf: ter-u24i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u24i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p24bi.pcf: ter-u24bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u24bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u24i.pcf: ter-u24i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u24i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u24bi.pcf: ter-u24bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u24bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x24i.pcf: ter-u24i.bdf $(X_10646)
-+	$(UCS2X11) ter-u24i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x24bi.pcf: ter-u24bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u24bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-128i.pcf: ter-u28i.bdf $(X_88591)
-+	$(UCS2X11) ter-u28i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-128bi.pcf: ter-u28bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u28bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-228i.pcf: ter-u28i.bdf $(X_88592)
-+	$(UCS2X11) ter-u28i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-228bi.pcf: ter-u28bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u28bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-528i.pcf: ter-u28i.bdf $(X_88595)
-+	$(UCS2X11) ter-u28i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-528bi.pcf: ter-u28bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u28bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-728i.pcf: ter-u28i.bdf $(X_88597)
-+	$(UCS2X11) ter-u28i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-728bi.pcf: ter-u28bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u28bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-928i.pcf: ter-u28i.bdf $(X_88599)
-+	$(UCS2X11) ter-u28i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-928bi.pcf: ter-u28bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u28bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c28i.pcf: ter-u28i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u28i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c28bi.pcf: ter-u28bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u28bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d28i.pcf: ter-u28i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u28i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d28bi.pcf: ter-u28bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u28bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f28i.pcf: ter-u28i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u28i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f28bi.pcf: ter-u28bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u28bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g28i.pcf: ter-u28i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u28i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g28bi.pcf: ter-u28bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u28bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k28i.pcf: ter-u28i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u28i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k28bi.pcf: ter-u28bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u28bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p28i.pcf: ter-u28i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u28i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p28bi.pcf: ter-u28bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u28bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u28i.pcf: ter-u28i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u28i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u28bi.pcf: ter-u28bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u28bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x28i.pcf: ter-u28i.bdf $(X_10646)
-+	$(UCS2X11) ter-u28i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x28bi.pcf: ter-u28bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u28bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-132i.pcf: ter-u32i.bdf $(X_88591)
-+	$(UCS2X11) ter-u32i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-132bi.pcf: ter-u32bi.bdf $(X_88591)
-+	$(UCS2X11) ter-u32bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-+
-+ter-232i.pcf: ter-u32i.bdf $(X_88592)
-+	$(UCS2X11) ter-u32i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-232bi.pcf: ter-u32bi.bdf $(X_88592)
-+	$(UCS2X11) ter-u32bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-+
-+ter-532i.pcf: ter-u32i.bdf $(X_88595)
-+	$(UCS2X11) ter-u32i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-532bi.pcf: ter-u32bi.bdf $(X_88595)
-+	$(UCS2X11) ter-u32bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-+
-+ter-732i.pcf: ter-u32i.bdf $(X_88597)
-+	$(UCS2X11) ter-u32i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-732bi.pcf: ter-u32bi.bdf $(X_88597)
-+	$(UCS2X11) ter-u32bi.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-+
-+ter-932i.pcf: ter-u32i.bdf $(X_88599)
-+	$(UCS2X11) ter-u32i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-932bi.pcf: ter-u32bi.bdf $(X_88599)
-+	$(UCS2X11) ter-u32bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-+
-+ter-c32i.pcf: ter-u32i.bdf $(X_W1251)
-+	$(UCS2X11) ter-u32i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-c32bi.pcf: ter-u32bi.bdf $(X_W1251)
-+	$(UCS2X11) ter-u32bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-+
-+ter-d32i.pcf: ter-u32i.bdf $(X_8859D)
-+	$(UCS2X11) ter-u32i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-d32bi.pcf: ter-u32bi.bdf $(X_8859D)
-+	$(UCS2X11) ter-u32bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-+
-+ter-f32i.pcf: ter-u32i.bdf $(X_8859F)
-+	$(UCS2X11) ter-u32i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-f32bi.pcf: ter-u32bi.bdf $(X_8859F)
-+	$(UCS2X11) ter-u32bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-+
-+ter-g32i.pcf: ter-u32i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u32i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-g32bi.pcf: ter-u32bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u32bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-+
-+ter-k32i.pcf: ter-u32i.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u32i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-k32bi.pcf: ter-u32bi.bdf $(X_KOI8R)
-+	$(UCS2X11) ter-u32bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-+
-+ter-p32i.pcf: ter-u32i.bdf $(X_PT154)
-+	$(UCS2X11) ter-u32i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-p32bi.pcf: ter-u32bi.bdf $(X_PT154)
-+	$(UCS2X11) ter-u32bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-+
-+ter-u32i.pcf: ter-u32i.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u32i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-u32bi.pcf: ter-u32bi.bdf $(X_KOI8U)
-+	$(UCS2X11) ter-u32bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-+
-+ter-x32i.pcf: ter-u32i.bdf $(X_10646)
-+	$(UCS2X11) ter-u32i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
-+ter-x32bi.pcf: ter-u32bi.bdf $(X_10646)
-+	$(UCS2X11) ter-u32bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-+
- install-pcf: $(PCF)
- 	mkdir -p $(DESTDIR)$(x11dir)
- 	for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
-@@ -1821,4 +2502,4 @@
- 	for i in $(PCF_N12) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done
- 
- clean:
--	rm -f *.psf *.txt *.raw *.pcf
-+	rm -f *.psf *.txt *.raw *.pcf *.pcf.gz
diff --git a/x11-fonts/terminus-font/files/pkg-message.in b/x11-fonts/terminus-font/files/pkg-message.in
new file mode 100644
index 000000000000..eb93fc7ef126
--- /dev/null
+++ b/x11-fonts/terminus-font/files/pkg-message.in
@@ -0,0 +1,4 @@
+Add the following line to the "Files" section of xorg.conf or XF86Config:
+
+	FontPath "%%FONTDIR%%/"
+
diff --git a/x11-fonts/terminus-font/pkg-plist b/x11-fonts/terminus-font/pkg-plist
index b1af7d9e7838..f58b2028f718 100644
--- a/x11-fonts/terminus-font/pkg-plist
+++ b/x11-fonts/terminus-font/pkg-plist
@@ -1,418 +1,211 @@
 %%FONTDIR%%/fonts.dir
 %%FONTDIR%%/fonts.scale
-%%FONTDIR%%/ter-112b.pcf.gz
-%%FONTDIR%%/ter-112bi.pcf.gz
-%%FONTDIR%%/ter-112i.pcf.gz
-%%FONTDIR%%/ter-112n.pcf.gz
-%%FONTDIR%%/ter-114b.pcf.gz
-%%FONTDIR%%/ter-114bi.pcf.gz
-%%FONTDIR%%/ter-114i.pcf.gz
+%%FONTDIR%%/ter-524b.pcf.gz
+%%FONTDIR%%/ter-k12b.pcf.gz
+%%FONTDIR%%/ter-216b.pcf.gz
 %%FONTDIR%%/ter-114n.pcf.gz
-%%FONTDIR%%/ter-116b.pcf.gz
-%%FONTDIR%%/ter-116bi.pcf.gz
-%%FONTDIR%%/ter-116i.pcf.gz
-%%FONTDIR%%/ter-116n.pcf.gz
-%%FONTDIR%%/ter-120b.pcf.gz
-%%FONTDIR%%/ter-120bi.pcf.gz
-%%FONTDIR%%/ter-120i.pcf.gz
-%%FONTDIR%%/ter-120n.pcf.gz
-%%FONTDIR%%/ter-122b.pcf.gz
-%%FONTDIR%%/ter-122bi.pcf.gz
-%%FONTDIR%%/ter-122i.pcf.gz
-%%FONTDIR%%/ter-122n.pcf.gz
-%%FONTDIR%%/ter-124b.pcf.gz
-%%FONTDIR%%/ter-124bi.pcf.gz
-%%FONTDIR%%/ter-124i.pcf.gz
-%%FONTDIR%%/ter-124n.pcf.gz
-%%FONTDIR%%/ter-128b.pcf.gz
-%%FONTDIR%%/ter-128bi.pcf.gz
-%%FONTDIR%%/ter-128i.pcf.gz
-%%FONTDIR%%/ter-128n.pcf.gz
-%%FONTDIR%%/ter-132b.pcf.gz
-%%FONTDIR%%/ter-132bi.pcf.gz
-%%FONTDIR%%/ter-132i.pcf.gz
-%%FONTDIR%%/ter-132n.pcf.gz
+%%FONTDIR%%/ter-520b.pcf.gz
+%%FONTDIR%%/ter-k16b.pcf.gz
 %%FONTDIR%%/ter-212b.pcf.gz
-%%FONTDIR%%/ter-212bi.pcf.gz
-%%FONTDIR%%/ter-212i.pcf.gz
-%%FONTDIR%%/ter-212n.pcf.gz
-%%FONTDIR%%/ter-214b.pcf.gz
-%%FONTDIR%%/ter-214bi.pcf.gz
-%%FONTDIR%%/ter-214i.pcf.gz
+%%FONTDIR%%/ter-528b.pcf.gz
+%%FONTDIR%%/ter-d32n.pcf.gz
+%%FONTDIR%%/ter-p14b.pcf.gz
+%%FONTDIR%%/ter-722n.pcf.gz
+%%FONTDIR%%/ter-u28n.pcf.gz
+%%FONTDIR%%/ter-u24n.pcf.gz
+%%FONTDIR%%/ter-u20n.pcf.gz
+%%FONTDIR%%/ter-720b.pcf.gz
+%%FONTDIR%%/ter-724b.pcf.gz
+%%FONTDIR%%/ter-f32n.pcf.gz
+%%FONTDIR%%/ter-u22b.pcf.gz
+%%FONTDIR%%/ter-728b.pcf.gz
+%%FONTDIR%%/ter-112b.pcf.gz
 %%FONTDIR%%/ter-214n.pcf.gz
-%%FONTDIR%%/ter-216b.pcf.gz
-%%FONTDIR%%/ter-216bi.pcf.gz
-%%FONTDIR%%/ter-216i.pcf.gz
-%%FONTDIR%%/ter-216n.pcf.gz
-%%FONTDIR%%/ter-220b.pcf.gz
-%%FONTDIR%%/ter-220bi.pcf.gz
-%%FONTDIR%%/ter-220i.pcf.gz
-%%FONTDIR%%/ter-220n.pcf.gz
-%%FONTDIR%%/ter-222b.pcf.gz
-%%FONTDIR%%/ter-222bi.pcf.gz
+%%FONTDIR%%/ter-116b.pcf.gz
+%%FONTDIR%%/ter-522n.pcf.gz
+%%FONTDIR%%/ter-k14n.pcf.gz
+%%FONTDIR%%/ter-g32n.pcf.gz
+%%FONTDIR%%/ter-p12n.pcf.gz
+%%FONTDIR%%/ter-p16n.pcf.gz
+%%FONTDIR%%/ter-p20n.pcf.gz
+%%FONTDIR%%/ter-128b.pcf.gz
+%%FONTDIR%%/ter-p24n.pcf.gz
+%%FONTDIR%%/ter-932n.pcf.gz
+%%FONTDIR%%/ter-120b.pcf.gz
+%%FONTDIR%%/ter-k22n.pcf.gz
+%%FONTDIR%%/ter-514n.pcf.gz
+%%FONTDIR%%/ter-x32b.pcf.gz
 %%FONTDIR%%/ter-222n.pcf.gz
-%%FONTDIR%%/ter-224b.pcf.gz
-%%FONTDIR%%/ter-224bi.pcf.gz
-%%FONTDIR%%/ter-224i.pcf.gz
-%%FONTDIR%%/ter-224n.pcf.gz
+%%FONTDIR%%/ter-124b.pcf.gz
+%%FONTDIR%%/ter-p28n.pcf.gz
+%%FONTDIR%%/ter-u14b.pcf.gz
+%%FONTDIR%%/ter-712b.pcf.gz
+%%FONTDIR%%/ter-716b.pcf.gz
+%%FONTDIR%%/ter-u16n.pcf.gz
+%%FONTDIR%%/ter-u12n.pcf.gz
+%%FONTDIR%%/ter-714n.pcf.gz
+%%FONTDIR%%/ter-p22b.pcf.gz
 %%FONTDIR%%/ter-228b.pcf.gz
-%%FONTDIR%%/ter-228bi.pcf.gz
-%%FONTDIR%%/ter-228i.pcf.gz
-%%FONTDIR%%/ter-228n.pcf.gz
-%%FONTDIR%%/ter-232b.pcf.gz
-%%FONTDIR%%/ter-232bi.pcf.gz
-%%FONTDIR%%/ter-232i.pcf.gz
-%%FONTDIR%%/ter-232n.pcf.gz
-%%FONTDIR%%/ter-512b.pcf.gz
-%%FONTDIR%%/ter-512bi.pcf.gz
-%%FONTDIR%%/ter-512i.pcf.gz
-%%FONTDIR%%/ter-512n.pcf.gz
-%%FONTDIR%%/ter-514b.pcf.gz
-%%FONTDIR%%/ter-514bi.pcf.gz
-%%FONTDIR%%/ter-514i.pcf.gz
-%%FONTDIR%%/ter-514n.pcf.gz
+%%FONTDIR%%/ter-c32n.pcf.gz
+%%FONTDIR%%/ter-k28b.pcf.gz
+%%FONTDIR%%/ter-224b.pcf.gz
+%%FONTDIR%%/ter-122n.pcf.gz
+%%FONTDIR%%/ter-k20b.pcf.gz
 %%FONTDIR%%/ter-516b.pcf.gz
-%%FONTDIR%%/ter-516bi.pcf.gz
-%%FONTDIR%%/ter-516i.pcf.gz
-%%FONTDIR%%/ter-516n.pcf.gz
-%%FONTDIR%%/ter-520b.pcf.gz
-%%FONTDIR%%/ter-520bi.pcf.gz
-%%FONTDIR%%/ter-520i.pcf.gz
-%%FONTDIR%%/ter-520n.pcf.gz
-%%FONTDIR%%/ter-522b.pcf.gz
-%%FONTDIR%%/ter-522bi.pcf.gz
-%%FONTDIR%%/ter-522i.pcf.gz
-%%FONTDIR%%/ter-522n.pcf.gz
-%%FONTDIR%%/ter-524b.pcf.gz
-%%FONTDIR%%/ter-524bi.pcf.gz
-%%FONTDIR%%/ter-524i.pcf.gz
-%%FONTDIR%%/ter-524n.pcf.gz
-%%FONTDIR%%/ter-528b.pcf.gz
-%%FONTDIR%%/ter-528bi.pcf.gz
-%%FONTDIR%%/ter-528i.pcf.gz
-%%FONTDIR%%/ter-528n.pcf.gz
-%%FONTDIR%%/ter-532b.pcf.gz
-%%FONTDIR%%/ter-532bi.pcf.gz
-%%FONTDIR%%/ter-532i.pcf.gz
+%%FONTDIR%%/ter-220b.pcf.gz
+%%FONTDIR%%/ter-k24b.pcf.gz
+%%FONTDIR%%/ter-512b.pcf.gz
+%%FONTDIR%%/ter-u32b.pcf.gz
+%%FONTDIR%%/ter-f22n.pcf.gz
 %%FONTDIR%%/ter-532n.pcf.gz
-%%FONTDIR%%/ter-712b.pcf.gz
-%%FONTDIR%%/ter-712bi.pcf.gz
-%%FONTDIR%%/ter-712i.pcf.gz
-%%FONTDIR%%/ter-712n.pcf.gz
-%%FONTDIR%%/ter-714b.pcf.gz
-%%FONTDIR%%/ter-714bi.pcf.gz
-%%FONTDIR%%/ter-714i.pcf.gz
-%%FONTDIR%%/ter-714n.pcf.gz
-%%FONTDIR%%/ter-716b.pcf.gz
-%%FONTDIR%%/ter-716bi.pcf.gz
-%%FONTDIR%%/ter-716i.pcf.gz
-%%FONTDIR%%/ter-716n.pcf.gz
-%%FONTDIR%%/ter-720b.pcf.gz
-%%FONTDIR%%/ter-720bi.pcf.gz
-%%FONTDIR%%/ter-720i.pcf.gz
-%%FONTDIR%%/ter-720n.pcf.gz
-%%FONTDIR%%/ter-722b.pcf.gz
-%%FONTDIR%%/ter-722bi.pcf.gz
-%%FONTDIR%%/ter-722i.pcf.gz
-%%FONTDIR%%/ter-722n.pcf.gz
-%%FONTDIR%%/ter-724b.pcf.gz
-%%FONTDIR%%/ter-724bi.pcf.gz
-%%FONTDIR%%/ter-724i.pcf.gz
-%%FONTDIR%%/ter-724n.pcf.gz
-%%FONTDIR%%/ter-728b.pcf.gz
-%%FONTDIR%%/ter-728bi.pcf.gz
-%%FONTDIR%%/ter-728i.pcf.gz
-%%FONTDIR%%/ter-728n.pcf.gz
-%%FONTDIR%%/ter-732b.pcf.gz
-%%FONTDIR%%/ter-732bi.pcf.gz
-%%FONTDIR%%/ter-732i.pcf.gz
-%%FONTDIR%%/ter-732n.pcf.gz
-%%FONTDIR%%/ter-912b.pcf.gz
-%%FONTDIR%%/ter-912bi.pcf.gz
-%%FONTDIR%%/ter-912i.pcf.gz
-%%FONTDIR%%/ter-912n.pcf.gz
-%%FONTDIR%%/ter-914b.pcf.gz
-%%FONTDIR%%/ter-914bi.pcf.gz
-%%FONTDIR%%/ter-914i.pcf.gz
+%%FONTDIR%%/ter-d28b.pcf.gz
+%%FONTDIR%%/ter-x14b.pcf.gz
+%%FONTDIR%%/ter-c12b.pcf.gz
+%%FONTDIR%%/ter-d20b.pcf.gz
 %%FONTDIR%%/ter-914n.pcf.gz
+%%FONTDIR%%/ter-g22n.pcf.gz
+%%FONTDIR%%/ter-c16b.pcf.gz
+%%FONTDIR%%/ter-d24b.pcf.gz
+%%FONTDIR%%/ter-x12n.pcf.gz
+%%FONTDIR%%/ter-g28b.pcf.gz
+%%FONTDIR%%/ter-x16n.pcf.gz
+%%FONTDIR%%/ter-912b.pcf.gz
+%%FONTDIR%%/ter-g24b.pcf.gz
+%%FONTDIR%%/ter-d22n.pcf.gz
 %%FONTDIR%%/ter-916b.pcf.gz
-%%FONTDIR%%/ter-916bi.pcf.gz
-%%FONTDIR%%/ter-916i.pcf.gz
-%%FONTDIR%%/ter-916n.pcf.gz
+%%FONTDIR%%/ter-g20b.pcf.gz
+%%FONTDIR%%/ter-c14n.pcf.gz
+%%FONTDIR%%/ter-f28b.pcf.gz
+%%FONTDIR%%/ter-732n.pcf.gz
+%%FONTDIR%%/ter-f24b.pcf.gz
+%%FONTDIR%%/ter-f20b.pcf.gz
+%%FONTDIR%%/ter-f16b.pcf.gz
+%%FONTDIR%%/ter-f12b.pcf.gz
+%%FONTDIR%%/ter-g16b.pcf.gz
 %%FONTDIR%%/ter-920b.pcf.gz
-%%FONTDIR%%/ter-920bi.pcf.gz
-%%FONTDIR%%/ter-920i.pcf.gz
-%%FONTDIR%%/ter-920n.pcf.gz
-%%FONTDIR%%/ter-922b.pcf.gz
-%%FONTDIR%%/ter-922bi.pcf.gz
-%%FONTDIR%%/ter-922i.pcf.gz
-%%FONTDIR%%/ter-922n.pcf.gz
+%%FONTDIR%%/ter-c22n.pcf.gz
+%%FONTDIR%%/ter-d14n.pcf.gz
+%%FONTDIR%%/ter-x28n.pcf.gz
+%%FONTDIR%%/ter-g12b.pcf.gz
 %%FONTDIR%%/ter-924b.pcf.gz
-%%FONTDIR%%/ter-924bi.pcf.gz
-%%FONTDIR%%/ter-924i.pcf.gz
-%%FONTDIR%%/ter-924n.pcf.gz
+%%FONTDIR%%/ter-p32b.pcf.gz
+%%FONTDIR%%/ter-x20n.pcf.gz
+%%FONTDIR%%/ter-132n.pcf.gz
+%%FONTDIR%%/ter-x24n.pcf.gz
 %%FONTDIR%%/ter-928b.pcf.gz
-%%FONTDIR%%/ter-928bi.pcf.gz
-%%FONTDIR%%/ter-928i.pcf.gz
-%%FONTDIR%%/ter-928n.pcf.gz
-%%FONTDIR%%/ter-932b.pcf.gz
-%%FONTDIR%%/ter-932bi.pcf.gz
-%%FONTDIR%%/ter-932i.pcf.gz
-%%FONTDIR%%/ter-932n.pcf.gz
-%%FONTDIR%%/ter-c12b.pcf.gz
-%%FONTDIR%%/ter-c12bi.pcf.gz
-%%FONTDIR%%/ter-c12i.pcf.gz
-%%FONTDIR%%/ter-c12n.pcf.gz
-%%FONTDIR%%/ter-c14b.pcf.gz
-%%FONTDIR%%/ter-c14bi.pcf.gz
-%%FONTDIR%%/ter-c14i.pcf.gz
-%%FONTDIR%%/ter-c14n.pcf.gz
-%%FONTDIR%%/ter-c16b.pcf.gz
-%%FONTDIR%%/ter-c16bi.pcf.gz
-%%FONTDIR%%/ter-c16i.pcf.gz
-%%FONTDIR%%/ter-c16n.pcf.gz
+%%FONTDIR%%/ter-d12b.pcf.gz
+%%FONTDIR%%/ter-g14n.pcf.gz
+%%FONTDIR%%/ter-922n.pcf.gz
 %%FONTDIR%%/ter-c20b.pcf.gz
-%%FONTDIR%%/ter-c20bi.pcf.gz
-%%FONTDIR%%/ter-c20i.pcf.gz
-%%FONTDIR%%/ter-c20n.pcf.gz
-%%FONTDIR%%/ter-c22b.pcf.gz
-%%FONTDIR%%/ter-c22bi.pcf.gz
-%%FONTDIR%%/ter-c22i.pcf.gz
-%%FONTDIR%%/ter-c22n.pcf.gz
+%%FONTDIR%%/ter-d16b.pcf.gz
 %%FONTDIR%%/ter-c24b.pcf.gz
-%%FONTDIR%%/ter-c24bi.pcf.gz
-%%FONTDIR%%/ter-c24i.pcf.gz
-%%FONTDIR%%/ter-c24n.pcf.gz
+%%FONTDIR%%/ter-232n.pcf.gz
+%%FONTDIR%%/ter-x22b.pcf.gz
 %%FONTDIR%%/ter-c28b.pcf.gz
-%%FONTDIR%%/ter-c28bi.pcf.gz
-%%FONTDIR%%/ter-c28i.pcf.gz
-%%FONTDIR%%/ter-c28n.pcf.gz
-%%FONTDIR%%/ter-c32b.pcf.gz
-%%FONTDIR%%/ter-c32bi.pcf.gz
-%%FONTDIR%%/ter-c32i.pcf.gz
-%%FONTDIR%%/ter-c32n.pcf.gz
-%%FONTDIR%%/ter-d12b.pcf.gz
-%%FONTDIR%%/ter-d12bi.pcf.gz
-%%FONTDIR%%/ter-d12i.pcf.gz
-%%FONTDIR%%/ter-d12n.pcf.gz
-%%FONTDIR%%/ter-d14b.pcf.gz
-%%FONTDIR%%/ter-d14bi.pcf.gz
-%%FONTDIR%%/ter-d14i.pcf.gz
-%%FONTDIR%%/ter-d14n.pcf.gz
-%%FONTDIR%%/ter-d16b.pcf.gz
-%%FONTDIR%%/ter-d16bi.pcf.gz
-%%FONTDIR%%/ter-d16i.pcf.gz
-%%FONTDIR%%/ter-d16n.pcf.gz
-%%FONTDIR%%/ter-d20b.pcf.gz
-%%FONTDIR%%/ter-d20bi.pcf.gz
-%%FONTDIR%%/ter-d20i.pcf.gz
-%%FONTDIR%%/ter-d20n.pcf.gz
-%%FONTDIR%%/ter-d22b.pcf.gz
-%%FONTDIR%%/ter-d22bi.pcf.gz
-%%FONTDIR%%/ter-d22i.pcf.gz
-%%FONTDIR%%/ter-d22n.pcf.gz
-%%FONTDIR%%/ter-d24b.pcf.gz
-%%FONTDIR%%/ter-d24bi.pcf.gz
-%%FONTDIR%%/ter-d24i.pcf.gz
-%%FONTDIR%%/ter-d24n.pcf.gz
-%%FONTDIR%%/ter-d28b.pcf.gz
-%%FONTDIR%%/ter-d28bi.pcf.gz
-%%FONTDIR%%/ter-d28i.pcf.gz
-%%FONTDIR%%/ter-d28n.pcf.gz
-%%FONTDIR%%/ter-d32b.pcf.gz
-%%FONTDIR%%/ter-d32bi.pcf.gz
-%%FONTDIR%%/ter-d32i.pcf.gz
-%%FONTDIR%%/ter-d32n.pcf.gz
-%%FONTDIR%%/ter-f12b.pcf.gz
-%%FONTDIR%%/ter-f12bi.pcf.gz
-%%FONTDIR%%/ter-f12i.pcf.gz
-%%FONTDIR%%/ter-f12n.pcf.gz
-%%FONTDIR%%/ter-f14b.pcf.gz
-%%FONTDIR%%/ter-f14bi.pcf.gz
-%%FONTDIR%%/ter-f14i.pcf.gz
+%%FONTDIR%%/ter-k32n.pcf.gz
 %%FONTDIR%%/ter-f14n.pcf.gz
-%%FONTDIR%%/ter-f16b.pcf.gz
-%%FONTDIR%%/ter-f16bi.pcf.gz
-%%FONTDIR%%/ter-f16i.pcf.gz
-%%FONTDIR%%/ter-f16n.pcf.gz
-%%FONTDIR%%/ter-f20b.pcf.gz
-%%FONTDIR%%/ter-f20bi.pcf.gz
-%%FONTDIR%%/ter-f20i.pcf.gz
+%%FONTDIR%%/ter-g28n.pcf.gz
+%%FONTDIR%%/ter-x12b.pcf.gz
+%%FONTDIR%%/ter-x16b.pcf.gz
+%%FONTDIR%%/ter-d22b.pcf.gz
+%%FONTDIR%%/ter-g24n.pcf.gz
+%%FONTDIR%%/ter-912n.pcf.gz
+%%FONTDIR%%/ter-g20n.pcf.gz
+%%FONTDIR%%/ter-916n.pcf.gz
+%%FONTDIR%%/ter-c14b.pcf.gz
+%%FONTDIR%%/ter-f28n.pcf.gz
+%%FONTDIR%%/ter-732b.pcf.gz
+%%FONTDIR%%/ter-f24n.pcf.gz
 %%FONTDIR%%/ter-f20n.pcf.gz
+%%FONTDIR%%/ter-u32n.pcf.gz
 %%FONTDIR%%/ter-f22b.pcf.gz
-%%FONTDIR%%/ter-f22bi.pcf.gz
-%%FONTDIR%%/ter-f22i.pcf.gz
-%%FONTDIR%%/ter-f22n.pcf.gz
-%%FONTDIR%%/ter-f24b.pcf.gz
-%%FONTDIR%%/ter-f24bi.pcf.gz
-%%FONTDIR%%/ter-f24i.pcf.gz
-%%FONTDIR%%/ter-f24n.pcf.gz
-%%FONTDIR%%/ter-f28b.pcf.gz
-%%FONTDIR%%/ter-f28bi.pcf.gz
-%%FONTDIR%%/ter-f28i.pcf.gz
-%%FONTDIR%%/ter-f28n.pcf.gz
-%%FONTDIR%%/ter-f32b.pcf.gz
-%%FONTDIR%%/ter-f32bi.pcf.gz
-%%FONTDIR%%/ter-f32i.pcf.gz
-%%FONTDIR%%/ter-f32n.pcf.gz
-%%FONTDIR%%/ter-g12b.pcf.gz
-%%FONTDIR%%/ter-g12bi.pcf.gz
-%%FONTDIR%%/ter-g12i.pcf.gz
-%%FONTDIR%%/ter-g12n.pcf.gz
+%%FONTDIR%%/ter-532b.pcf.gz
+%%FONTDIR%%/ter-x14n.pcf.gz
+%%FONTDIR%%/ter-d28n.pcf.gz
+%%FONTDIR%%/ter-d20n.pcf.gz
+%%FONTDIR%%/ter-c12n.pcf.gz
+%%FONTDIR%%/ter-d24n.pcf.gz
+%%FONTDIR%%/ter-g22b.pcf.gz
+%%FONTDIR%%/ter-914b.pcf.gz
+%%FONTDIR%%/ter-c16n.pcf.gz
+%%FONTDIR%%/ter-922b.pcf.gz
 %%FONTDIR%%/ter-g14b.pcf.gz
-%%FONTDIR%%/ter-g14bi.pcf.gz
-%%FONTDIR%%/ter-g14i.pcf.gz
-%%FONTDIR%%/ter-g14n.pcf.gz
-%%FONTDIR%%/ter-g16b.pcf.gz
-%%FONTDIR%%/ter-g16bi.pcf.gz
-%%FONTDIR%%/ter-g16i.pcf.gz
+%%FONTDIR%%/ter-c20n.pcf.gz
+%%FONTDIR%%/ter-d12n.pcf.gz
+%%FONTDIR%%/ter-c24n.pcf.gz
+%%FONTDIR%%/ter-d16n.pcf.gz
+%%FONTDIR%%/ter-x22n.pcf.gz
+%%FONTDIR%%/ter-232b.pcf.gz
+%%FONTDIR%%/ter-k32b.pcf.gz
+%%FONTDIR%%/ter-c28n.pcf.gz
+%%FONTDIR%%/ter-f14b.pcf.gz
+%%FONTDIR%%/ter-f16n.pcf.gz
+%%FONTDIR%%/ter-f12n.pcf.gz
+%%FONTDIR%%/ter-920n.pcf.gz
 %%FONTDIR%%/ter-g16n.pcf.gz
-%%FONTDIR%%/ter-g20b.pcf.gz
-%%FONTDIR%%/ter-g20bi.pcf.gz
-%%FONTDIR%%/ter-g20i.pcf.gz
-%%FONTDIR%%/ter-g20n.pcf.gz
-%%FONTDIR%%/ter-g22b.pcf.gz
-%%FONTDIR%%/ter-g22bi.pcf.gz
-%%FONTDIR%%/ter-g22i.pcf.gz
-%%FONTDIR%%/ter-g22n.pcf.gz
-%%FONTDIR%%/ter-g24b.pcf.gz
-%%FONTDIR%%/ter-g24bi.pcf.gz
-%%FONTDIR%%/ter-g24i.pcf.gz
-%%FONTDIR%%/ter-g24n.pcf.gz
-%%FONTDIR%%/ter-g28b.pcf.gz
-%%FONTDIR%%/ter-g28bi.pcf.gz
-%%FONTDIR%%/ter-g28i.pcf.gz
-%%FONTDIR%%/ter-g28n.pcf.gz
+%%FONTDIR%%/ter-c22b.pcf.gz
+%%FONTDIR%%/ter-p32n.pcf.gz
+%%FONTDIR%%/ter-924n.pcf.gz
+%%FONTDIR%%/ter-g12n.pcf.gz
+%%FONTDIR%%/ter-x28b.pcf.gz
+%%FONTDIR%%/ter-d14b.pcf.gz
+%%FONTDIR%%/ter-x20b.pcf.gz
+%%FONTDIR%%/ter-928n.pcf.gz
+%%FONTDIR%%/ter-x24b.pcf.gz
+%%FONTDIR%%/ter-132b.pcf.gz
+%%FONTDIR%%/ter-720n.pcf.gz
+%%FONTDIR%%/ter-724n.pcf.gz
+%%FONTDIR%%/ter-f32b.pcf.gz
+%%FONTDIR%%/ter-728n.pcf.gz
+%%FONTDIR%%/ter-u22n.pcf.gz
+%%FONTDIR%%/ter-214b.pcf.gz
+%%FONTDIR%%/ter-112n.pcf.gz
+%%FONTDIR%%/ter-116n.pcf.gz
+%%FONTDIR%%/ter-k14b.pcf.gz
+%%FONTDIR%%/ter-522b.pcf.gz
+%%FONTDIR%%/ter-p12b.pcf.gz
 %%FONTDIR%%/ter-g32b.pcf.gz
-%%FONTDIR%%/ter-g32bi.pcf.gz
-%%FONTDIR%%/ter-g32i.pcf.gz
-%%FONTDIR%%/ter-g32n.pcf.gz
-%%FONTDIR%%/ter-k12b.pcf.gz
-%%FONTDIR%%/ter-k12bi.pcf.gz
-%%FONTDIR%%/ter-k12i.pcf.gz
+%%FONTDIR%%/ter-p16b.pcf.gz
+%%FONTDIR%%/ter-216n.pcf.gz
 %%FONTDIR%%/ter-k12n.pcf.gz
-%%FONTDIR%%/ter-k14b.pcf.gz
-%%FONTDIR%%/ter-k14bi.pcf.gz
-%%FONTDIR%%/ter-k14i.pcf.gz
-%%FONTDIR%%/ter-k14n.pcf.gz
-%%FONTDIR%%/ter-k16b.pcf.gz
-%%FONTDIR%%/ter-k16bi.pcf.gz
-%%FONTDIR%%/ter-k16i.pcf.gz
+%%FONTDIR%%/ter-524n.pcf.gz
+%%FONTDIR%%/ter-212n.pcf.gz
+%%FONTDIR%%/ter-114b.pcf.gz
 %%FONTDIR%%/ter-k16n.pcf.gz
-%%FONTDIR%%/ter-k20b.pcf.gz
-%%FONTDIR%%/ter-k20bi.pcf.gz
-%%FONTDIR%%/ter-k20i.pcf.gz
+%%FONTDIR%%/ter-520n.pcf.gz
+%%FONTDIR%%/ter-528n.pcf.gz
+%%FONTDIR%%/ter-p14n.pcf.gz
+%%FONTDIR%%/ter-d32b.pcf.gz
+%%FONTDIR%%/ter-u28b.pcf.gz
+%%FONTDIR%%/ter-722b.pcf.gz
+%%FONTDIR%%/ter-u24b.pcf.gz
+%%FONTDIR%%/ter-u20b.pcf.gz
+%%FONTDIR%%/ter-u16b.pcf.gz
+%%FONTDIR%%/ter-u12b.pcf.gz
+%%FONTDIR%%/ter-714b.pcf.gz
+%%FONTDIR%%/ter-228n.pcf.gz
+%%FONTDIR%%/ter-p22n.pcf.gz
+%%FONTDIR%%/ter-k28n.pcf.gz
+%%FONTDIR%%/ter-c32b.pcf.gz
+%%FONTDIR%%/ter-122b.pcf.gz
+%%FONTDIR%%/ter-516n.pcf.gz
 %%FONTDIR%%/ter-k20n.pcf.gz
-%%FONTDIR%%/ter-k22b.pcf.gz
-%%FONTDIR%%/ter-k22bi.pcf.gz
-%%FONTDIR%%/ter-k22i.pcf.gz
-%%FONTDIR%%/ter-k22n.pcf.gz
-%%FONTDIR%%/ter-k24b.pcf.gz
-%%FONTDIR%%/ter-k24bi.pcf.gz
-%%FONTDIR%%/ter-k24i.pcf.gz
+%%FONTDIR%%/ter-224n.pcf.gz
+%%FONTDIR%%/ter-512n.pcf.gz
 %%FONTDIR%%/ter-k24n.pcf.gz
-%%FONTDIR%%/ter-k28b.pcf.gz
-%%FONTDIR%%/ter-k28bi.pcf.gz
-%%FONTDIR%%/ter-k28i.pcf.gz
-%%FONTDIR%%/ter-k28n.pcf.gz
-%%FONTDIR%%/ter-k32b.pcf.gz
-%%FONTDIR%%/ter-k32bi.pcf.gz
-%%FONTDIR%%/ter-k32i.pcf.gz
-%%FONTDIR%%/ter-k32n.pcf.gz
-%%FONTDIR%%/ter-p12b.pcf.gz
-%%FONTDIR%%/ter-p12bi.pcf.gz
-%%FONTDIR%%/ter-p12i.pcf.gz
-%%FONTDIR%%/ter-p12n.pcf.gz
-%%FONTDIR%%/ter-p14b.pcf.gz
-%%FONTDIR%%/ter-p14bi.pcf.gz
-%%FONTDIR%%/ter-p14i.pcf.gz
-%%FONTDIR%%/ter-p14n.pcf.gz
-%%FONTDIR%%/ter-p16b.pcf.gz
-%%FONTDIR%%/ter-p16bi.pcf.gz
-%%FONTDIR%%/ter-p16i.pcf.gz
-%%FONTDIR%%/ter-p16n.pcf.gz
+%%FONTDIR%%/ter-220n.pcf.gz
 %%FONTDIR%%/ter-p20b.pcf.gz
-%%FONTDIR%%/ter-p20bi.pcf.gz
-%%FONTDIR%%/ter-p20i.pcf.gz
-%%FONTDIR%%/ter-p20n.pcf.gz
-%%FONTDIR%%/ter-p22b.pcf.gz
-%%FONTDIR%%/ter-p22bi.pcf.gz
-%%FONTDIR%%/ter-p22i.pcf.gz
-%%FONTDIR%%/ter-p22n.pcf.gz
+%%FONTDIR%%/ter-932b.pcf.gz
 %%FONTDIR%%/ter-p24b.pcf.gz
-%%FONTDIR%%/ter-p24bi.pcf.gz
-%%FONTDIR%%/ter-p24i.pcf.gz
-%%FONTDIR%%/ter-p24n.pcf.gz
+%%FONTDIR%%/ter-128n.pcf.gz
+%%FONTDIR%%/ter-120n.pcf.gz
+%%FONTDIR%%/ter-514b.pcf.gz
+%%FONTDIR%%/ter-k22b.pcf.gz
 %%FONTDIR%%/ter-p28b.pcf.gz
-%%FONTDIR%%/ter-p28bi.pcf.gz
-%%FONTDIR%%/ter-p28i.pcf.gz
-%%FONTDIR%%/ter-p28n.pcf.gz
-%%FONTDIR%%/ter-p32b.pcf.gz
-%%FONTDIR%%/ter-p32bi.pcf.gz
-%%FONTDIR%%/ter-p32i.pcf.gz
-%%FONTDIR%%/ter-p32n.pcf.gz
-%%FONTDIR%%/ter-u12b.pcf.gz
-%%FONTDIR%%/ter-u12bi.pcf.gz
-%%FONTDIR%%/ter-u12i.pcf.gz
-%%FONTDIR%%/ter-u12n.pcf.gz
-%%FONTDIR%%/ter-u14b.pcf.gz
-%%FONTDIR%%/ter-u14bi.pcf.gz
-%%FONTDIR%%/ter-u14i.pcf.gz
-%%FONTDIR%%/ter-u14n.pcf.gz
-%%FONTDIR%%/ter-u16b.pcf.gz
-%%FONTDIR%%/ter-u16bi.pcf.gz
-%%FONTDIR%%/ter-u16i.pcf.gz
-%%FONTDIR%%/ter-u16n.pcf.gz
-%%FONTDIR%%/ter-u20b.pcf.gz
-%%FONTDIR%%/ter-u20bi.pcf.gz
-%%FONTDIR%%/ter-u20i.pcf.gz
-%%FONTDIR%%/ter-u20n.pcf.gz
-%%FONTDIR%%/ter-u22b.pcf.gz
-%%FONTDIR%%/ter-u22bi.pcf.gz
-%%FONTDIR%%/ter-u22i.pcf.gz
-%%FONTDIR%%/ter-u22n.pcf.gz
-%%FONTDIR%%/ter-u24b.pcf.gz
-%%FONTDIR%%/ter-u24bi.pcf.gz
-%%FONTDIR%%/ter-u24i.pcf.gz
-%%FONTDIR%%/ter-u24n.pcf.gz
-%%FONTDIR%%/ter-u28b.pcf.gz
-%%FONTDIR%%/ter-u28bi.pcf.gz
-%%FONTDIR%%/ter-u28i.pcf.gz
-%%FONTDIR%%/ter-u28n.pcf.gz
-%%FONTDIR%%/ter-u32b.pcf.gz
-%%FONTDIR%%/ter-u32bi.pcf.gz
-%%FONTDIR%%/ter-u32i.pcf.gz
-%%FONTDIR%%/ter-u32n.pcf.gz
-%%FONTDIR%%/ter-x12b.pcf.gz
-%%FONTDIR%%/ter-x12bi.pcf.gz
-%%FONTDIR%%/ter-x12i.pcf.gz
-%%FONTDIR%%/ter-x12n.pcf.gz
-%%FONTDIR%%/ter-x14b.pcf.gz
-%%FONTDIR%%/ter-x14bi.pcf.gz
-%%FONTDIR%%/ter-x14i.pcf.gz
-%%FONTDIR%%/ter-x14n.pcf.gz
-%%FONTDIR%%/ter-x16b.pcf.gz
-%%FONTDIR%%/ter-x16bi.pcf.gz
-%%FONTDIR%%/ter-x16i.pcf.gz
-%%FONTDIR%%/ter-x16n.pcf.gz
-%%FONTDIR%%/ter-x20b.pcf.gz
-%%FONTDIR%%/ter-x20bi.pcf.gz
-%%FONTDIR%%/ter-x20i.pcf.gz
-%%FONTDIR%%/ter-x20n.pcf.gz
-%%FONTDIR%%/ter-x22b.pcf.gz
-%%FONTDIR%%/ter-x22bi.pcf.gz
-%%FONTDIR%%/ter-x22i.pcf.gz
-%%FONTDIR%%/ter-x22n.pcf.gz
-%%FONTDIR%%/ter-x24b.pcf.gz
-%%FONTDIR%%/ter-x24bi.pcf.gz
-%%FONTDIR%%/ter-x24i.pcf.gz
-%%FONTDIR%%/ter-x24n.pcf.gz
-%%FONTDIR%%/ter-x28b.pcf.gz
-%%FONTDIR%%/ter-x28bi.pcf.gz
-%%FONTDIR%%/ter-x28i.pcf.gz
-%%FONTDIR%%/ter-x28n.pcf.gz
-%%FONTDIR%%/ter-x32b.pcf.gz
-%%FONTDIR%%/ter-x32bi.pcf.gz
-%%FONTDIR%%/ter-x32i.pcf.gz
+%%FONTDIR%%/ter-124n.pcf.gz
+%%FONTDIR%%/ter-222b.pcf.gz
 %%FONTDIR%%/ter-x32n.pcf.gz
+%%FONTDIR%%/ter-u14n.pcf.gz
+%%FONTDIR%%/ter-712n.pcf.gz
+%%FONTDIR%%/ter-716n.pcf.gz
 @dirrm %%FONTDIR%%