From caa63513a77c06b9bd63c6a2c7031b297cd8030f Mon Sep 17 00:00:00 2001
Message-Id: <caa63513a77c06b9bd63c6a2c7031b297cd8030f.1717744393.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 11 Jan 2012 03:14:17 +0000
Subject: [PATCH] Use Ian Jackson's `trad' versions of 6x13 for general
 display.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

This persuades `pterm', Emacs, and traditional Xt-based programs which
read resources to use the server-side font directly, and hacks
`fontconfig' so that `MiscFixed6x13' maps to the trad version.
---
 dot/Xdefaults      | 2 +-
 dot/fonts.conf     | 6 +++---
 dot/putty-defaults | 2 +-
 el/dot-emacs.el    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dot/Xdefaults b/dot/Xdefaults
index 2952699..be97f7e 100644
--- a/dot/Xdefaults
+++ b/dot/Xdefaults
@@ -8,7 +8,7 @@
 #define HELV_MR12 -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso10646-1
 #define HELV_BR12 -adobe-helvetica-bold-r-normal--12-*-*-*-p-*-iso10646-1
 #define HELV_MI12 -adobe-helvetica-medium-i-normal--12-*-*-*-p-*-iso10646-1
-#define FIXED -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+#define FIXED -trad-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
 #define NICEFONT HELV_MR10
 
 
diff --git a/dot/fonts.conf b/dot/fonts.conf
index dec89ed..d5b1343 100644
--- a/dot/fonts.conf
+++ b/dot/fonts.conf
@@ -30,7 +30,7 @@
     <edit name="style"><string>Oblique SemiCondensed</string></edit>
     <edit name="width"><int>87</int></edit>
     <edit name="family"><string>Fixed</string></edit>
-    <edit name="foundry"><string>Misc</string></edit>
+    <edit name="foundry"><string>Trad</string></edit>
     <edit name="dpi"><int>75</int></edit>
     <edit mode="assign" name="pixelsize"><double>13</double></edit>
   </match>
@@ -41,7 +41,7 @@
     <edit name="style"><string>Bold SemiCondensed</string></edit>
     <edit name="width"><int>87</int></edit>
     <edit name="family"><string>Fixed</string></edit>
-    <edit name="foundry"><string>Misc</string></edit>
+    <edit name="foundry"><string>Trad</string></edit>
     <edit name="dpi"><int>75</int></edit>
     <edit mode="assign" name="pixelsize"><double>13</double></edit>
   </match>
@@ -51,7 +51,7 @@
     <edit name="style"><string>SemiCondensed</string></edit>
     <edit name="width"><int>87</int></edit>
     <edit name="family"><string>Fixed</string></edit>
-    <edit name="foundry"><string>Misc</string></edit>
+    <edit name="foundry"><string>Trad</string></edit>
     <edit name="dpi"><int>75</int></edit>
     <edit mode="assign" name="pixelsize"><double>13</double></edit>
   </match>
diff --git a/dot/putty-defaults b/dot/putty-defaults
index 2a5d711..0f937f2 100644
--- a/dot/putty-defaults
+++ b/dot/putty-defaults
@@ -98,7 +98,7 @@ WinNameAlways=0
 WinTitle=
 TermWidth=80
 TermHeight=75
-Font=-misc-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1
+Font=-trad-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1
 FontQuality=0
 FontVTMode=4
 UseSystemColours=0
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 51db6f3..f229905 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -824,12 +824,12 @@      (defvar ,name ',name)
 
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
-  (((type x)) :family "6x13" :height 130)
+  (((type x)) :family "6x13" :foundry "trad" :height 130)
   (((type color)) :foreground "white" :background "black")
   (t nil))
 (mdw-define-face fixed-pitch
   (((type w32)) :family "courier new" :height 85)
-  (((type x)) :family "6x13" :height 130)
+  (((type x)) :family "6x13" :foundry "trad" :height 130)
   (t :foreground "white" :background "black"))
 (if (>= emacs-major-version 23)
     (mdw-define-face variable-pitch
-- 
[mdw]