Bug 44826 - <alias> must contain only a single <family>

Fix invalid syntax around alias elements in 30-metric-aliases.conf
40-nonlatin.conf and 45-latin.conf.

Patch from lolilolicon

3 files changed, 271 insertions, 1 deletions

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index 702a495..4202ae9 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -76,7 +76,19 @@
 	<!-- Microsoft -->
 	<alias binding="same">
 	  <family>Liberation Sans</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Albany</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Albany AMT</family>
 	  <default>
 	  <family>Arial</family>
@@ -85,7 +97,19 @@
 
 	<alias binding="same">
 	  <family>Liberation Serif</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Thorndale</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Thorndale AMT</family>
 	  <default>
 	  <family>Times New Roman</family>
@@ -94,7 +118,19 @@
 
 	<alias binding="same">
 	  <family>Liberation Mono</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Cumberland</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Cumberland AMT</family>
 	  <default>
 	  <family>Courier New</family>
diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
index 00f2707..1208a6e 100644
--- a/conf.d/40-nonlatin.conf
+++ b/conf.d/40-nonlatin.conf
@@ -11,24 +11,81 @@
  -->
 	<alias>
 		<family>Nazli</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Lotoos</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Mitra</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Ferdosi</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Badr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Zar</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Titr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Jadid</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Kochi Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL SungtiL GB</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL Mingti2L Big5</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>ＭＳ 明朝</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>NanumMyeongjo</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>UnBatang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Baekmuk Batang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>MgOpen Canonica</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Sazanami Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ZenKai Uni</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>FreeSerif</family>
 		<default><family>serif</family></default>
 	</alias>
@@ -37,35 +94,104 @@
  -->
 	<alias>
 		<family>Arshia</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Elham</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Farnaz</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Nasim</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Sina</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Roya</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Koodak</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Terafik</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Kochi Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL KaitiM GB</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL KaitiM Big5</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>ＭＳ ゴシック</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>NanumGothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>UnDotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Baekmuk Dotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>SimSun</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>MgOpen Modata</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Sazanami Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>FreeSans</family>
 		<default><family>sans-serif</family></default>
 	</alias>
 <!--
   Monospace faces
  -->
- 	<alias>
+	<alias>
 		<family>NSimSun</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>ZYSong18030</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>NanumGothicCoding</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
@@ -75,8 +201,17 @@
  -->
 	<alias>
 		<family>Homa</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Kamran</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Fantezi</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Tabassom</family>
 		<default><family>fantasy</family></default>
 	</alias>
@@ -86,6 +221,9 @@
  -->
 	<alias>
 		<family>IranNastaliq</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
 		<family>Nafees Nastaleeq</family>
 		<default><family>cursive</family></default>
 	</alias>
diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
index 7e41264..09fd526 100644
--- a/conf.d/45-latin.conf
+++ b/conf.d/45-latin.conf
@@ -11,13 +11,37 @@
  -->
 	<alias>
 		<family>Bitstream Vera Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>DejaVu Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Liberation Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Times New Roman</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Times</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Nimbus Roman No9 L</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Luxi Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Thorndale AMT</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>Thorndale</family>
 		<default><family>serif</family></default>
 	</alias>
@@ -26,14 +50,41 @@
  -->
 	<alias>
 		<family>Bitstream Vera Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>DejaVu Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Liberation Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Arial</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Helvetica</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Verdana</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Albany AMT</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Albany</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Nimbus Sans L</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
 		<family>Luxi Sans</family>
 		<default><family>sans-serif</family></default>
 	</alias>
@@ -42,15 +93,45 @@
  -->
  	<alias>
 		<family>Bitstream Vera Sans Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>DejaVu Sans Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Liberation Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Inconsolata</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Courier New</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Courier</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Andale Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Luxi Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Cumberland AMT</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Cumberland</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>Nimbus Mono L</family>
 		<default><family>monospace</family></default>
 	</alias>
@@ -59,8 +140,17 @@
  -->
  	<alias>
 		<family>Impact</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Copperplate Gothic Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Cooper Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
 		<family>Bauhaus Std</family>
 		<default><family>fantasy</family></default>
 	</alias>
@@ -69,7 +159,13 @@
   -->
 	<alias>
 		<family>ITC Zapf Chancery Std</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
 		<family>Zapfino</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
 		<family>Comic Sans MS</family>
 		<default><family>cursive</family></default>
 	</alias>