X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.conf.in;h=0629c807cfa7503990e1e0e9a24dd4b21467ab3d;hb=fd7223c770e74730480bdf9ecf36f3152a12473e;hp=4f7a3084c9128268bd88baccdaa69c8e451c32d2;hpb=720298e773876037dd9af384a9cc16956600b5e7;p=fontconfig.git

diff --git a/fonts.conf.in b/fonts.conf.in
index 4f7a308..0629c80 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,6 +77,7 @@
   Serif faces
  -->
 	<alias>
+		<family>DejaVu Serif</family>
 		<family>Bitstream Vera Serif</family>
 		<family>Times New Roman</family>
 		<family>Thorndale AMT</family>
@@ -91,6 +97,7 @@
   Sans-serif faces
  -->
 	<alias>
+		<family>DejaVu Sans</family>
 		<family>Bitstream Vera Sans</family>
 		<family>Helvetica</family>
 		<family>Arial</family>
@@ -112,7 +119,7 @@
   Monospace faces
  -->
  	<alias>
-		<family>Bitstream Vera Sans Mono</family>
+		<family>DejaVu Sans Mono</family>
 		<family>Courier</family>
 		<family>Courier New</family>
 		<family>Andale Mono</family>
@@ -142,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.
@@ -260,6 +298,7 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
+			<family>DejaVu Serif</family>
 			<family>Bitstream Vera Serif</family>
 			<family>Times New Roman</family>
 			<family>Thorndale AMT</family>
@@ -279,6 +318,7 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
+			<family>DejaVu Sans</family>
 			<family>Bitstream Vera Sans</family>
 			<family>Verdana</family>
 			<family>Arial</family>
@@ -300,6 +340,7 @@
 	<alias>
 		<family>monospace</family>
 		<prefer>
+			<family>DejaVu Sans Mono</family>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
@@ -354,16 +395,26 @@
 	<match target="font">
 		<!-- check to see if the font is just regular -->
 		<test name="weight" compare="less_eq">
-			<int>100</int>
+			<const>medium</const>
 		</test>
 		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more_eq">
-			<int>200</int>
+		<test target="pattern" name="weight" compare="more">
+			<const>medium</const>
 		</test>
-		<!-- set the embolden flag -->
+		<!--
+		  set the embolden flag
+		  needed for applications using cairo, e.g. gucharmap, gedit, ...
+		-->
 		<edit name="embolden" mode="assign">
 			<bool>true</bool>
 		</edit>
+		<!--
+		 set weight to bold
+		 needed for applications using Xft directly, e.g. Firefox, ...
+		-->
+		<edit name="weight" mode="assign">
+			<const>bold</const>
+		</edit>
 	</match>