[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 conf.d/40-nonlatin.conf      |   37 +++++++++++++++++++++++++++++++++++++
 conf.d/65-fonts-persian.conf |   24 ++++++++++++++++++++----
 2 files changed, 57 insertions(+), 4 deletions(-)

New commits:
commit a572f547fd46bf169b617108552ab0fa280f4813
Author: Behdad Esfahbod <freedesktop at behdad.org>
Date:   Sat May 24 15:48:00 2008 -0700

    Persian conf update. (bug 16066).

diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
index 3d10d05..a875db0 100644
--- a/conf.d/40-nonlatin.conf
+++ b/conf.d/40-nonlatin.conf
@@ -10,6 +10,14 @@
   Serif faces
  -->
 	<alias>
+		<family>Nazli</family>
+		<family>Lotoos</family>
+		<family>Mitra</family>
+		<family>Ferdosi</family>
+		<family>Badr</family>
+		<family>Zar</family>
+		<family>Titr</family>
+		<family>Jadid</family>
 		<family>Kochi Mincho</family>
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
@@ -27,6 +35,14 @@
   Sans-serif faces
  -->
 	<alias>
+		<family>Arshia</family>
+		<family>Elham</family>
+		<family>Farnaz</family>
+		<family>Nasim</family>
+		<family>Sina</family>
+		<family>Roya</family>
+		<family>Koodak</family>
+		<family>Terafik</family>
 		<family>Kochi Gothic</family>
 		<family>AR PL KaitiM GB</family>
 		<family>AR PL KaitiM Big5</family>
@@ -50,4 +66,25 @@
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
+
+<!--
+  Fantasy faces
+ -->
+	<alias>
+		<family>Homa</family>
+		<family>Kamran</family>
+		<family>Fantezi</family>
+		<family>Tabassom</family>
+		<default><family>fantasy</family></default>
+	</alias>
+
+<!--
+  Cursive faces
+ -->
+	<alias>
+		<family>IranNastaliq</family>
+		<family>Nafees Nastaleeq</family>
+		<default><family>cursive</family></default>
+	</alias>
+
 </fontconfig>
diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf
index 1a4a3ff..97b783e 100644
--- a/conf.d/65-fonts-persian.conf
+++ b/conf.d/65-fonts-persian.conf
@@ -28,10 +28,7 @@
     2005-04-03  Behdad Esfahbod:  Initial revision.
     2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
     2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
-
-  Todo:
-    Add generic font "fantasy".  Add some fonts into that category.
-    Maybe add a "cursive" generic font.
+    2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
   -->
 <fontconfig>
 
@@ -337,6 +334,25 @@
 		</accept>
 	</alias>
 
+	<!-- Persian fantasy fonts -->
+	<alias>
+		<family>fantasy</family>
+		<accept>
+			<family>Homa</family>
+			<family>Kamran</family>
+			<family>Fantezi</family>
+			<family>Tabassom</family>
+		</accept>
+	</alias>
+
+	<!-- Persian (and Urdu) Nastaliq/cursive fonts -->
+	<alias>
+		<family>cursive</family>
+		<accept>
+			<family>IranNastaliq</family>
+			<family>Nafees Nastaleeq</family>
+		</accept>
+	</alias>
 
 <!-- Use Titr in titles -->