X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.conf.in;h=a4f33894784ed326ba3ae719916fb113a60b8268;hb=cbdd74d6569b5975b86bd425b56b1b50aa73d2bb;hp=2ff162ac8057f7fd61733877643401c0afca8ca0;hpb=b17cf498be69f483e6355ae468f7239165df3ffb;p=fontconfig.git

diff --git a/fonts.conf.in b/fonts.conf.in
index 2ff162a..a4f3389 100644
--- 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'
 -->
@@ -72,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>
@@ -92,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>
@@ -114,6 +119,7 @@
   Monospace faces
  -->
  	<alias>
+		<family>Bitstream Vera Sans Mono</family>
 		<family>DejaVu Sans Mono</family>
 		<family>Courier</family>
 		<family>Courier New</family>
@@ -144,21 +150,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.
@@ -245,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>
@@ -271,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>
@@ -292,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>
@@ -313,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>