Fix memory leaks in fc-cache directory cleaning code.

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index 2ff162ac8057f7fd61733877643401c0afca8ca0..0629c807cfa7503990e1e0e9a24dd4b21467ab3d 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -27,6 +27,11 @@
        @FC_FONTPATH@
        <dir>~/.fonts</dir>
 
+<!-- Font cache directory list -->
+
+       <cachedir>@FC_CACHEDIR@</cachedir>
+       <cachedir>~/.fontconfig</cachedir>
+
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -144,21 +149,52 @@
        </match>
 
 <!--
-  URW provides metric and shape compatible fonts for these 3 Adobe families.
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
   -->
         <alias>
-         <family>Times</family>
-         <accept><family>Nimbus Roman No9 L</family></accept>
+          <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>Courier</family>
-         <accept><family>Nimbus Mono L</family></accept>
+          <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.