Fontconfig - Sep 2006 - fontconfig: Branch ''master'' - 14 commits

Makefile.am                          |    2 
 conf.avail/10-urw-aliases.conf       |   47 +++++++++++
 conf.avail/15-amt-aliases.conf       |   16 ++++
 conf.avail/20-fix-globaladvance.conf |   24 ++++++
 conf.avail/30-unhint-small-vera.conf |   44 +++++++++++
 conf.avail/50-user.conf              |    7 +
 conf.avail/51-local.conf             |    7 +
 conf.avail/70-sub-pixel-bgr.conf     |    2 
 conf.avail/70-sub-pixel-vbgr.conf    |    2 
 conf.avail/70-sub-pixel-vrgb.conf    |    2 
 conf.avail/Makefile.am               |   49 ++++++++++++
 conf.d/Makefile.am                   |   34 +++++---
 configure.in                         |    1 
 fonts.conf.in                        |  139 -----------------------------------
 src/fccache.c                        |   17 +++-
 15 files changed, 236 insertions(+), 157 deletions(-)

New commits:
diff-tree 49b44b277f2a8a67009a3b68b178b2f1a4c7f72a (from
766a9b2f61458202be0fbf5745ce1e02ecd95c6e)
Author: Keith Packard <keithp@neko.keithp.com>
Date:   Sat Sep 9 16:41:58 2006 -0700

    Insert newly created caches into reference data structure.
    
    All caches used in the application must be in the cache reference list so
    internal references can be tracked correctly. Failing to have newly created
    caches in the list would cause the cache to be deallocated while references
    were still present.

