Bug 19128 - Handling whitespace in aliases

Add a new attribute `ignore-blanks' to <test>.
When this is set to "true", any blanks in the string will be ignored
on comparison.  This takes effects for compare="eq" or "not_eq" only.

Also changed the behavior of the comparison on <alias> too.

6 files changed, 31 insertions, 36 deletions

diff --git a/conf.d/20-fix-globaladvance.conf b/conf.d/20-fix-globaladvance.conf
index 2a9c063..c62ba59 100644
--- a/conf.d/20-fix-globaladvance.conf
+++ b/conf.d/20-fix-globaladvance.conf
@@ -7,22 +7,22 @@
   FreeType very confused as it forces all widths to match.
   Undo this magic by disabling the width forcing code -->
 	<match target="font">
-		<test name="family"><string>GulimChe</string></test>
+		<test name="family" compare="eq" ignore-blanks="true"><string>GulimChe</string></test>
 		<edit name="globaladvance"><bool>false</bool></edit>
 	</match>
 
 	<match target="font">
-		<test name="family"><string>DotumChe</string></test>
+		<test name="family" compare="eq" ignore-blanks="true"><string>DotumChe</string></test>
 		<edit name="globaladvance"><bool>false</bool></edit>
 	</match>
 
 	<match target="font">
-		<test name="family"><string>BatangChe</string></test>
+		<test name="family" compare="eq" ignore-blanks="true"><string>BatangChe</string></test>
 		<edit name="globaladvance"><bool>false</bool></edit>
 	</match>
 
 	<match target="font">
-		<test name="family"><string>GungsuhChe</string></test>
+		<test name="family" compare="eq" ignore-blanks="true"><string>GungsuhChe</string></test>
 		<edit name="globaladvance"><bool>false</bool></edit>
 	</match>
 </fontconfig>
diff --git a/conf.d/20-unhint-small-vera.conf b/conf.d/20-unhint-small-vera.conf
index c4ebee9..c9505ca 100644
--- a/conf.d/20-unhint-small-vera.conf
+++ b/conf.d/20-unhint-small-vera.conf
@@ -10,7 +10,7 @@
  -->
 
 	<match target="font">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Bitstream Vera Sans</string>
 		</test>
 		<test name="pixelsize" compare="less">
@@ -22,7 +22,7 @@
 	</match>
 
 	<match target="font">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Bitstream Vera Serif</string>
 		</test>
 		<test name="pixelsize" compare="less">
@@ -34,7 +34,7 @@
 	</match>
 
 	<match target="font">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Bitstream Vera Sans Mono</string>
 		</test>
 		<test name="pixelsize" compare="less">
diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf
index ffb70c6..9adffa7 100644
--- a/conf.d/25-unhint-nonlatin.conf
+++ b/conf.d/25-unhint-nonlatin.conf
@@ -5,7 +5,7 @@
 <!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
 
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Kochi Mincho</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -13,7 +13,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Kochi Gothic</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -21,7 +21,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Sazanami Mincho</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -29,7 +29,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Sazanami Gothic</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -37,7 +37,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Baekmuk Batang</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -45,7 +45,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Baekmuk Dotum</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -53,7 +53,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Baekmuk Gulim</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -61,7 +61,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Baekmuk Headline</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -69,7 +69,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL Mingti2L Big5</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -77,7 +77,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL ShanHeiSun Uni</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -85,7 +85,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL KaitiM Big5</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -93,7 +93,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL ZenKai Uni</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -101,7 +101,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL SungtiL GB</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -109,7 +109,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>AR PL KaitiM GB</string>
 		</test>
 		<edit name="hinting" mode="assign">
@@ -117,7 +117,7 @@
 		</edit>
 	</match>
 	<match target="font">
-		<test name="family" compare="eq">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>ZYSong18030</string>
 		</test>
 		<edit name="hinting" mode="assign">
diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index 359f9fb..aae06ac 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -29,13 +29,8 @@
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
-	<!-- workaround for Bug#19128 -->
-	<alias binding="same">
-	  <family>ZapfDingbats</family>
-	  <accept><family>Dingbats</family></accept>
-	</alias>
 	<match target="pattern">
-	  <test name="family">
+	  <test name="family" compare="eq" ignore-blanks="true">
 	    <string>Symbol</string>
 	  </test>
 	  <edit name="family" mode="append" binding="same">
diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf
index 0033675..ea00661 100644
--- a/conf.d/65-fonts-persian.conf
+++ b/conf.d/65-fonts-persian.conf
@@ -181,7 +181,7 @@
 <!-- Register the fonts that we actually do have -->
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Elham</string>
 		</test>
 		<edit name="foundry">
@@ -190,7 +190,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Homa</string>
 		</test>
 		<edit name="foundry">
@@ -199,7 +199,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Koodak</string>
 		</test>
 		<edit name="foundry">
@@ -208,7 +208,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Nazli</string>
 		</test>
 		<edit name="foundry">
@@ -217,7 +217,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Roya</string>
 		</test>
 		<edit name="foundry">
@@ -226,7 +226,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Terafik</string>
 		</test>
 		<edit name="foundry">
@@ -235,7 +235,7 @@
 	</match>
 
 	<match target="scan">
-		<test name="family">
+		<test name="family" compare="eq" ignore-blanks="true">
 			<string>Titr</string>
 		</test>
 		<edit name="foundry">
diff --git a/conf.d/80-delicious.conf b/conf.d/80-delicious.conf
index 728f50c..845647b 100644
--- a/conf.d/80-delicious.conf
+++ b/conf.d/80-delicious.conf
@@ -5,7 +5,7 @@
 
 <!-- Delicious 'heavy' variant says its Medium weight -->
 <match target="scan">
-	<test name="family">
+	<test name="family" compare="eq" ignore-blanks="true">
 		<string>Delicious</string>
 	</test>
 	<test name="style">