From 3adddb73c2e79c4bd08d0830ba1a71ed03cbe1b7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 12 May 2020 10:10:01 +0200 Subject: consistently use XFLD naming scheme for all fonts, and use terminus also for italic --- X11/Xresources/local-font-terminus | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/X11/Xresources/local-font-terminus b/X11/Xresources/local-font-terminus index 0f18a9e..4625345 100644 --- a/X11/Xresources/local-font-terminus +++ b/X11/Xresources/local-font-terminus @@ -8,36 +8,36 @@ !! list relevant Xft fonts: fc-list :scalable=true:spacing=mono: family !! single fonts, in specific size -#define FONT_REGULAR_UNREADABLE terminus-10 -#define FONT_REGULAR_TINY terminus-12 -#define FONT_REGULAR_SMALL terminus-14 -#define FONT_REGULAR terminus-18 -#define FONT_REGULAR_LARGE terminus-24 -#define FONT_REGULAR_HUGE terminus-32 -#define FONT_BOLD_UNREADABLE terminus-bold-10 -#define FONT_BOLD_TINY terminus-bold-12 -#define FONT_BOLD_SMALL terminus-bold-14 -#define FONT_BOLD terminus-bold-18 -#define FONT_BOLD_LARGE terminus-bold-24 -#define FONT_BOLD_HUGE terminus-bold-32 -#define FONT_ITALIC_UNREADABLE -efont-*-medium-i-*-*-10-*-*-*-*-*-*-* -#define FONT_ITALIC_TINY -efont-*-medium-i-*-*-12-*-*-*-*-*-*-* -#define FONT_ITALIC_SMALL -efont-*-medium-i-*-*-14-*-*-*-*-*-*-* -#define FONT_ITALIC -efont-*-medium-i-*-*-17-*-*-*-*-*-*-* -#define FONT_ITALIC_LARGE -efont-*-medium-i-*-*-24-*-*-*-*-*-*-* -#define FONT_ITALIC_HUGE FONT_ITALIC_LARGE -#define FONT_BOLDITALIC_UNREADABLE -efont-*-bold-i-*-*-10-*-*-*-*-*-*-* -#define FONT_BOLDITALIC_TINY -efont-*-bold-i-*-*-12-*-*-*-*-*-*-* -#define FONT_BOLDITALIC_SMALL -efont-*-bold-i-*-*-14-*-*-*-*-*-*-* -#define FONT_BOLDITALIC -efont-*-bold-i-*-*-17-*-*-*-*-*-*-* -#define FONT_BOLDITALIC_LARGE -efont-*-bold-i-*-*-24-*-*-*-*-*-*-* -#define FONT_BOLDITALIC_HUGE FONT_BOLDITALIC_LARGE +#define FONT_REGULAR_UNREADABLE -*-terminus-medium-r-*-10-* +#define FONT_REGULAR_TINY -*-terminus-medium-r-*-12-* +#define FONT_REGULAR_SMALL -*-terminus-medium-r-*-14-* +#define FONT_REGULAR -*-terminus-medium-r-*-18-* +#define FONT_REGULAR_LARGE -*-terminus-medium-r-*-24-* +#define FONT_REGULAR_HUGE -*-terminus-medium-r-*-32-* +#define FONT_BOLD_UNREADABLE -*-terminus-bold-r-*-10-* +#define FONT_BOLD_TINY -*-terminus-bold-r-*-12-* +#define FONT_BOLD_SMALL -*-terminus-bold-r-*-14-* +#define FONT_BOLD -*-terminus-bold-r-*-18-* +#define FONT_BOLD_LARGE -*-terminus-bold-r-*-24-* +#define FONT_BOLD_HUGE -*-terminus-bold-r-*-32-* +#define FONT_ITALIC_UNREADABLE -*-terminus-medium-o-*-10-* +#define FONT_ITALIC_TINY -*-terminus-medium-o-*-12-* +#define FONT_ITALIC_SMALL -*-terminus-medium-o-*-14-* +#define FONT_ITALIC -*-terminus-medium-o-*-18-* +#define FONT_ITALIC_LARGE -*-terminus-medium-o-*-24-* +#define FONT_ITALIC_HUGE -*-terminus-medium-o-*-32-* +#define FONT_BOLDITALIC_UNREADABLE -*-terminus-bold-o-*-10-* +#define FONT_BOLDITALIC_TINY -*-terminus-bold-o-*-12-* +#define FONT_BOLDITALIC_SMALL -*-terminus-bold-o-*-14-* +#define FONT_BOLDITALIC -*-terminus-bold-o-*-18-* +#define FONT_BOLDITALIC_LARGE -*-terminus-bold-o-*-24-* +#define FONT_BOLDITALIC_HUGE -*-terminus-bold-o-*-32-* !! lists of fonts, first in specific size and subsequent without size -#define FONTS_REGULAR FONT_REGULAR,-efont-*-medium-* -#define FONTS_BOLD FONT_BOLD,-efont-*-medium-* -#define FONTS_ITALIC FONT_ITALIC -#define FONTS_ITALICBOLD FONT_BOLDITALIC +#define FONTS_REGULAR FONT_REGULAR,-*-terminus-medium-r-*,-efont-*-medium-r-* +#define FONTS_BOLD FONT_BOLD,-*-terminus-bold-r-*,-efont-*-bold-r-* +#define FONTS_ITALIC FONT_ITALIC,-*-terminus-medium-o-*,-efont-*-medium-i-* +#define FONTS_ITALICBOLD FONT_BOLDITALIC,-*-terminus-bold-o-*,-efont-*-bold-i-* XTerm*font: FONT_REGULAR XTerm*font1: FONT_REGULAR_UNREADABLE -- cgit v1.2.3