Makefile.am | 2 +- configure.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: diff-tree 248b5903b7057b3c44ea1cd3a9b0d27624eba24a (from 9e292c889f1138b1af2f60621d7e2bfd8c490ff7) Author: Keith Packard <keithp@xxxxxxxxxxxxxxx> Date: Sat Sep 9 19:37:22 2006 -0700 Rename conf.avail to conf.d diff --git a/Makefile.am b/Makefile.am index 1ebb869..cf90617 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 conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test EXTRA_DIST = \ fontconfig.pc.in \ diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf deleted file mode 100644 index 10e6ce9..0000000 --- a/conf.avail/10-urw-aliases.conf +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- conf.d/sub-pixel.conf --> -<fontconfig> -<!-- - 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> -</fontconfig> diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf deleted file mode 100644 index d6df67e..0000000 --- a/conf.avail/15-amt-aliases.conf +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- conf.d/sub-pixel.conf --> -<fontconfig> -<!-- - 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> -</fontconfig> diff --git a/conf.avail/20-fix-globaladvance.conf b/conf.avail/20-fix-globaladvance.conf deleted file mode 100644 index a62162c..0000000 --- a/conf.avail/20-fix-globaladvance.conf +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- conf.d/sub-pixel.conf --> -<fontconfig> -<!-- - 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> -</fontconfig> diff --git a/conf.avail/30-unhint-small-vera.conf b/conf.avail/30-unhint-small-vera.conf deleted file mode 100644 index 3078119..0000000 --- a/conf.avail/30-unhint-small-vera.conf +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- conf.d/sub-pixel.conf --> -<fontconfig> -<!-- - 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> - -</fontconfig> diff --git a/conf.avail/50-user.conf b/conf.avail/50-user.conf deleted file mode 100644 index 9a38a40..0000000 --- a/conf.avail/50-user.conf +++ /dev/null @@ -1,7 +0,0 @@ -<?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 deleted file mode 100644 index d35046e..0000000 --- a/conf.avail/51-local.conf +++ /dev/null @@ -1,7 +0,0 @@ -<?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/conf.avail/60-LohitGujarati.conf b/conf.avail/60-LohitGujarati.conf deleted file mode 100644 index eb51f86..0000000 --- a/conf.avail/60-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/60-delicious.conf b/conf.avail/60-delicious.conf deleted file mode 100644 index 701429b..0000000 --- a/conf.avail/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.avail/60-fonts-persian.conf b/conf.avail/60-fonts-persian.conf deleted file mode 100644 index e30c4d9..0000000 --- a/conf.avail/60-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@xxxxxxxxxxxxx> - - 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 deleted file mode 100644 index 5d64a0b..0000000 --- a/conf.avail/70-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/70-sub-pixel-bgr.conf b/conf.avail/70-sub-pixel-bgr.conf deleted file mode 100644 index 2aba95e..0000000 --- a/conf.avail/70-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/70-sub-pixel-rgb.conf b/conf.avail/70-sub-pixel-rgb.conf deleted file mode 100644 index c4e8a42..0000000 --- a/conf.avail/70-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/70-sub-pixel-vbgr.conf b/conf.avail/70-sub-pixel-vbgr.conf deleted file mode 100644 index 0cdad2a..0000000 --- a/conf.avail/70-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/70-sub-pixel-vrgb.conf b/conf.avail/70-sub-pixel-vrgb.conf deleted file mode 100644 index 60239e0..0000000 --- a/conf.avail/70-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/73-autohint.conf b/conf.avail/73-autohint.conf deleted file mode 100644 index 5406f4e..0000000 --- a/conf.avail/73-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/73-unhinted.conf b/conf.avail/73-unhinted.conf deleted file mode 100644 index fb0b375..0000000 --- a/conf.avail/73-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/76-no-bitmaps.conf b/conf.avail/76-no-bitmaps.conf deleted file mode 100644 index e8fb6a9..0000000 --- a/conf.avail/76-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/76-yes-bitmaps.conf b/conf.avail/76-yes-bitmaps.conf deleted file mode 100644 index c539c70..0000000 --- a/conf.avail/76-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/Makefile.am b/conf.avail/Makefile.am deleted file mode 100644 index 6c9f4e1..0000000 --- a/conf.avail/Makefile.am +++ /dev/null @@ -1,71 +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 = \ - 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 - -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_FILES) - -configdir=$(CONFDIR) -confavaildir=$(configdir)/conf.avail -confddir=$(configdir)/conf.d - -confavail_DATA=$(CONF_FILES) - -install-data-local: - mkdir -p ${DESTDIR}${confddir} - @(echo cd ${DESTDIR}${confddir}; \ - cd ${DESTDIR}${confddir}; \ - for i in ${CONF_LINKS}; do \ - rm -f $$i; \ - echo rm -f $$i";" ln -s ../conf.avail/$$i .; \ - ln -s ../conf.avail/$$i .; \ - done) diff --git a/conf.avail/README b/conf.avail/README deleted file mode 100644 index 7e6cd2c..0000000 --- a/conf.avail/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/10-urw-aliases.conf b/conf.d/10-urw-aliases.conf new file mode 100644 index 0000000..10e6ce9 --- /dev/null +++ b/conf.d/10-urw-aliases.conf @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- conf.d/sub-pixel.conf --> +<fontconfig> +<!-- + 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> +</fontconfig> diff --git a/conf.d/15-amt-aliases.conf b/conf.d/15-amt-aliases.conf new file mode 100644 index 0000000..d6df67e --- /dev/null +++ b/conf.d/15-amt-aliases.conf @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- conf.d/sub-pixel.conf --> +<fontconfig> +<!-- + 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> +</fontconfig> diff --git a/conf.d/20-fix-globaladvance.conf b/conf.d/20-fix-globaladvance.conf new file mode 100644 index 0000000..a62162c --- /dev/null +++ b/conf.d/20-fix-globaladvance.conf @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- conf.d/sub-pixel.conf --> +<fontconfig> +<!-- + 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> +</fontconfig> diff --git a/conf.d/30-unhint-small-vera.conf b/conf.d/30-unhint-small-vera.conf new file mode 100644 index 0000000..3078119 --- /dev/null +++ b/conf.d/30-unhint-small-vera.conf @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- conf.d/sub-pixel.conf --> +<fontconfig> +<!-- + 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> + +</fontconfig> diff --git a/conf.d/50-user.conf b/conf.d/50-user.conf new file mode 100644 index 0000000..9a38a40 --- /dev/null +++ b/conf.d/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.d/51-local.conf b/conf.d/51-local.conf new file mode 100644 index 0000000..d35046e --- /dev/null +++ b/conf.d/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/conf.d/60-LohitGujarati.conf b/conf.d/60-LohitGujarati.conf new file mode 100644 index 0000000..eb51f86 --- /dev/null +++ b/conf.d/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.d/60-delicious.conf b/conf.d/60-delicious.conf new file mode 100644 index 0000000..701429b --- /dev/null +++ b/conf.d/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.d/60-fonts-persian.conf b/conf.d/60-fonts-persian.conf new file mode 100644 index 0000000..e30c4d9 --- /dev/null +++ b/conf.d/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@xxxxxxxxxxxxx> + + 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/70-no-sub-pixel.conf b/conf.d/70-no-sub-pixel.conf new file mode 100644 index 0000000..5d64a0b --- /dev/null +++ b/conf.d/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.d/70-sub-pixel-bgr.conf b/conf.d/70-sub-pixel-bgr.conf new file mode 100644 index 0000000..2aba95e --- /dev/null +++ b/conf.d/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.d/70-sub-pixel-rgb.conf b/conf.d/70-sub-pixel-rgb.conf new file mode 100644 index 0000000..c4e8a42 --- /dev/null +++ b/conf.d/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.d/70-sub-pixel-vbgr.conf b/conf.d/70-sub-pixel-vbgr.conf new file mode 100644 index 0000000..0cdad2a --- /dev/null +++ b/conf.d/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.d/70-sub-pixel-vrgb.conf b/conf.d/70-sub-pixel-vrgb.conf new file mode 100644 index 0000000..60239e0 --- /dev/null +++ b/conf.d/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.d/73-autohint.conf b/conf.d/73-autohint.conf new file mode 100644 index 0000000..5406f4e --- /dev/null +++ b/conf.d/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.d/73-unhinted.conf b/conf.d/73-unhinted.conf new file mode 100644 index 0000000..fb0b375 --- /dev/null +++ b/conf.d/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.d/76-no-bitmaps.conf b/conf.d/76-no-bitmaps.conf new file mode 100644 index 0000000..e8fb6a9 --- /dev/null +++ b/conf.d/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.d/76-yes-bitmaps.conf b/conf.d/76-yes-bitmaps.conf new file mode 100644 index 0000000..c539c70 --- /dev/null +++ b/conf.d/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 --git a/conf.d/Makefile.am b/conf.d/Makefile.am new file mode 100644 index 0000000..6c9f4e1 --- /dev/null +++ b/conf.d/Makefile.am @@ -0,0 +1,71 @@ +# +# $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 = \ + 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 + +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_FILES) + +configdir=$(CONFDIR) +confavaildir=$(configdir)/conf.avail +confddir=$(configdir)/conf.d + +confavail_DATA=$(CONF_FILES) + +install-data-local: + mkdir -p ${DESTDIR}${confddir} + @(echo cd ${DESTDIR}${confddir}; \ + cd ${DESTDIR}${confddir}; \ + for i in ${CONF_LINKS}; do \ + rm -f $$i; \ + echo rm -f $$i";" ln -s ../conf.avail/$$i .; \ + ln -s ../conf.avail/$$i .; \ + done) diff --git a/conf.d/README b/conf.d/README new file mode 100644 index 0000000..7e6cd2c --- /dev/null +++ b/conf.d/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/configure.in b/configure.in index d8afffb..3226dd0 100644 --- a/configure.in +++ b/configure.in @@ -563,7 +563,6 @@ fc-case/Makefile fc-arch/Makefile src/Makefile src/fontconfig.def -conf.avail/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile _______________________________________________ Fontconfig mailing list Fontconfig@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/fontconfig