From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 26 Oct 2007 06:02:19 +0000 (-0400)
Subject: Port fonts-persian.conf to new alias syntax with binding="same"
X-Git-Tag: 2.4.92~37
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d0e2a0f3a37ace2d5de6f18e7871a8efaf6580c2;p=fontconfig.git

Port fonts-persian.conf to new alias syntax with binding="same"

Signed-off-by: Keith Packard <keithp@koto.keithp.com>
---

diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf
index e30c4d9..c897554 100644
--- a/conf.d/65-fonts-persian.conf
+++ b/conf.d/65-fonts-persian.conf
@@ -37,285 +37,150 @@
 <fontconfig>
 
 
-<!--
-  We don't want weak bindings.  So got to use the syntactical expansion
-  of alias tag to do binding=same :(.  Please support that in alias.
-  -->
-
-
 <!-- Deprecated fonts are discouraged -->
 
 	<!-- Nesf[2] is officially deprecated and has problematic tables -->
-	<match>
-		<test name="family">
-			<string>Nesf</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nesf2</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nesf2</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match>
-
-	<!-- Tahoma looks awful (TURNED-OFF) -->
-	<!--match>
-		<test name="family">
-			<string>Tahoma</string>
-		</test>
-		<edit name="family" mode="prepend" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match-->
+        <alias binding="same">
+          <family>Nesf</family>
+          <accept><family>Nesf2</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Nesf2</family>
+          <accept><family>Persian_sansserif_default</family></accept>
+        </alias>
 
 <!-- Name changes and spelling variant aliases -->
 
-	<!-- Changed due to trademark problems -->
-	<match>
-		<test name="family">
-			<string>Nazanin</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nazli</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Lotus</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Lotoos</string>
-		</edit>
-	</match>
-
-	<!-- Changed due to transcription orthography -->
-	<match>
-		<test name="family">
-			<string>Yaqut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yagut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yaghut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Traffic</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Terafik</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Ferdowsi</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Ferdosi</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezy</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Fantezi</string>
-		</edit>
-	</match>
+        <alias binding="same">
+          <family>Nazanin</family>
+          <accept><family>Nazli</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Lotus</family>
+          <accept><family>Lotoos</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Yaqut</family>
+          <accept><family>Yaghoot</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Yaghut</family>
+          <accept><family>Yaghoot</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Traffic</family>
+          <accept><family>Terafik</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Ferdowsi</family>
+          <accept><family>Ferdosi</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Fantezy</family>
+          <accept><family>Fantezi</family></accept>
+        </alias>
 
 
 <!-- Classify fonts. -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Jadid</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
+        <alias binding="same">
+          <family>Jadid</family>
+          <accept><family>Persian_title</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Titr</family>
+          <accept><family>Persian_title</family></accept>
+        </alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Kamran</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezi</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Tabassom</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
+        <alias binding="same">
+          <family>Kamran</family>
+          <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Homa</family>
+	  </accept>
+        </alias>
+        <alias binding="same">
+          <family>Homa</family>
+          <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Kamran</family>
+	  </accept>
+        </alias>
+        <alias binding="same">
+          <family>Fantezi</family>
+          <accept><family>Persian_fantasy</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Tabassom</family>
+          <accept><family>Persian_fantasy</family></accept>
+        </alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Arshia</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nasim</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Farnaz</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Sina</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
+        <alias binding="same">
+          <family>Arshia</family>
+          <accept><family>Persian_square</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Nasim</family>
+          <accept><family>Persian_square</family></accept>
+        </alias>
+        <alias binding="same">
+          <family>Elham</family>
+          <accept>
+	  <family>Persian_square</family>
+	  <family>Farnaz</family>
+	  </accept>
+        </alias>
+        <alias binding="same">
+	  <family>Farnaz</family>
+          <accept>
+	  <family>Persian_square</family>
+          <family>Elham</family>
+	  </accept>
+        </alias>
+        <alias binding="same">
+          <family>Sina</family>
+          <accept><family>Persian_square</family></accept>
+        </alias>
 
 <!-- Font ordering per class -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Persian_title</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Jadid</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
+        <alias binding="same">
+	  <family>Persian_title</family>
+          <accept>
+	  <family>Titr</family>
+	  <family>Jadid</family>
+          <family>Persian_serif</family>
+	  </accept>
+        </alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Persian_fantasy</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Tabassom</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Fantezi</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-	</match>
+        <alias binding="same">
+	  <family>Persian_fantasy</family>
+          <accept>
+	  <family>Homa</family>
+	  <family>Kamran</family>
+	  <family>Fantezi</family>
+	  <family>Tabassom</family>
+          <family>Persian_square</family>
+	  </accept>
+        </alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Persian_square</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Sina</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Nasim</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Arshia</string>
-		</edit>
-	</match>
+        <alias binding="same">
+	  <family>Persian_square</family>
+          <accept>
+	  <family>Arshia</family>
+	  <family>Elham</family>
+	  <family>Farnaz</family>
+	  <family>Nasim</family>
+	  <family>Sina</family>
+          <family>Persian_serif</family>
+	  </accept>
+        </alias>
 
 <!-- Register the fonts that we actually do have -->