Move user and local conf file loading into conf.avail files

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index 035ee32cfeb5139263cbe2a3ed167ef017ed0aa9..a4f33894784ed326ba3ae719916fb113a60b8268 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -30,7 +30,7 @@
 <!-- Font cache directory list -->
 
        <cachedir>@FC_CACHEDIR@</cachedir>
-       <cachedir>~/.fonts/fontconfig</cachedir>
+       <cachedir>~/.fontconfig</cachedir>
 
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
@@ -77,8 +77,8 @@
   Serif faces
  -->
        <alias>
-               <family>DejaVu Serif</family>
                <family>Bitstream Vera Serif</family>
+               <family>DejaVu Serif</family>
                <family>Times New Roman</family>
                <family>Thorndale AMT</family>
                <family>Times</family>
@@ -97,8 +97,8 @@
   Sans-serif faces
  -->
        <alias>
-               <family>DejaVu Sans</family>
                <family>Bitstream Vera Sans</family>
+               <family>DejaVu Sans</family>
                <family>Helvetica</family>
                <family>Arial</family>
                <family>Verdana</family>
@@ -119,6 +119,7 @@
   Monospace faces
  -->
        <alias>
+               <family>Bitstream Vera Sans Mono</family>
                <family>DejaVu Sans Mono</family>
                <family>Courier</family>
                <family>Courier New</family>
@@ -281,25 +282,14 @@
                </edit>
        </match>
 
-<!--
-  Load per-user customization file
--->
-       <include ignore_missing="yes">~/.fonts.conf</include>
-
-<!--
-  Load local system customization file
--->
-       <include ignore_missing="yes">conf.d</include>
-       <include ignore_missing="yes">local.conf</include>
-
 <!--
   Provide required aliases for standard names
 -->
        <alias>
                <family>serif</family>
                <prefer>
-                       <family>DejaVu Serif</family>
                        <family>Bitstream Vera Serif</family>
+                       <family>DejaVu Serif</family>
                        <family>Times New Roman</family>
                        <family>Thorndale AMT</family>
                        <family>Luxi Serif</family>
@@ -307,19 +297,19 @@
                        <family>Times</family>
                        <family>Frank Ruehl</family>
                        <family>MgOpen Canonica</family>
-                       <family>FreeSerif</family>
                        <family>Kochi Mincho</family>
                        <family>AR PL SungtiL GB</family>
                        <family>AR PL Mingti2L Big5</family>
                        <family>ＭＳ 明朝</family>
                        <family>Baekmuk Batang</family>
+                       <family>FreeSerif</family>
                </prefer>
        </alias>
        <alias>
                <family>sans-serif</family>
                <prefer>
-                       <family>DejaVu Sans</family>
                        <family>Bitstream Vera Sans</family>
+                       <family>DejaVu Sans</family>
                        <family>Verdana</family>
                        <family>Arial</family>
                        <family>Albany AMT</family>
@@ -328,20 +318,20 @@
                        <family>Helvetica</family>
                        <family>Nachlieli</family>
                        <family>MgOpen Modata</family>
-                       <family>FreeSans</family>
                        <family>Kochi Gothic</family>
                        <family>AR PL KaitiM GB</family>
                        <family>AR PL KaitiM Big5</family>
                        <family>ＭＳ ゴシック</family>
                        <family>Baekmuk Dotum</family>
                        <family>SimSun</family>
+                       <family>FreeSans</family>
                </prefer>
        </alias>
        <alias>
                <family>monospace</family>
                <prefer>
-                       <family>DejaVu Sans Mono</family>
                        <family>Bitstream Vera Sans Mono</family>
+                       <family>DejaVu Sans Mono</family>
                        <family>Andale Mono</family>
                        <family>Courier New</family>
                        <family>Cumberland AMT</family>
@@ -349,10 +339,10 @@
                        <family>Nimbus Mono L</family>
                        <family>Courier</family>
                        <family>Miriam Mono</family>
-                       <family>FreeMono</family>
                        <family>Kochi Gothic</family>
                        <family>AR PL KaitiM GB</family>
                        <family>Baekmuk Dotum</family>
+                       <family>FreeMono</family>
                </prefer>
        </alias>