diff --git a/src/fccache.c b/src/fccache.c
index 11f88a7..e289c5d 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -275,9 +275,18 @@ FcCacheInsert (FcCache *cache, struct st
     s->cache = cache;
     s->size = cache->size;
     s->ref = 1;
-    s->cache_dev = cache_stat->st_dev;
-    s->cache_ino = cache_stat->st_ino;
-    s->cache_mtime = cache_stat->st_mtime;
+    if (cache_stat)
+    {
+	s->cache_dev = cache_stat->st_dev;
+	s->cache_ino = cache_stat->st_ino;
+	s->cache_mtime = cache_stat->st_mtime;
+    }
+    else
+    {
+	s->cache_dev = 0;
+	s->cache_ino = 0;
+	s->cache_mtime = 0;
+    }
     
     /*
      * Insert into all fcCacheChains
@@ -658,6 +667,8 @@ FcDirCacheBuild (FcFontSet *set, const F
 
     FcSerializeDestroy (serialize);
     
+    FcCacheInsert (cache, NULL);
+
     return cache;
 
 bail2:
diff-tree 766a9b2f61458202be0fbf5745ce1e02ecd95c6e (from parents)
Merge: 5d2f7a9d9224d4df1655cd1d6fd72646734b0272
164e267d286eccbbdde69e8935a658dced4331b4
Author: Keith Packard <keithp@neko.keithp.com>
Date:   Sat Sep 9 15:49:24 2006 -0700

    Merge branch ''jhcloos''

diff-tree 164e267d286eccbbdde69e8935a658dced4331b4 (from
469010c1bdd5cc8801405ef809540bd4b17f41c1)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Sat Sep 9 01:24:08 2006 -0400

    Make conf.avail and conf.d work
    
    Add conf.avail to configure.in
    
    Add install: target to conf.d/Makefile.am to
    create the initial symlinks to conf.avail

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
new file mode 100644
index 0000000..85d7135
--- /dev/null
+++ b/conf.d/Makefile.am
@@ -0,0 +1,52 @@
+# 
+#  $Id$
+# 
+#  Copyright © 2005 Keith Packard
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+CONF_LINKS = \
+	10-urw-aliases.conf \
+	15-amt-aliases.conf \
+	20-fix-globaladvance.conf \
+	30-unhint-small-vera.conf \
+	50-user.conf \
+	51-local.conf \
+	60-LohitGujarati.conf \
+	60-delicious.conf \
+	60-fonts-persian.conf
+
+EXTRA_DIST = $(CONF_LINKS)
+
+configdir=$(CONFDIR)
+confddir=$(configdir)/conf.d
+
+install:
+	mkdir -p ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/10-urw-aliases.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/15-amt-aliases.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/20-fix-globaladvance.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/30-unhint-small-vera.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/50-user.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/51-local.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-LohitGujarati.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-delicious.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-fonts-persian.conf ${DESTDIR}/${confddir}
+
+
diff --git a/configure.in b/configure.in
index e8e1062..5a6309d 100644
--- a/configure.in
+++ b/configure.in
@@ -560,6 +560,7 @@ fc-case/Makefile
 fc-arch/Makefile
 src/Makefile
 src/fontconfig.def
+conf.avail/Makefile
 conf.d/Makefile
 fc-cache/Makefile
 fc-cat/Makefile
diff-tree 469010c1bdd5cc8801405ef809540bd4b17f41c1 (from
c3425fa671663b11aa5288a0b52a0618c5d075ef)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:57:19 2006 -0400

    Update Makefile.am files

diff --git a/Makefile.am b/Makefile.am
index 3b31bd4..a7a6015 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 
 DOCSRC=@DOCSRC@
 SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-	fc-cache fc-cat fc-list fc-match conf.avail $(DOCSRC) test
+	fc-cache fc-cat fc-list fc-match conf.avail conf.d $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am
index bfba74b..a999dd6 100644
--- a/conf.avail/Makefile.am
+++ b/conf.avail/Makefile.am
@@ -22,22 +22,28 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 CONF_FILES = \
-	10-LohitGujarati.conf \
-	10-fonts-persian.conf \
-	33-autohint.conf \
-	33-unhinted.conf \
-	30-no-sub-pixel.conf \
-	30-sub-pixel-rgb.conf \
-	30-sub-pixel-bgr.conf \
-	30-sub-pixel-vrgb.conf \
-	30-sub-pixel-vbgr.conf \
-	36-no-bitmaps.conf \
-	36-yes-bitmaps.conf \
-	60-delicious.conf
+	10-urw-aliases.conf \
+	15-amt-aliases.conf \
+	20-fix-globaladvance.conf \
+	30-unhint-small-vera.conf \
+	50-user.conf \
+	51-local.conf \
+	60-LohitGujarati.conf \
+	60-delicious.conf \
+	60-fonts-persian.conf \
+	70-no-sub-pixel.conf \
+	70-sub-pixel-bgr.conf \
+	70-sub-pixel-rgb.conf \
+	70-sub-pixel-vbgr.conf \
+	70-sub-pixel-vrgb.conf \
+	73-autohint.conf \
+	73-unhinted.conf \
+	76-no-bitmaps.conf \
+	76-yes-bitmaps.conf
 
 EXTRA_DIST = $(CONF_FILES)
 
 configdir=$(CONFDIR)
-confddir=$(configdir)/conf.avail
+confavaildir=$(configdir)/conf.avail
 
-confd_DATA=$(CONF_FILES)
+confavail_DATA=$(CONF_FILES)
diff-tree c3425fa671663b11aa5288a0b52a0618c5d075ef (from
60018915891bd146271b687278782fe38b4c4461)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:47:52 2006 -0400

    Move some section from fonts.conf into conf.avail files
    
    URL aliases, AMT aliases, Che globaladvance fixes and Vera <8pt unhinting
    sections all moved into conf.avail, to load before user and local confs.

diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf
new file mode 100644
index 0000000..23cbc09
--- /dev/null
+++ b/conf.avail/10-urw-aliases.conf
@@ -0,0 +1,47 @@
+<!--
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  -->
+        <alias>
+          <family>Avant Garde</family>
+          <accept><family>URW Gothic
L</family></accept>
+        </alias>
+        <alias>
+          <family>Bookman</family>
+          <accept><family>URW Bookman
L</family></accept>
+        </alias>
+        <alias>
+	  <family>Courier</family>
+	  <accept><family>Nimbus Mono L</family></accept>
+	</alias>
+        <alias>
+	  <family>Helvetica</family>
+	  <accept><family>Nimbus Sans L</family></accept>
+	</alias>
+        <alias>
+          <family>New Century Schoolbook</family>
+          <accept><family>Century Schoolbook
L</family></accept>
+        </alias>
+        <alias>
+          <family>Palatino</family>
+          <accept><family>URW Palladio
L</family></accept>
+        </alias>
+        <alias>
+	  <family>Times</family>
+	  <accept><family>Nimbus Roman No9 L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Chancery</family>
+	  <accept><family>URW Chancery L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Dingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
+	<match target="pattern">
+	  <test name="family">
+	    <string>Symbol</string>
+	  </test>
+	  <edit name="family" mode="append"
binding="strong">
+	    <string>Standard Symbols L</string>
+	  </edit>
+	</match>
diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf
new file mode 100644
index 0000000..ba73638
--- /dev/null
+++ b/conf.avail/15-amt-aliases.conf
@@ -0,0 +1,16 @@
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ 	<alias>
+		<family>Times New Roman</family>
+		<accept><family>Thorndale AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Arial</family>
+		<accept><family>Albany AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Courier New</family>
+		<accept><family>Cumberland AMT</family></accept>
+	</alias>
diff --git a/conf.avail/20-fix-globaladvance.conf
b/conf.avail/20-fix-globaladvance.conf
new file mode 100644
index 0000000..8d76d32
--- /dev/null
+++ b/conf.avail/20-fix-globaladvance.conf
@@ -0,0 +1,24 @@
+<!--
+  Some Asian fonts misadvertise themselves as monospaced when
+  in fact they are dual-spaced (half and full).  This makes
+  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>
+		<edit
name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test
name="family"><string>DotumChe</string></test>
+		<edit
name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test
name="family"><string>BatangChe</string></test>
+		<edit
name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test
name="family"><string>GungsuhChe</string></test>
+		<edit
name="globaladvance"><bool>false</bool></edit>
+	</match>
diff --git a/conf.avail/30-unhint-small-vera.conf
b/conf.avail/30-unhint-small-vera.conf
new file mode 100644
index 0000000..245580f
--- /dev/null
+++ b/conf.avail/30-unhint-small-vera.conf
@@ -0,0 +1,44 @@
+<!-- 
+	The Bitstream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints.  The initial Vera release
+	didn''t include the right instructions in the ''prep''
table. Fix this
+	by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Sans</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Serif</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Sans Mono</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
diff --git a/fonts.conf.in b/fonts.conf.in
index 343df79..d70800e 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -150,139 +150,6 @@
 	</match>
 
 <!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
-  -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic
L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman
L</family></accept>
-        </alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
-	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
-	</alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook
L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio
L</family></accept>
-        </alias>
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Dingbats</family>
-	  <accept><family>Dingbats</family></accept>
-	</alias>
-	<match target="pattern">
-	  <test name="family">
-	    <string>Symbol</string>
-	  </test>
-	  <edit name="family" mode="append"
binding="strong">
-	    <string>Standard Symbols L</string>
-	  </edit>
-	</match>
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- 	<alias>
-		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Courier New</family>
-		<accept><family>Cumberland AMT</family></accept>
-	</alias>
- 
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  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>
-		<edit
name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test
name="family"><string>DotumChe</string></test>
-		<edit
name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test
name="family"><string>BatangChe</string></test>
-		<edit
name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test
name="family"><string>GungsuhChe</string></test>
-		<edit
name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-<!-- 
-	The Bitstream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn''t include the right instructions in the ''prep''
table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
   Load local system customization file
 -->
 	<include ignore_missing="yes">conf.d</include>
diff-tree 60018915891bd146271b687278782fe38b4c4461 (from
31f8061b5d0a60f497eaafe6d38006ae71e53163)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:45:28 2006 -0400

    Re-order old conf.d files
    
    Make sure they continue to load after ~/.fonts.conf and local.conf

diff --git a/conf.avail/20-LohitGujarati.conf b/conf.avail/20-LohitGujarati.conf
deleted file mode 100644
index eb51f86..0000000
--- a/conf.avail/20-LohitGujarati.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Available Gujarti fonts look much better without hinting -->
-<match target="font">
-	<test name="family"><string>Lohit
Gujarati</string></test>
-	<edit
name="hinting"><bool>false</bool></edit>
-</match>
\ No newline at end of file
diff --git a/conf.avail/20-fonts-persian.conf b/conf.avail/20-fonts-persian.conf
deleted file mode 100644
index e30c4d9..0000000
--- a/conf.avail/20-fonts-persian.conf
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
-<!--
-  fonts-persian.conf
-  To configure Persian fonts from The FarsiWeb Project.
-
-  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-
-  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-
-  ChangeLog:
-    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.
-  -->
-<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-->
-
-<!-- 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>
-
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- Register the fonts that we actually do have -->
-
-	<match target="font">
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Koodak</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Nazli</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Roya</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Terafik</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-
-<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
-
-	<match target="font">
-		<test name="foundry">
-			<!--string>farsiweb</string-->
-			<string>TURNED-OFF</string>
-		</test>
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant"
compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-			
<matrix><double>1</double><double>-0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-
-<!--
-  We can''t hint our fonts well, so turn off hinting.
-  Moreover, the bitmaps we have designed (well, they
-  have designed), suck, so disable them too.
-  -->
-
-	<match target="font">
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
- 		<edit name="embeddedbitmap">
- 			<bool>false</bool>
- 		</edit>
-	</match>
-
-
-<!-- Alias our fonts to common families -->
-
-	<!-- Persian serif fonts -->
-	<alias>
-		<family>serif</family>
-		<accept>
-			<family>Nazli</family>
-			<family>Lotoos</family>
-			<family>Mitra</family>
-			<family>Ferdosi</family>
-			<family>Badr</family>
-			<family>Zar</family>
-		</accept>
-	</alias>
-
-	<!-- Persian sans-serif fonts -->
-	<alias>
-		<family>sans-serif</family>
-		<accept>
-			<family>Roya</family>
-			<family>Koodak</family>
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian monospace fonts -->
-	<alias>
-		<family>monospace</family>
-		<accept>
-			<!-- Not really monospace -->
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-
-<!-- Use Titr in titles -->
-
-	<!-- Both serif... -->
-	<match>
-		<test name="family">
-			<string>serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and sans-serif. -->
-	<match>
-		<test name="family">
-			<string>sans-serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and more. -->
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend"
binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-
-<!-- Default substituted for deprecated sans-serif fonts -->
-
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<edit name="family" mode="assign"
binding="same">
-			<string>Roya</string>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/conf.avail/30-no-sub-pixel.conf b/conf.avail/30-no-sub-pixel.conf
deleted file mode 100644
index 5d64a0b..0000000
--- a/conf.avail/30-no-sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>none</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/30-sub-pixel-bgr.conf b/conf.avail/30-sub-pixel-bgr.conf
deleted file mode 100644
index 2aba95e..0000000
--- a/conf.avail/30-sub-pixel-bgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>bgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/30-sub-pixel-rgb.conf b/conf.avail/30-sub-pixel-rgb.conf
deleted file mode 100644
index c4e8a42..0000000
--- a/conf.avail/30-sub-pixel-rgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/30-sub-pixel-vbgr.conf
b/conf.avail/30-sub-pixel-vbgr.conf
deleted file mode 100644
index 0cdad2a..0000000
--- a/conf.avail/30-sub-pixel-vbgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>vbgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/30-sub-pixel-vrgb.conf
b/conf.avail/30-sub-pixel-vrgb.conf
deleted file mode 100644
index 60239e0..0000000
--- a/conf.avail/30-sub-pixel-vrgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>vrgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/33-autohint.conf b/conf.avail/33-autohint.conf
deleted file mode 100644
index 5406f4e..0000000
--- a/conf.avail/33-autohint.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
-<fontconfig>
-<!--  Use the Autohinter --> 
-  <match target="font">
-    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/33-unhinted.conf b/conf.avail/33-unhinted.conf
deleted file mode 100644
index fb0b375..0000000
--- a/conf.avail/33-unhinted.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
-<fontconfig>
-<!--  Disable hinting --> 
-  <match target="font">
-    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/36-no-bitmaps.conf b/conf.avail/36-no-bitmaps.conf
deleted file mode 100644
index e8fb6a9..0000000
--- a/conf.avail/36-no-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
-<fontconfig>
-<!-- Reject bitmap fonts -->
- <selectfont>
-  <rejectfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </rejectfont>
- </selectfont>
-</fontconfig>
diff --git a/conf.avail/36-yes-bitmaps.conf b/conf.avail/36-yes-bitmaps.conf
deleted file mode 100644
index c539c70..0000000
--- a/conf.avail/36-yes-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
-<fontconfig>
-<!-- Accept bitmap fonts -->
- <selectfont>
-  <acceptfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </acceptfont>
- </selectfont>
-</fontconfig>
diff --git a/conf.avail/60-LohitGujarati.conf b/conf.avail/60-LohitGujarati.conf
new file mode 100644
index 0000000..eb51f86
--- /dev/null
+++ b/conf.avail/60-LohitGujarati.conf
@@ -0,0 +1,5 @@
+<!-- Available Gujarti fonts look much better without hinting -->
+<match target="font">
+	<test name="family"><string>Lohit
Gujarati</string></test>
+	<edit
name="hinting"><bool>false</bool></edit>
+</match>
\ No newline at end of file
diff --git a/conf.avail/60-fonts-persian.conf b/conf.avail/60-fonts-persian.conf
new file mode 100644
index 0000000..e30c4d9
--- /dev/null
+++ b/conf.avail/60-fonts-persian.conf
@@ -0,0 +1,539 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
+<!--
+  fonts-persian.conf
+  To configure Persian fonts from The FarsiWeb Project.
+
+  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+
+  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+  ChangeLog:
+    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.
+  -->
+<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-->
+
+<!-- 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>
+
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- Register the fonts that we actually do have -->
+
+	<match target="font">
+		<test name="family">
+			<string>Elham</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Homa</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Koodak</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Nazli</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Roya</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Terafik</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Titr</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+
+<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
+
+	<match target="font">
+		<test name="foundry">
+			<!--string>farsiweb</string-->
+			<string>TURNED-OFF</string>
+		</test>
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<!-- check to see if the font is roman -->
+		<test name="slant">
+			<const>roman</const>
+		</test>
+		<!-- check to see if the pattern requested non-roman -->
+		<test target="pattern" name="slant"
compare="not_eq">
+			<const>roman</const>
+		</test>
+		<!-- multiply the matrix to slant the font -->
+		<edit name="matrix" mode="assign">
+			<times>
+				<name>matrix</name>
+			
<matrix><double>1</double><double>-0.2</double>
+					<double>0</double><double>1</double>
+				</matrix>
+			</times>
+		</edit>
+		<!-- pretend the font is oblique now -->
+		<edit name="slant" mode="assign">
+			<const>oblique</const>
+		</edit>
+	</match>
+
+
+<!--
+  We can''t hint our fonts well, so turn off hinting.
+  Moreover, the bitmaps we have designed (well, they
+  have designed), suck, so disable them too.
+  -->
+
+	<match target="font">
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+ 		<edit name="embeddedbitmap">
+ 			<bool>false</bool>
+ 		</edit>
+	</match>
+
+
+<!-- Alias our fonts to common families -->
+
+	<!-- Persian serif fonts -->
+	<alias>
+		<family>serif</family>
+		<accept>
+			<family>Nazli</family>
+			<family>Lotoos</family>
+			<family>Mitra</family>
+			<family>Ferdosi</family>
+			<family>Badr</family>
+			<family>Zar</family>
+		</accept>
+	</alias>
+
+	<!-- Persian sans-serif fonts -->
+	<alias>
+		<family>sans-serif</family>
+		<accept>
+			<family>Roya</family>
+			<family>Koodak</family>
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+	<!-- Persian monospace fonts -->
+	<alias>
+		<family>monospace</family>
+		<accept>
+			<!-- Not really monospace -->
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+
+<!-- Use Titr in titles -->
+
+	<!-- Both serif... -->
+	<match>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and sans-serif. -->
+	<match>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and more. -->
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend"
binding="same">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+
+<!-- Default substituted for deprecated sans-serif fonts -->
+
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<edit name="family" mode="assign"
binding="same">
+			<string>Roya</string>
+		</edit>
+	</match>
+
+</fontconfig>
diff --git a/conf.avail/70-no-sub-pixel.conf b/conf.avail/70-no-sub-pixel.conf
new file mode 100644
index 0000000..5d64a0b
--- /dev/null
+++ b/conf.avail/70-no-sub-pixel.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>none</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/70-sub-pixel-bgr.conf b/conf.avail/70-sub-pixel-bgr.conf
new file mode 100644
index 0000000..2aba95e
--- /dev/null
+++ b/conf.avail/70-sub-pixel-bgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>bgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/70-sub-pixel-rgb.conf b/conf.avail/70-sub-pixel-rgb.conf
new file mode 100644
index 0000000..c4e8a42
--- /dev/null
+++ b/conf.avail/70-sub-pixel-rgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/70-sub-pixel-vbgr.conf
b/conf.avail/70-sub-pixel-vbgr.conf
new file mode 100644
index 0000000..0cdad2a
--- /dev/null
+++ b/conf.avail/70-sub-pixel-vbgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vbgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/70-sub-pixel-vrgb.conf
b/conf.avail/70-sub-pixel-vrgb.conf
new file mode 100644
index 0000000..60239e0
--- /dev/null
+++ b/conf.avail/70-sub-pixel-vrgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vrgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/73-autohint.conf b/conf.avail/73-autohint.conf
new file mode 100644
index 0000000..5406f4e
--- /dev/null
+++ b/conf.avail/73-autohint.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/autohint.conf -->
+<fontconfig>
+<!--  Use the Autohinter --> 
+  <match target="font">
+    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/73-unhinted.conf b/conf.avail/73-unhinted.conf
new file mode 100644
index 0000000..fb0b375
--- /dev/null
+++ b/conf.avail/73-unhinted.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/unhinted.conf -->
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="font">
+    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/76-no-bitmaps.conf b/conf.avail/76-no-bitmaps.conf
new file mode 100644
index 0000000..e8fb6a9
--- /dev/null
+++ b/conf.avail/76-no-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
+<fontconfig>
+<!-- Reject bitmap fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.avail/76-yes-bitmaps.conf b/conf.avail/76-yes-bitmaps.conf
new file mode 100644
index 0000000..c539c70
--- /dev/null
+++ b/conf.avail/76-yes-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/yes-bitmaps.conf -->
+<fontconfig>
+<!-- Accept bitmap fonts -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>
diff-tree 31f8061b5d0a60f497eaafe6d38006ae71e53163 (from
d55620c90676951fc70ec9430c2670edca2147cb)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:36:46 2006 -0400

    Make room for chunks from fonts.conf in conf.avail

diff --git a/conf.avail/10-LohitGujarati.conf b/conf.avail/10-LohitGujarati.conf
deleted file mode 100644
index eb51f86..0000000
--- a/conf.avail/10-LohitGujarati.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Available Gujarti fonts look much better without hinting -->
-<match target="font">
-	<test name="family"><string>Lohit
Gujarati</string></test>
-	<edit
name="hinting"><bool>false</bool></edit>
-</match>
\ No newline at end of file
diff --git a/conf.avail/10-fonts-persian.conf b/conf.avail/10-fonts-persian.conf
deleted file mode 100644
index e30c4d9..0000000
--- a/conf.avail/10-fonts-persian.conf
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
-<!--
-  fonts-persian.conf
-  To configure Persian fonts from The FarsiWeb Project.
-
-  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-
-  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-
-  ChangeLog:
-    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.
-  -->
-<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-->
-
-<!-- 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>
-
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- Register the fonts that we actually do have -->
-
-	<match target="font">
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Koodak</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Nazli</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Roya</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Terafik</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-
-<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
-
-	<match target="font">
-		<test name="foundry">
-			<!--string>farsiweb</string-->
-			<string>TURNED-OFF</string>
-		</test>
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant"
compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-			
<matrix><double>1</double><double>-0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-
-<!--
-  We can''t hint our fonts well, so turn off hinting.
-  Moreover, the bitmaps we have designed (well, they
-  have designed), suck, so disable them too.
-  -->
-
-	<match target="font">
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
- 		<edit name="embeddedbitmap">
- 			<bool>false</bool>
- 		</edit>
-	</match>
-
-
-<!-- Alias our fonts to common families -->
-
-	<!-- Persian serif fonts -->
-	<alias>
-		<family>serif</family>
-		<accept>
-			<family>Nazli</family>
-			<family>Lotoos</family>
-			<family>Mitra</family>
-			<family>Ferdosi</family>
-			<family>Badr</family>
-			<family>Zar</family>
-		</accept>
-	</alias>
-
-	<!-- Persian sans-serif fonts -->
-	<alias>
-		<family>sans-serif</family>
-		<accept>
-			<family>Roya</family>
-			<family>Koodak</family>
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian monospace fonts -->
-	<alias>
-		<family>monospace</family>
-		<accept>
-			<!-- Not really monospace -->
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-
-<!-- Use Titr in titles -->
-
-	<!-- Both serif... -->
-	<match>
-		<test name="family">
-			<string>serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and sans-serif. -->
-	<match>
-		<test name="family">
-			<string>sans-serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and more. -->
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend"
binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-
-<!-- Default substituted for deprecated sans-serif fonts -->
-
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<edit name="family" mode="assign"
binding="same">
-			<string>Roya</string>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/conf.avail/20-LohitGujarati.conf b/conf.avail/20-LohitGujarati.conf
new file mode 100644
index 0000000..eb51f86
--- /dev/null
+++ b/conf.avail/20-LohitGujarati.conf
@@ -0,0 +1,5 @@
+<!-- Available Gujarti fonts look much better without hinting -->
+<match target="font">
+	<test name="family"><string>Lohit
Gujarati</string></test>
+	<edit
name="hinting"><bool>false</bool></edit>
+</match>
\ No newline at end of file
diff --git a/conf.avail/20-fonts-persian.conf b/conf.avail/20-fonts-persian.conf
new file mode 100644
index 0000000..e30c4d9
--- /dev/null
+++ b/conf.avail/20-fonts-persian.conf
@@ -0,0 +1,539 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
+<!--
+  fonts-persian.conf
+  To configure Persian fonts from The FarsiWeb Project.
+
+  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+
+  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+  ChangeLog:
+    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.
+  -->
+<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-->
+
+<!-- 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>
+
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- Register the fonts that we actually do have -->
+
+	<match target="font">
+		<test name="family">
+			<string>Elham</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Homa</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Koodak</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Nazli</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Roya</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Terafik</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Titr</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+
+<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
+
+	<match target="font">
+		<test name="foundry">
+			<!--string>farsiweb</string-->
+			<string>TURNED-OFF</string>
+		</test>
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<!-- check to see if the font is roman -->
+		<test name="slant">
+			<const>roman</const>
+		</test>
+		<!-- check to see if the pattern requested non-roman -->
+		<test target="pattern" name="slant"
compare="not_eq">
+			<const>roman</const>
+		</test>
+		<!-- multiply the matrix to slant the font -->
+		<edit name="matrix" mode="assign">
+			<times>
+				<name>matrix</name>
+			
<matrix><double>1</double><double>-0.2</double>
+					<double>0</double><double>1</double>
+				</matrix>
+			</times>
+		</edit>
+		<!-- pretend the font is oblique now -->
+		<edit name="slant" mode="assign">
+			<const>oblique</const>
+		</edit>
+	</match>
+
+
+<!--
+  We can''t hint our fonts well, so turn off hinting.
+  Moreover, the bitmaps we have designed (well, they
+  have designed), suck, so disable them too.
+  -->
+
+	<match target="font">
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+ 		<edit name="embeddedbitmap">
+ 			<bool>false</bool>
+ 		</edit>
+	</match>
+
+
+<!-- Alias our fonts to common families -->
+
+	<!-- Persian serif fonts -->
+	<alias>
+		<family>serif</family>
+		<accept>
+			<family>Nazli</family>
+			<family>Lotoos</family>
+			<family>Mitra</family>
+			<family>Ferdosi</family>
+			<family>Badr</family>
+			<family>Zar</family>
+		</accept>
+	</alias>
+
+	<!-- Persian sans-serif fonts -->
+	<alias>
+		<family>sans-serif</family>
+		<accept>
+			<family>Roya</family>
+			<family>Koodak</family>
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+	<!-- Persian monospace fonts -->
+	<alias>
+		<family>monospace</family>
+		<accept>
+			<!-- Not really monospace -->
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+
+<!-- Use Titr in titles -->
+
+	<!-- Both serif... -->
+	<match>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and sans-serif. -->
+	<match>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and more. -->
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend"
binding="same">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+
+<!-- Default substituted for deprecated sans-serif fonts -->
+
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<edit name="family" mode="assign"
binding="same">
+			<string>Roya</string>
+		</edit>
+	</match>
+
+</fontconfig>
diff-tree d55620c90676951fc70ec9430c2670edca2147cb (from
f6e645c4993fff77d596dba734c09cdb255f4ca0)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:32:37 2006 -0400

    Replace load of conf.d in fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index a4f3389..343df79 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -283,6 +283,11 @@
 	</match>
 
 <!--
+  Load local system customization file
+-->
+	<include ignore_missing="yes">conf.d</include>
+
+<!--
   Provide required aliases for standard names
 -->
 	<alias>
diff-tree f6e645c4993fff77d596dba734c09cdb255f4ca0 (from
cbdd74d6569b5975b86bd425b56b1b50aa73d2bb)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:30:10 2006 -0400

    Update Makefile.am to match conf.avail changes

diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am
index 98e8dbd..bfba74b 100644
--- a/conf.avail/Makefile.am
+++ b/conf.avail/Makefile.am
@@ -22,19 +22,22 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 CONF_FILES = \
-	10LohitGujarati.conf \
+	10-LohitGujarati.conf \
 	10-fonts-persian.conf \
-	60-delicious.conf \
-	autohint.conf \
-	no-bitmaps.conf \
-	no-sub-pixel.conf \
-	sub-pixel.conf \
-	unhinted.conf \
-	yes-bitmaps.conf
+	33-autohint.conf \
+	33-unhinted.conf \
+	30-no-sub-pixel.conf \
+	30-sub-pixel-rgb.conf \
+	30-sub-pixel-bgr.conf \
+	30-sub-pixel-vrgb.conf \
+	30-sub-pixel-vbgr.conf \
+	36-no-bitmaps.conf \
+	36-yes-bitmaps.conf \
+	60-delicious.conf
 
 EXTRA_DIST = $(CONF_FILES)
 
 configdir=$(CONFDIR)
-confddir=$(configdir)/conf.d
+confddir=$(configdir)/conf.avail
 
 confd_DATA=$(CONF_FILES)
diff-tree cbdd74d6569b5975b86bd425b56b1b50aa73d2bb (from
57b42cef2ad2f18618ca0748325fc800165bdc1b)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 15:27:29 2006 -0400

    Number the remaining conf.avail files

diff --git a/conf.avail/30-no-sub-pixel.conf b/conf.avail/30-no-sub-pixel.conf
new file mode 100644
index 0000000..5d64a0b
--- /dev/null
+++ b/conf.avail/30-no-sub-pixel.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>none</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/30-sub-pixel-bgr.conf b/conf.avail/30-sub-pixel-bgr.conf
new file mode 100644
index 0000000..2aba95e
--- /dev/null
+++ b/conf.avail/30-sub-pixel-bgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>bgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/30-sub-pixel-rgb.conf b/conf.avail/30-sub-pixel-rgb.conf
new file mode 100644
index 0000000..c4e8a42
--- /dev/null
+++ b/conf.avail/30-sub-pixel-rgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/30-sub-pixel-vbgr.conf
b/conf.avail/30-sub-pixel-vbgr.conf
new file mode 100644
index 0000000..0cdad2a
--- /dev/null
+++ b/conf.avail/30-sub-pixel-vbgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vbgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/30-sub-pixel-vrgb.conf
b/conf.avail/30-sub-pixel-vrgb.conf
new file mode 100644
index 0000000..60239e0
--- /dev/null
+++ b/conf.avail/30-sub-pixel-vrgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vrgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/33-autohint.conf b/conf.avail/33-autohint.conf
new file mode 100644
index 0000000..5406f4e
--- /dev/null
+++ b/conf.avail/33-autohint.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/autohint.conf -->
+<fontconfig>
+<!--  Use the Autohinter --> 
+  <match target="font">
+    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/33-unhinted.conf b/conf.avail/33-unhinted.conf
new file mode 100644
index 0000000..fb0b375
--- /dev/null
+++ b/conf.avail/33-unhinted.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/unhinted.conf -->
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="font">
+    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/36-no-bitmaps.conf b/conf.avail/36-no-bitmaps.conf
new file mode 100644
index 0000000..e8fb6a9
--- /dev/null
+++ b/conf.avail/36-no-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
+<fontconfig>
+<!-- Reject bitmap fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.avail/36-yes-bitmaps.conf b/conf.avail/36-yes-bitmaps.conf
new file mode 100644
index 0000000..c539c70
--- /dev/null
+++ b/conf.avail/36-yes-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/yes-bitmaps.conf -->
+<fontconfig>
+<!-- Accept bitmap fonts -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.avail/autohint.conf b/conf.avail/autohint.conf
deleted file mode 100644
index 5406f4e..0000000
--- a/conf.avail/autohint.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
-<fontconfig>
-<!--  Use the Autohinter --> 
-  <match target="font">
-    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/no-bitmaps.conf b/conf.avail/no-bitmaps.conf
deleted file mode 100644
index e8fb6a9..0000000
--- a/conf.avail/no-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
-<fontconfig>
-<!-- Reject bitmap fonts -->
- <selectfont>
-  <rejectfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </rejectfont>
- </selectfont>
-</fontconfig>
diff --git a/conf.avail/no-sub-pixel.conf b/conf.avail/no-sub-pixel.conf
deleted file mode 100644
index 5d64a0b..0000000
--- a/conf.avail/no-sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>none</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/sub-pixel-bgr.conf b/conf.avail/sub-pixel-bgr.conf
deleted file mode 100644
index 2aba95e..0000000
--- a/conf.avail/sub-pixel-bgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>bgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/sub-pixel-rgb.conf b/conf.avail/sub-pixel-rgb.conf
deleted file mode 100644
index c4e8a42..0000000
--- a/conf.avail/sub-pixel-rgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/sub-pixel-vbgr.conf b/conf.avail/sub-pixel-vbgr.conf
deleted file mode 100644
index 0cdad2a..0000000
--- a/conf.avail/sub-pixel-vbgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>vbgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/sub-pixel-vrgb.conf b/conf.avail/sub-pixel-vrgb.conf
deleted file mode 100644
index 60239e0..0000000
--- a/conf.avail/sub-pixel-vrgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>vrgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/unhinted.conf b/conf.avail/unhinted.conf
deleted file mode 100644
index fb0b375..0000000
--- a/conf.avail/unhinted.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
-<fontconfig>
-<!--  Disable hinting --> 
-  <match target="font">
-    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.avail/yes-bitmaps.conf b/conf.avail/yes-bitmaps.conf
deleted file mode 100644
index c539c70..0000000
--- a/conf.avail/yes-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
-<fontconfig>
-<!-- Accept bitmap fonts -->
- <selectfont>
-  <acceptfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </acceptfont>
- </selectfont>
-</fontconfig>
diff-tree 57b42cef2ad2f18618ca0748325fc800165bdc1b (from
04ceb322c8e8c4bfc5f4df27d15e8353058a19b8)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 01:33:09 2006 -0400

    Move user and local conf file loading into conf.avail files

diff --git a/conf.avail/50-user.conf b/conf.avail/50-user.conf
new file mode 100644
index 0000000..9a38a40
--- /dev/null
+++ b/conf.avail/50-user.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access
-->
+<fontconfig>
+	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf</include>
+</fontconfig>
diff --git a/conf.avail/51-local.conf b/conf.avail/51-local.conf
new file mode 100644
index 0000000..d35046e
--- /dev/null
+++ b/conf.avail/51-local.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font
access -->
+<fontconfig>
+	<!-- Load local system customization file -->
+	<include ignore_missing="yes">local.conf</include>
+</fontconfig>
diff --git a/fonts.conf.in b/fonts.conf.in
index adc44e8..a4f3389 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -283,17 +283,6 @@
 	</match>
 
 <!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
-<!--
-  Load local system customization file
--->
-	<include ignore_missing="yes">conf.d</include>
-	<include ignore_missing="yes">local.conf</include>
-
-<!--
   Provide required aliases for standard names
 -->
 	<alias>
diff-tree 04ceb322c8e8c4bfc5f4df27d15e8353058a19b8 (from
085d12cd4bcc215a5fb2bc403148e68c45bd3d2a)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 01:28:07 2006 -0400

    Support all five possibilities for sub-pixel
    
    Make sub-pixel.conf be sub-pixel-rgb.conf and add the
    three other possibilites: bgr, vrgb and vbgr.

diff --git a/conf.avail/sub-pixel-bgr.conf b/conf.avail/sub-pixel-bgr.conf
new file mode 100644
index 0000000..2aba95e
--- /dev/null
+++ b/conf.avail/sub-pixel-bgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>bgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/sub-pixel-rgb.conf b/conf.avail/sub-pixel-rgb.conf
new file mode 100644
index 0000000..c4e8a42
--- /dev/null
+++ b/conf.avail/sub-pixel-rgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/sub-pixel-vbgr.conf b/conf.avail/sub-pixel-vbgr.conf
new file mode 100644
index 0000000..0cdad2a
--- /dev/null
+++ b/conf.avail/sub-pixel-vbgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vbgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/sub-pixel-vrgb.conf b/conf.avail/sub-pixel-vrgb.conf
new file mode 100644
index 0000000..60239e0
--- /dev/null
+++ b/conf.avail/sub-pixel-vrgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>vrgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/sub-pixel.conf b/conf.avail/sub-pixel.conf
deleted file mode 100644
index c4e8a42..0000000
--- a/conf.avail/sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
-  </match>
-</fontconfig>
diff-tree 085d12cd4bcc215a5fb2bc403148e68c45bd3d2a (from
709f32438d814f73b6ce677a48b81a238cd0d6aa)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 01:24:02 2006 -0400

    Standardize conf.avail number prefixing convention
    
    Always use \d- rather than just \d as prefix

diff --git a/conf.avail/10-LohitGujarati.conf b/conf.avail/10-LohitGujarati.conf
new file mode 100644
index 0000000..eb51f86
--- /dev/null
+++ b/conf.avail/10-LohitGujarati.conf
@@ -0,0 +1,5 @@
+<!-- Available Gujarti fonts look much better without hinting -->
+<match target="font">
+	<test name="family"><string>Lohit
Gujarati</string></test>
+	<edit
name="hinting"><bool>false</bool></edit>
+</match>
\ No newline at end of file
diff --git a/conf.avail/10LohitGujarati.conf b/conf.avail/10LohitGujarati.conf
deleted file mode 100644
index eb51f86..0000000
--- a/conf.avail/10LohitGujarati.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Available Gujarti fonts look much better without hinting -->
-<match target="font">
-	<test name="family"><string>Lohit
Gujarati</string></test>
-	<edit
name="hinting"><bool>false</bool></edit>
-</match>
\ No newline at end of file
diff-tree 709f32438d814f73b6ce677a48b81a238cd0d6aa (from
34227592c23db4d462d36773532cef67731e2831)
Author: James Cloos <cloos@lugabout.jhcloos.org>
Date:   Mon Sep 4 01:21:55 2006 -0400

    Move files from conf.d to conf.avail
    
    All of the files in conf.d are now in conf.avail
    Makefile.am is updated to reflect the change

diff --git a/Makefile.am b/Makefile.am
index 1b28303..3b31bd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 
 DOCSRC=@DOCSRC@
 SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+	fc-cache fc-cat fc-list fc-match conf.avail $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
diff --git a/conf.avail/10-fonts-persian.conf b/conf.avail/10-fonts-persian.conf
new file mode 100644
index 0000000..e30c4d9
--- /dev/null
+++ b/conf.avail/10-fonts-persian.conf
@@ -0,0 +1,539 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
+<!--
+  fonts-persian.conf
+  To configure Persian fonts from The FarsiWeb Project.
+
+  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+
+  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+  ChangeLog:
+    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.
+  -->
+<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-->
+
+<!-- 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>
+
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- 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>
+
+	<!-- 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>
+
+	<!-- 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>
+
+<!-- Register the fonts that we actually do have -->
+
+	<match target="font">
+		<test name="family">
+			<string>Elham</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Homa</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Koodak</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Nazli</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Roya</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Terafik</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Titr</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+
+<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
+
+	<match target="font">
+		<test name="foundry">
+			<!--string>farsiweb</string-->
+			<string>TURNED-OFF</string>
+		</test>
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<!-- check to see if the font is roman -->
+		<test name="slant">
+			<const>roman</const>
+		</test>
+		<!-- check to see if the pattern requested non-roman -->
+		<test target="pattern" name="slant"
compare="not_eq">
+			<const>roman</const>
+		</test>
+		<!-- multiply the matrix to slant the font -->
+		<edit name="matrix" mode="assign">
+			<times>
+				<name>matrix</name>
+			
<matrix><double>1</double><double>-0.2</double>
+					<double>0</double><double>1</double>
+				</matrix>
+			</times>
+		</edit>
+		<!-- pretend the font is oblique now -->
+		<edit name="slant" mode="assign">
+			<const>oblique</const>
+		</edit>
+	</match>
+
+
+<!--
+  We can''t hint our fonts well, so turn off hinting.
+  Moreover, the bitmaps we have designed (well, they
+  have designed), suck, so disable them too.
+  -->
+
+	<match target="font">
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+ 		<edit name="embeddedbitmap">
+ 			<bool>false</bool>
+ 		</edit>
+	</match>
+
+
+<!-- Alias our fonts to common families -->
+
+	<!-- Persian serif fonts -->
+	<alias>
+		<family>serif</family>
+		<accept>
+			<family>Nazli</family>
+			<family>Lotoos</family>
+			<family>Mitra</family>
+			<family>Ferdosi</family>
+			<family>Badr</family>
+			<family>Zar</family>
+		</accept>
+	</alias>
+
+	<!-- Persian sans-serif fonts -->
+	<alias>
+		<family>sans-serif</family>
+		<accept>
+			<family>Roya</family>
+			<family>Koodak</family>
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+	<!-- Persian monospace fonts -->
+	<alias>
+		<family>monospace</family>
+		<accept>
+			<!-- Not really monospace -->
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+
+<!-- Use Titr in titles -->
+
+	<!-- Both serif... -->
+	<match>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and sans-serif. -->
+	<match>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and more. -->
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend"
binding="same">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+
+<!-- Default substituted for deprecated sans-serif fonts -->
+
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<edit name="family" mode="assign"
binding="same">
+			<string>Roya</string>
+		</edit>
+	</match>
+
+</fontconfig>
diff --git a/conf.avail/10LohitGujarati.conf b/conf.avail/10LohitGujarati.conf
new file mode 100644
index 0000000..eb51f86
--- /dev/null
+++ b/conf.avail/10LohitGujarati.conf
@@ -0,0 +1,5 @@
+<!-- Available Gujarti fonts look much better without hinting -->
+<match target="font">
+	<test name="family"><string>Lohit
Gujarati</string></test>
+	<edit
name="hinting"><bool>false</bool></edit>
+</match>
\ No newline at end of file
diff --git a/conf.avail/60-delicious.conf b/conf.avail/60-delicious.conf
new file mode 100644
index 0000000..701429b
--- /dev/null
+++ b/conf.avail/60-delicious.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/60-delicious.conf -->
+<fontconfig>
+<!-- Fix-ups for Delicious family -->
+
+<!-- Delicious ''heavy'' variant says its Medium weight
-->
+<match target="scan">
+	<test name="family">
+		<string>Delicious</string>
+	</test>
+	<test name="style">
+		<string>Heavy</string>
+	</test>
+	<edit name="weight">
+		<const>heavy</const>
+	</edit>
+</match>
+
+</fontconfig>
diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am
new file mode 100644
index 0000000..98e8dbd
--- /dev/null
+++ b/conf.avail/Makefile.am
@@ -0,0 +1,40 @@
+# 
+#  $Id$
+# 
+#  Copyright © 2005 Keith Packard
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+CONF_FILES = \
+	10LohitGujarati.conf \
+	10-fonts-persian.conf \
+	60-delicious.conf \
+	autohint.conf \
+	no-bitmaps.conf \
+	no-sub-pixel.conf \
+	sub-pixel.conf \
+	unhinted.conf \
+	yes-bitmaps.conf
+
+EXTRA_DIST = $(CONF_FILES)
+
+configdir=$(CONFDIR)
+confddir=$(configdir)/conf.d
+
+confd_DATA=$(CONF_FILES)
diff --git a/conf.avail/README b/conf.avail/README
new file mode 100644
index 0000000..7e6cd2c
--- /dev/null
+++ b/conf.avail/README
@@ -0,0 +1,8 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*, so if you
+want to use any of these options, link them to a name of that form.  E.g.
+
+	$ ln -s no-bitmaps.conf 10no-bitmaps.conf
+
diff --git a/conf.avail/autohint.conf b/conf.avail/autohint.conf
new file mode 100644
index 0000000..5406f4e
--- /dev/null
+++ b/conf.avail/autohint.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/autohint.conf -->
+<fontconfig>
+<!--  Use the Autohinter --> 
+  <match target="font">
+    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/no-bitmaps.conf b/conf.avail/no-bitmaps.conf
new file mode 100644
index 0000000..e8fb6a9
--- /dev/null
+++ b/conf.avail/no-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
+<fontconfig>
+<!-- Reject bitmap fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.avail/no-sub-pixel.conf b/conf.avail/no-sub-pixel.conf
new file mode 100644
index 0000000..5d64a0b
--- /dev/null
+++ b/conf.avail/no-sub-pixel.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>none</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/sub-pixel.conf b/conf.avail/sub-pixel.conf
new file mode 100644
index 0000000..c4e8a42
--- /dev/null
+++ b/conf.avail/sub-pixel.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/unhinted.conf b/conf.avail/unhinted.conf
new file mode 100644
index 0000000..fb0b375
--- /dev/null
+++ b/conf.avail/unhinted.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/unhinted.conf -->
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="font">
+    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/yes-bitmaps.conf b/conf.avail/yes-bitmaps.conf
new file mode 100644
index 0000000..c539c70
--- /dev/null
+++ b/conf.avail/yes-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/yes-bitmaps.conf -->
+<fontconfig>
+<!-- Accept bitmap fonts -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt
name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.d/10-fonts-persian.conf b/conf.d/10-fonts-persian.conf
deleted file mode 100644
index e30c4d9..0000000
--- a/conf.d/10-fonts-persian.conf
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
-<!--
-  fonts-persian.conf
-  To configure Persian fonts from The FarsiWeb Project.
-
-  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-
-  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-
-  ChangeLog:
-    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.
-  -->
-<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-->
-
-<!-- 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>
-
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- Register the fonts that we actually do have -->
-
-	<match target="font">
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Koodak</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Nazli</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Roya</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Terafik</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-
-<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
-
-	<match target="font">
-		<test name="foundry">
-			<!--string>farsiweb</string-->
-			<string>TURNED-OFF</string>
-		</test>
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant"
compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-			
<matrix><double>1</double><double>-0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-
-<!--
-  We can''t hint our fonts well, so turn off hinting.
-  Moreover, the bitmaps we have designed (well, they
-  have designed), suck, so disable them too.
-  -->
-
-	<match target="font">
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
- 		<edit name="embeddedbitmap">
- 			<bool>false</bool>
- 		</edit>
-	</match>
-
-
-<!-- Alias our fonts to common families -->
-
-	<!-- Persian serif fonts -->
-	<alias>
-		<family>serif</family>
-		<accept>
-			<family>Nazli</family>
-			<family>Lotoos</family>
-			<family>Mitra</family>
-			<family>Ferdosi</family>
-			<family>Badr</family>
-			<family>Zar</family>
-		</accept>
-	</alias>
-
-	<!-- Persian sans-serif fonts -->
-	<alias>
-		<family>sans-serif</family>
-		<accept>
-			<family>Roya</family>
-			<family>Koodak</family>
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian monospace fonts -->
-	<alias>
-		<family>monospace</family>
-		<accept>
-			<!-- Not really monospace -->
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-
-<!-- Use Titr in titles -->
-
-	<!-- Both serif... -->
-	<match>
-		<test name="family">
-			<string>serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and sans-serif. -->
-	<match>
-		<test name="family">
-			<string>sans-serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and more. -->
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend"
binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-
-<!-- Default substituted for deprecated sans-serif fonts -->
-
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<edit name="family" mode="assign"
binding="same">
-			<string>Roya</string>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/conf.d/10LohitGujarati.conf b/conf.d/10LohitGujarati.conf
deleted file mode 100644
index eb51f86..0000000
--- a/conf.d/10LohitGujarati.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Available Gujarti fonts look much better without hinting -->
-<match target="font">
-	<test name="family"><string>Lohit
Gujarati</string></test>
-	<edit
name="hinting"><bool>false</bool></edit>
-</match>
\ No newline at end of file
diff --git a/conf.d/60-delicious.conf b/conf.d/60-delicious.conf
deleted file mode 100644
index 701429b..0000000
--- a/conf.d/60-delicious.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-delicious.conf -->
-<fontconfig>
-<!-- Fix-ups for Delicious family -->
-
-<!-- Delicious ''heavy'' variant says its Medium weight
-->
-<match target="scan">
-	<test name="family">
-		<string>Delicious</string>
-	</test>
-	<test name="style">
-		<string>Heavy</string>
-	</test>
-	<edit name="weight">
-		<const>heavy</const>
-	</edit>
-</match>
-
-</fontconfig>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
deleted file mode 100644
index 98e8dbd..0000000
--- a/conf.d/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# 
-#  $Id$
-# 
-#  Copyright © 2005 Keith Packard
-# 
-#  Permission to use, copy, modify, distribute, and sell this software and its
-#  documentation for any purpose is hereby granted without fee, provided that
-#  the above copyright notice appear in all copies and that both that
-#  copyright notice and this permission notice appear in supporting
-#  documentation, and that the name of Keith Packard not be used in
-#  advertising or publicity pertaining to distribution of the software without
-#  specific, written prior permission.  Keith Packard makes no
-#  representations about the suitability of this software for any purpose.  It
-#  is provided "as is" without express or implied warranty.
-# 
-#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#  PERFORMANCE OF THIS SOFTWARE.
-
-CONF_FILES = \
-	10LohitGujarati.conf \
-	10-fonts-persian.conf \
-	60-delicious.conf \
-	autohint.conf \
-	no-bitmaps.conf \
-	no-sub-pixel.conf \
-	sub-pixel.conf \
-	unhinted.conf \
-	yes-bitmaps.conf
-
-EXTRA_DIST = $(CONF_FILES)
-
-configdir=$(CONFDIR)
-confddir=$(configdir)/conf.d
-
-confd_DATA=$(CONF_FILES)
diff --git a/conf.d/README b/conf.d/README
deleted file mode 100644
index 7e6cd2c..0000000
--- a/conf.d/README
+++ /dev/null
@@ -1,8 +0,0 @@
-conf.d/README
-
-Each file in this directory is a fontconfig configuration file.  Fontconfig
-scans this directory, loading all files of the form [0-9][0-9]*, so if you
-want to use any of these options, link them to a name of that form.  E.g.
-
-	$ ln -s no-bitmaps.conf 10no-bitmaps.conf
-
diff --git a/conf.d/autohint.conf b/conf.d/autohint.conf
deleted file mode 100644
index 5406f4e..0000000
--- a/conf.d/autohint.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
-<fontconfig>
-<!--  Use the Autohinter --> 
-  <match target="font">
-    <edit name="autohint"
mode="assign"><bool>true</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.d/no-bitmaps.conf b/conf.d/no-bitmaps.conf
deleted file mode 100644
index e8fb6a9..0000000
--- a/conf.d/no-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
-<fontconfig>
-<!-- Reject bitmap fonts -->
- <selectfont>
-  <rejectfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </rejectfont>
- </selectfont>
-</fontconfig>
diff --git a/conf.d/no-sub-pixel.conf b/conf.d/no-sub-pixel.conf
deleted file mode 100644
index 5d64a0b..0000000
--- a/conf.d/no-sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>none</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.d/sub-pixel.conf b/conf.d/sub-pixel.conf
deleted file mode 100644
index c4e8a42..0000000
--- a/conf.d/sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba"
mode="assign"><const>rgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/conf.d/unhinted.conf b/conf.d/unhinted.conf
deleted file mode 100644
index fb0b375..0000000
--- a/conf.d/unhinted.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
-<fontconfig>
-<!--  Disable hinting --> 
-  <match target="font">
-    <edit name="hinting"
mode="assign"><bool>false</bool></edit>
-  </match>
-</fontconfig>
diff --git a/conf.d/yes-bitmaps.conf b/conf.d/yes-bitmaps.conf
deleted file mode 100644
index c539c70..0000000
--- a/conf.d/yes-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
-<fontconfig>
-<!-- Accept bitmap fonts -->
- <selectfont>
-  <acceptfont>
-   <pattern>
-     <patelt
name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </acceptfont>
- </selectfont>
-</fontconfig>