From e61447902496e3fba89c4d67d9ab02b7bf279ad2 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Sat, 17 Mar 2018 13:06:19 +0100
Subject: fontconfig: Delete old cruft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 fontconfig/fonts.conf | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf
index aa9a78c..8452c45 100644
--- a/fontconfig/fonts.conf
+++ b/fontconfig/fonts.conf
@@ -6,31 +6,22 @@
 
 <fontconfig>
 	<match target="font">
+		<edit name="rgba" mode="assign"> <const>rgb</const></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="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</string></patelt></pattern>
+			<pattern><patelt name="family"><string>Nimbus Mono</string></patelt></pattern>
+			<pattern><patelt name="family"><string>URW Palladio</string></patelt></pattern>
+			<pattern><patelt name="family"><string>Clean</string></patelt></pattern>
+			<pattern><patelt name="family"><string>FreeSans</string></patelt></pattern>
 		</rejectfont>
 	</selectfont>
 
@@ -47,14 +38,6 @@
 		<test name="lang" compare="contains"> <string>zh</string> </test>
 		<edit name="embeddedbitmap"> <bool>true</bool> </edit>
 	</match>
-
-	<!-- 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: set ft=xml -->
-- 
cgit v1.2.3-70-g09d2