Move some section from fonts.conf into conf.avail files

URL aliases, AMT aliases, Che globaladvance fixes and Vera <8pt unhinting
sections all moved into conf.avail, to load before user and local confs.

diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf
new file mode 100644 (file)
index 0000000..23cbc09
--- /dev/null
+++ b/conf.avail/10-urw-aliases.conf
@@ -0,0 +1,47 @@
+<!--
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  -->
+        <alias>
+          <family>Avant Garde</family>
+          <accept><family>URW Gothic L</family></accept>
+        </alias>
+        <alias>
+          <family>Bookman</family>
+          <accept><family>URW Bookman L</family></accept>
+        </alias>
+        <alias>
+         <family>Courier</family>
+         <accept><family>Nimbus Mono L</family></accept>
+       </alias>
+        <alias>
+         <family>Helvetica</family>
+         <accept><family>Nimbus Sans L</family></accept>
+       </alias>
+        <alias>
+          <family>New Century Schoolbook</family>
+          <accept><family>Century Schoolbook L</family></accept>
+        </alias>
+        <alias>
+          <family>Palatino</family>
+          <accept><family>URW Palladio L</family></accept>
+        </alias>
+        <alias>
+         <family>Times</family>
+         <accept><family>Nimbus Roman No9 L</family></accept>
+       </alias>
+        <alias>
+         <family>Zapf Chancery</family>
+         <accept><family>URW Chancery L</family></accept>
+       </alias>
+        <alias>
+         <family>Zapf Dingbats</family>
+         <accept><family>Dingbats</family></accept>
+       </alias>
+       <match target="pattern">
+         <test name="family">
+           <string>Symbol</string>
+         </test>
+         <edit name="family" mode="append" binding="strong">
+           <string>Standard Symbols L</string>
+         </edit>
+       </match>

diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf
new file mode 100644 (file)
index 0000000..ba73638
--- /dev/null
+++ b/conf.avail/15-amt-aliases.conf
@@ -0,0 +1,16 @@
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+       <alias>
+               <family>Times New Roman</family>
+               <accept><family>Thorndale AMT</family></accept>
+       </alias>
+       <alias>
+               <family>Arial</family>
+               <accept><family>Albany AMT</family></accept>
+       </alias>
+       <alias>
+               <family>Courier New</family>
+               <accept><family>Cumberland AMT</family></accept>
+       </alias>

diff --git a/conf.avail/20-fix-globaladvance.conf b/conf.avail/20-fix-globaladvance.conf
new file mode 100644 (file)
index 0000000..8d76d32
--- /dev/null
+++ b/conf.avail/20-fix-globaladvance.conf
@@ -0,0 +1,24 @@
+<!--
+  Some Asian fonts misadvertise themselves as monospaced when
+  in fact they are dual-spaced (half and full).  This makes
+  FreeType very confused as it forces all widths to match.
+  Undo this magic by disabling the width forcing code -->
+       <match target="font">
+               <test name="family"><string>GulimChe</string></test>
+               <edit name="globaladvance"><bool>false</bool></edit>
+       </match>
+
+       <match target="font">
+               <test name="family"><string>DotumChe</string></test>
+               <edit name="globaladvance"><bool>false</bool></edit>
+       </match>
+
+       <match target="font">
+               <test name="family"><string>BatangChe</string></test>
+               <edit name="globaladvance"><bool>false</bool></edit>
+       </match>
+
+       <match target="font">
+               <test name="family"><string>GungsuhChe</string></test>
+               <edit name="globaladvance"><bool>false</bool></edit>
+       </match>

diff --git a/conf.avail/30-unhint-small-vera.conf b/conf.avail/30-unhint-small-vera.conf
new file mode 100644 (file)
index 0000000..245580f
--- /dev/null
+++ b/conf.avail/30-unhint-small-vera.conf
@@ -0,0 +1,44 @@
+<!-- 
+       The Bitstream Vera fonts have GASP entries suggesting that hinting be
+       disabled below 8 ppem, but FreeType ignores those, preferring to use
+       the data found in the instructed hints.  The initial Vera release
+       didn't include the right instructions in the 'prep' table. Fix this
+       by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+       <match target="font">
+               <test name="family">
+                       <string>Bitstream Vera Sans</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Bitstream Vera Serif</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Bitstream Vera Sans Mono</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+

diff --git a/fonts.conf.in b/fonts.conf.in
index 343df79d2fbb01b3ed5fde26a267e63d70aecb1c..d70800e00bd9a96174afc74cc68d6827be63da14 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -149,139 +149,6 @@
                </edit>
        </match>
 
-<!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
-  -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias>
-         <family>Courier</family>
-         <accept><family>Nimbus Mono L</family></accept>
-       </alias>
-        <alias>
-         <family>Helvetica</family>
-         <accept><family>Nimbus Sans L</family></accept>
-       </alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias>
-         <family>Times</family>
-         <accept><family>Nimbus Roman No9 L</family></accept>
-       </alias>
-        <alias>
-         <family>Zapf Chancery</family>
-         <accept><family>URW Chancery L</family></accept>
-       </alias>
-        <alias>
-         <family>Zapf Dingbats</family>
-         <accept><family>Dingbats</family></accept>
-       </alias>
-       <match target="pattern">
-         <test name="family">
-           <string>Symbol</string>
-         </test>
-         <edit name="family" mode="append" binding="strong">
-           <string>Standard Symbols L</string>
-         </edit>
-       </match>
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
-       <alias>
-               <family>Times New Roman</family>
-               <accept><family>Thorndale AMT</family></accept>
-       </alias>
-       <alias>
-               <family>Arial</family>
-               <accept><family>Albany AMT</family></accept>
-       </alias>
-       <alias>
-               <family>Courier New</family>
-               <accept><family>Cumberland AMT</family></accept>
-       </alias>
- 
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-       <match target="font">
-               <test name="family"><string>GulimChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family"><string>DotumChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family"><string>BatangChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family"><string>GungsuhChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-<!-- 
-       The Bitstream Vera fonts have GASP entries suggesting that hinting be
-       disabled below 8 ppem, but FreeType ignores those, preferring to use
-       the data found in the instructed hints.  The initial Vera release
-       didn't include the right instructions in the 'prep' table. Fix this
-       by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-       <match target="font">
-               <test name="family">
-                       <string>Bitstream Vera Sans</string>
-               </test>
-               <test name="pixelsize" compare="less">
-                       <double>7.5</double>
-               </test>
-               <edit name="hinting">
-                       <bool>false</bool>
-               </edit>
-       </match>
-
-       <match target="font">
-               <test name="family">
-                       <string>Bitstream Vera Serif</string>
-               </test>
-               <test name="pixelsize" compare="less">
-                       <double>7.5</double>
-               </test>
-               <edit name="hinting">
-                       <bool>false</bool>
-               </edit>
-       </match>
-
-       <match target="font">
-               <test name="family">
-                       <string>Bitstream Vera Sans Mono</string>
-               </test>
-               <test name="pixelsize" compare="less">
-                       <double>7.5</double>
-               </test>
-               <edit name="hinting">
-                       <bool>false</bool>
-               </edit>
-       </match>
-
 <!--
   Load local system customization file
 -->