X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.conf.in;h=adc44e8027ee365c7f11eb57ce52497cbd38634e;hb=04cedae0d5a720662bdc0de3d4cb97f6c77e7d1a;hp=ef988eef5bffd4f44ac7a51746d1cad408185edf;hpb=8759822e8fdaebcaaea82571d6b084003ca5751e;p=fontconfig.git

diff --git a/fonts.conf.in b/fonts.conf.in
index ef988ee..adc44e8 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'
 -->
@@ -73,6 +78,7 @@
  -->
 	<alias>
 		<family>Bitstream Vera Serif</family>
+		<family>DejaVu Serif</family>
 		<family>Times New Roman</family>
 		<family>Thorndale AMT</family>
 		<family>Times</family>
@@ -84,6 +90,7 @@
 		<family>ＭＳ 明朝</family>
 		<family>Baekmuk Batang</family>
 		<family>FreeSerif</family>
+		<family>MgOpen Canonica</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
@@ -91,6 +98,7 @@
  -->
 	<alias>
 		<family>Bitstream Vera Sans</family>
+		<family>DejaVu Sans</family>
 		<family>Helvetica</family>
 		<family>Arial</family>
 		<family>Verdana</family>
@@ -104,6 +112,7 @@
 		<family>Baekmuk Dotum</family>
 		<family>SimSun</family>
 		<family>FreeSans</family>
+		<family>MgOpen Modata</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
@@ -111,6 +120,7 @@
  -->
  	<alias>
 		<family>Bitstream Vera Sans Mono</family>
+		<family>DejaVu Sans Mono</family>
 		<family>Courier</family>
 		<family>Courier New</family>
 		<family>Andale Mono</family>
@@ -140,33 +150,55 @@
 	</match>
 
 <!--
-  URW provides metric and shape compatible fonts for these 3 Adobe families
-  Mark these as effective replacements by binding the replacement
-  family names strongly
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
   -->
-        <match target="pattern">
-	  <test name="family"><string>Times</string></test>
-	  <edit name="family" mode="append" binding="same">
-	    <string>Nimbus Roman No9 L</string>
-	  </edit>
-	</match>
-        <match target="pattern">
-	  <test name="family"><string>Helvetica</string></test>
-	  <edit name="family" mode="append" binding="same">
-	    <string>Nimbus Sans L</string>
-	  </edit>
-	</match>
-        <match target="pattern">
-	  <test name="family"><string>Courier</string></test>
-	  <edit name="family" mode="append" binding="same">
-	    <string>Nimbus Mono L</string>
+        <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.  Bind them weakly as matching here is not as important as
- with web fonts.
+ families.
  -->
  	<alias>
 		<family>Times New Roman</family>
@@ -268,12 +300,14 @@
 		<family>serif</family>
 		<prefer>
 			<family>Bitstream Vera Serif</family>
+			<family>DejaVu Serif</family>
 			<family>Times New Roman</family>
 			<family>Thorndale AMT</family>
 			<family>Luxi Serif</family>
 			<family>Nimbus Roman No9 L</family>
 			<family>Times</family>
 			<family>Frank Ruehl</family>
+			<family>MgOpen Canonica</family>
 			<family>Kochi Mincho</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
@@ -286,6 +320,7 @@
 		<family>sans-serif</family>
 		<prefer>
 			<family>Bitstream Vera Sans</family>
+			<family>DejaVu Sans</family>
 			<family>Verdana</family>
 			<family>Arial</family>
 			<family>Albany AMT</family>
@@ -293,6 +328,7 @@
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
 			<family>Nachlieli</family>
+			<family>MgOpen Modata</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
 			<family>AR PL KaitiM Big5</family>
@@ -306,6 +342,7 @@
 		<family>monospace</family>
 		<prefer>
 			<family>Bitstream Vera Sans Mono</family>
+			<family>DejaVu Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
@@ -346,6 +383,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
+                <!-- and disable embedded bitmaps for artificial oblique -->
+                <edit name="embeddedbitmap" mode="assign">
+                        <bool>false</bool>
+                </edit>
 	</match>
 
 <!--
@@ -355,16 +396,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>