bin/disorder-notify: Refactor the state reporting machinery.

[profile] / dot / fonts.conf

diff --git a/dot/fonts.conf b/dot/fonts.conf
index db05e1e5efc2241dd436dbc72afe22ff289b477e..261b7602486a9def7cc98549125bd51dbd4d4afc 100644 (file)
--- a/dot/fonts.conf
+++ b/dot/fonts.conf
@@ -5,16 +5,14 @@
 
   <!-- Hacking for the fixed font.
 
-       After many half-hearted attempts to make this work properly, I'm
-       finally settling on this approach: define MiscFixed6x13 as a
-       magic name for the right font, and then hack configuration files
-       as necessary to make them use it.
+       Firstly, make sure that Fixed fonts aren't filtered out when building
+       the font cache.  Secondly, arrange that requests for Fixed find the
+       Trad version by preference.
     -->
   <selectfont>
     <acceptfont>
       <pattern>
        <patelt name="family"><string>Fixed</string></patelt>
-       <patelt name="width"><int>87</int></patelt>
       </pattern>
     </acceptfont>
     <rejectfont>
@@ -24,36 +22,26 @@
     </rejectfont>
   </selectfont>
   <match target="pattern">
-    <test name="family"><string>MiscFixed6x13</string></test>
-    <test name="slant" compare="more_eq"><int>10</int></test>
-    <!-- edit name="size"><double>12</double></edit -->
-    <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="dpi"><int>75</int></edit>
-    <edit mode="assign" name="pixelsize"><double>13</double></edit>
+    <test name="family"><string>Fixed</string></test>
+    <edit name="dpi" mode="prepend_first"><int>75</int></edit>
   </match>
   <match target="pattern">
-    <test name="family"><string>MiscFixed6x13</string></test>
-    <test name="weight" compare="more_eq"><int>150</int></test>
-    <!-- edit name="size"><double>12</double></edit -->
-    <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="dpi"><int>75</int></edit>
-    <edit mode="assign" name="pixelsize"><double>13</double></edit>
+    <test name="family"><string>Fixed</string></test>
+    <test name="size" compare="more_eq"><double>12</double></test>
+    <test name="size" compare="less_eq"><double>14</double></test>
+    <edit name="foundry" mode="prepend_first"><string>Trad</string></edit>
+    <edit name="size"><double>13</double></edit>
+    <edit name="pixelsize"><double>13</double></edit>
+    <edit name="width"><const>semicondensed</const></edit>
   </match>
   <match target="pattern">
-    <test name="family"><string>MiscFixed6x13</string></test>
-    <!-- edit name="size"><double>12</double></edit -->
-    <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="dpi"><int>75</int></edit>
-    <edit mode="assign" name="pixelsize"><double>13</double></edit>
+    <test name="family"><string>Fixed</string></test>
+    <test name="pixelsize" compare="more_eq"><double>10</double></test>
+    <test name="pixelsize" compare="less_eq"><double>14</double></test>
+    <edit name="foundry" mode="prepend_first"><string>Trad</string></edit>
+    <edit name="size"><double>13</double></edit>
+    <edit name="pixelsize"><double>13</double></edit>
+    <edit name="width"><const>semicondensed</const></edit>
   </match>
 
   <!-- Hacking for the symbol font.
@@ -62,13 +50,14 @@
        right thing with MathML and suchlike.
     -->
   <match target="pattern">
-    <test name="family"><string>symbol</string></test>
+    <test name="family"><string>Symbol</string></test>
+    <edit name="foundry"><string>urw</string></edit>
     <edit binding="strong" mode="append" name="family">
       <string>Standard Symbols L</string>
     </edit>
   </match>
 
-  <match targets="pattern">
+  <match target="pattern">
     <test name="family"><string>Geneva</string></test>
     <edit mode="append" name="family"><string>FreeSans</string></edit>
   </match>