]> git.wh0rd.org Git - fontconfig.git/commitdiff
Move files from conf.d to conf.avail
authorJames Cloos <cloos@lugabout.jhcloos.org>
Mon, 4 Sep 2006 05:21:55 +0000 (01:21 -0400)
committerJames Cloos <cloos@lugabout.jhcloos.org>
Mon, 4 Sep 2006 05:21:55 +0000 (01:21 -0400)
All of the files in conf.d are now in conf.avail
Makefile.am is updated to reflect the change

23 files changed:
Makefile.am
conf.avail/10-fonts-persian.conf [new file with mode: 0644]
conf.avail/10LohitGujarati.conf [new file with mode: 0644]
conf.avail/60-delicious.conf [new file with mode: 0644]
conf.avail/Makefile.am [new file with mode: 0644]
conf.avail/README [new file with mode: 0644]
conf.avail/autohint.conf [new file with mode: 0644]
conf.avail/no-bitmaps.conf [new file with mode: 0644]
conf.avail/no-sub-pixel.conf [new file with mode: 0644]
conf.avail/sub-pixel.conf [new file with mode: 0644]
conf.avail/unhinted.conf [new file with mode: 0644]
conf.avail/yes-bitmaps.conf [new file with mode: 0644]
conf.d/10-fonts-persian.conf [deleted file]
conf.d/10LohitGujarati.conf [deleted file]
conf.d/60-delicious.conf [deleted file]
conf.d/Makefile.am [deleted file]
conf.d/README [deleted file]
conf.d/autohint.conf [deleted file]
conf.d/no-bitmaps.conf [deleted file]
conf.d/no-sub-pixel.conf [deleted file]
conf.d/sub-pixel.conf [deleted file]
conf.d/unhinted.conf [deleted file]
conf.d/yes-bitmaps.conf [deleted file]

index 1b28303af735373eaff4457aae1403dcf38aebb8..3b31bd49d9c1edde44886a5cd4c5c66ea96179e4 100644 (file)
@@ -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 (file)
index 0000000..e30c4d9
--- /dev/null
@@ -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 (file)
index 0000000..eb51f86
--- /dev/null
@@ -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 (file)
index 0000000..701429b
--- /dev/null
@@ -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 (file)
index 0000000..98e8dbd
--- /dev/null
@@ -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 (file)
index 0000000..7e6cd2c
--- /dev/null
@@ -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 (file)
index 0000000..5406f4e
--- /dev/null
@@ -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 (file)
index 0000000..e8fb6a9
--- /dev/null
@@ -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 (file)
index 0000000..5d64a0b
--- /dev/null
@@ -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 (file)
index 0000000..c4e8a42
--- /dev/null
@@ -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 (file)
index 0000000..fb0b375
--- /dev/null
@@ -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 (file)
index 0000000..c539c70
--- /dev/null
@@ -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 (file)
index e30c4d9..0000000
+++ /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 (file)
index eb51f86..0000000
+++ /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 (file)
index 701429b..0000000
+++ /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 (file)
index 98e8dbd..0000000
+++ /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 (file)
index 7e6cd2c..0000000
+++ /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 (file)
index 5406f4e..0000000
+++ /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 (file)
index e8fb6a9..0000000
+++ /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 (file)
index 5d64a0b..0000000
+++ /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 (file)
index c4e8a42..0000000
+++ /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 (file)
index fb0b375..0000000
+++ /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 (file)
index c539c70..0000000
+++ /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>