fontconfig: Reformat, autohint downloaded fonts

1 files changed, 44 insertions, 64 deletions

diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf
index e5f63f0..aa9a78c 100644
--- a/fontconfig/fonts.conf
+++ b/fontconfig/fonts.conf
@@ -1,80 +1,60 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!--
-	 ~/.config/fontconfig/fonts.conf
-	 http://www.freedesktop.org/software/fontconfig/fontconfig-user.html
+<!-- ~/.config/fontconfig/fonts.conf
+     http://www.freedesktop.org/software/fontconfig/fontconfig-user.html
 -->
+
 <fontconfig>
 	<match target="font">
-		<edit name="antialias">		<bool>true</bool>			</edit>
-		<edit name="rgba">			<const>rgb</const>			</edit>
-		<edit name="hinting">		<bool>true</bool>			</edit>
-		<edit name="hintstyle">		<const>hintmedium</const>	</edit>
-		<edit name="autohint">		<bool>false</bool>			</edit>
-		<edit name="lcdfilter">		<const>lcddefault</const>	</edit>
-		<edit name="embeddedbitmap"><bool>false</bool>		</edit>
+		<edit name="antialias" mode="assign"> <bool>true</bool></edit>
+		<edit name="autohint" mode="assign"> <bool>false</bool></edit>
+		<edit name="rgba" mode="assign"> <const>rgb</const></edit>
+		<edit name="hinting" mode="assign"> <bool>true</bool></edit>
+		<edit name="hintstyle" mode="assign"> <const>hintfull</const></edit>
+		<edit name="lcdfilter" mode="assign"> <const>lcddefault</const></edit>
+		<edit name="embeddedbitmap" mode="assign"> <bool>false</bool></edit>
+
+		<!-- Hack for the not_contains file test to work even when the property
+			 is missing -->
+		<edit name="file" mode="append"> <string></string> </edit>
 	</match>
+
 	<match target="font">
-		<test name="family" compare="contains">
-            <string>Inconsolata</string>
-        </test>
-		<edit name="hintstyle">
-			<const>hintslight</const>
-		</edit>
+		<test name="fontformat" compare="eq"> <string>Type 1</string> </test>
+		<edit name="hintstyle"> <const>hintslight</const> </edit>
 	</match>
 
 	<selectfont>
 		<rejectfont>
-			<pattern>
-				<patelt name="family"><string>Nimbus Sans L</string></patelt>
-			</pattern>
-			<pattern>
-				<patelt name="family"><string>Nimbus Mono L</string></patelt>
-			</pattern>
-			<pattern>
-				<patelt name="family"><string>URW Palladio L</string></patelt>
-			</pattern>
-			<pattern>
-				<patelt name="family"><string>Clean</string></patelt>
-			</pattern>
-			<pattern>
-				<patelt name="family"><string>FreeSans</string></patelt>
-			</pattern>
+			<pattern> <patelt name="family"> <string>Nimbus Sans L</string> </patelt> </pattern>
+			<pattern> <patelt name="family"> <string>Nimbus Mono L</string> </patelt> </pattern>
+			<pattern> <patelt name="family"> <string>URW Palladio L</string> </patelt> </pattern>
+			<pattern> <patelt name="family"> <string>Clean</string> </patelt> </pattern>
+			<pattern> <patelt name="family"> <string>FreeSans</string> </patelt> </pattern>
 		</rejectfont>
 	</selectfont>
 
-    <!-- Re-enable embedded bitmaps for CJK fonts -->
-
-    <match target="font">
-        <test name="lang" compare="contains"> <string>ja</string> </test>
-        <edit name="embeddedbitmap"> <bool>true</bool> </edit>
-    </match>
-
-    <match target="font">
-        <test name="lang" compare="contains"> <string>ko</string> </test>
-        <edit name="embeddedbitmap"> <bool>true</bool> </edit>
-    </match>
-
-    <match target="font">
-        <test name="lang" compare="contains"> <string>zh</string> </test>
-        <edit name="embeddedbitmap"> <bool>true</bool> </edit>
-    </match>
-
-    <!-- Enable autohinting for certain broken fonts -->
+	<!-- Re-enable embedded bitmaps for CJK fonts -->
+	<match target="font">
+		<test name="lang" compare="contains"> <string>ja</string> </test>
+		<edit name="embeddedbitmap"> <bool>true</bool> </edit>
+	</match>
+	<match target="font">
+		<test name="lang" compare="contains"> <string>ko</string> </test>
+		<edit name="embeddedbitmap"> <bool>true</bool> </edit>
+	</match>
+	<match target="font">
+		<test name="lang" compare="contains"> <string>zh</string> </test>
+		<edit name="embeddedbitmap"> <bool>true</bool> </edit>
+	</match>
 
-    <match target="font">
-        <test name="family"> <string>Segoe UI</string> </test>
-        <edit name="autohint"> <bool>true</bool> </edit>
-    </match>
-	<!--
-	<alias binding="same">
-		<family>sans-serif</family>
-		<accept>
-			<family>Source Sans Pro</family>
-		</accept>
-	</alias>
-	-->	
+	<!-- Firefox download fonts -->
+	<match target="font">
+		<test name="family" compare="contains"> <string>@font-face:</string> </test>
+		<test name="file" qual="all" compare="not_contains"> <string>/</string> </test>
+		<test name="fontformat" compare="eq"> <string>TrueType</string> </test>
+		<edit name="autohint" mode="assign"> <bool>true</bool> </edit>
+		<edit name="hintstyle" mode="assign"> <const>hintslight</const> </edit>
+	</match>
 </fontconfig>
-<!--
-	vim: ft=xml:ts=4:sw=4
--->
+<!-- vim: set ft=xml -->