From: James Cloos Date: Mon, 4 Sep 2006 05:21:55 +0000 (-0400) Subject: Move files from conf.d to conf.avail X-Git-Tag: 2.4.0~8^2~11 X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=commitdiff_plain;h=709f32438d814f73b6ce677a48b81a238cd0d6aa Move files from conf.d to conf.avail All of the files in conf.d are now in conf.avail Makefile.am is updated to reflect the change --- diff --git a/Makefile.am b/Makefile.am index 1b28303..3b31bd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \ - fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match conf.avail $(DOCSRC) test EXTRA_DIST = \ fontconfig.pc.in \ diff --git a/conf.avail/10-fonts-persian.conf b/conf.avail/10-fonts-persian.conf new file mode 100644 index 0000000..e30c4d9 --- /dev/null +++ b/conf.avail/10-fonts-persian.conf @@ -0,0 +1,539 @@ + + + + + + + + + + + + + + + + Nesf + + + Nesf2 + + + + + Nesf2 + + + Persian_sansserif_default + + + + + + + + + + + + Nazanin + + + Nazli + + + + + Lotus + + + Lotoos + + + + + + + Yaqut + + + Yaghoot + + + + + Yagut + + + Yaghoot + + + + + Yaghut + + + Yaghoot + + + + + Traffic + + + Terafik + + + + + Ferdowsi + + + Ferdosi + + + + + Fantezy + + + Fantezi + + + + + + + + + + Jadid + + + Persian_title + + + + + Titr + + + Persian_title + + + + + + + Kamran + + + Homa + + + Persian_fantasy + + + + + Homa + + + Kamran + + + Persian_fantasy + + + + + Fantezi + + + Persian_fantasy + + + + + Tabassom + + + Persian_fantasy + + + + + + + Arshia + + + Persian_square + + + + + Nasim + + + Persian_square + + + + + Elham + + + Farnaz + + + Persian_square + + + + + Farnaz + + + Elham + + + Persian_square + + + + + Sina + + + Persian_square + + + + + + + + + Persian_title + + + Persian_serif + + + Jadid + + + Titr + + + + + + + Persian_fantasy + + + Persian_square + + + Tabassom + + + Fantezi + + + Kamran + + + Homa + + + + + + + Persian_square + + + Persian_serif + + + Sina + + + Nasim + + + Farnaz + + + Elham + + + Arshia + + + + + + + + Elham + + + farsiweb + + + + + + Homa + + + farsiweb + + + + + + Koodak + + + farsiweb + + + + + + Nazli + + + farsiweb + + + + + + Roya + + + farsiweb + + + + + + Terafik + + + farsiweb + + + + + + Titr + + + farsiweb + + + + + + + + + + TURNED-OFF + + + farsiweb + + + + roman + + + + roman + + + + + matrix + 1-0.2 + 01 + + + + + + oblique + + + + + + + + + farsiweb + + + false + + + false + + + false + + + + + + + + + serif + + Nazli + Lotoos + Mitra + Ferdosi + Badr + Zar + + + + + + sans-serif + + Roya + Koodak + Terafik + + + + + + monospace + + + Terafik + + + + + + + + + + serif + + + 200 + + + 24 + + + Titr + + + + + + + sans-serif + + + 200 + + + 24 + + + Titr + + + + + + + Persian_sansserif_default + + + 200 + + + 24 + + + Titr + + + + + + + + + Persian_sansserif_default + + + Roya + + + + diff --git a/conf.avail/10LohitGujarati.conf b/conf.avail/10LohitGujarati.conf new file mode 100644 index 0000000..eb51f86 --- /dev/null +++ b/conf.avail/10LohitGujarati.conf @@ -0,0 +1,5 @@ + + + Lohit Gujarati + false + \ No newline at end of file diff --git a/conf.avail/60-delicious.conf b/conf.avail/60-delicious.conf new file mode 100644 index 0000000..701429b --- /dev/null +++ b/conf.avail/60-delicious.conf @@ -0,0 +1,20 @@ + + + + + + + + + + Delicious + + + Heavy + + + heavy + + + + diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am new file mode 100644 index 0000000..98e8dbd --- /dev/null +++ b/conf.avail/Makefile.am @@ -0,0 +1,40 @@ +# +# $Id$ +# +# Copyright © 2005 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +CONF_FILES = \ + 10LohitGujarati.conf \ + 10-fonts-persian.conf \ + 60-delicious.conf \ + autohint.conf \ + no-bitmaps.conf \ + no-sub-pixel.conf \ + sub-pixel.conf \ + unhinted.conf \ + yes-bitmaps.conf + +EXTRA_DIST = $(CONF_FILES) + +configdir=$(CONFDIR) +confddir=$(configdir)/conf.d + +confd_DATA=$(CONF_FILES) diff --git a/conf.avail/README b/conf.avail/README new file mode 100644 index 0000000..7e6cd2c --- /dev/null +++ b/conf.avail/README @@ -0,0 +1,8 @@ +conf.d/README + +Each file in this directory is a fontconfig configuration file. Fontconfig +scans this directory, loading all files of the form [0-9][0-9]*, so if you +want to use any of these options, link them to a name of that form. E.g. + + $ ln -s no-bitmaps.conf 10no-bitmaps.conf + diff --git a/conf.avail/autohint.conf b/conf.avail/autohint.conf new file mode 100644 index 0000000..5406f4e --- /dev/null +++ b/conf.avail/autohint.conf @@ -0,0 +1,9 @@ + + + + + + + true + + diff --git a/conf.avail/no-bitmaps.conf b/conf.avail/no-bitmaps.conf new file mode 100644 index 0000000..e8fb6a9 --- /dev/null +++ b/conf.avail/no-bitmaps.conf @@ -0,0 +1,13 @@ + + + + + + + + + false + + + + diff --git a/conf.avail/no-sub-pixel.conf b/conf.avail/no-sub-pixel.conf new file mode 100644 index 0000000..5d64a0b --- /dev/null +++ b/conf.avail/no-sub-pixel.conf @@ -0,0 +1,9 @@ + + + + + + + none + + diff --git a/conf.avail/sub-pixel.conf b/conf.avail/sub-pixel.conf new file mode 100644 index 0000000..c4e8a42 --- /dev/null +++ b/conf.avail/sub-pixel.conf @@ -0,0 +1,9 @@ + + + + + + + rgb + + diff --git a/conf.avail/unhinted.conf b/conf.avail/unhinted.conf new file mode 100644 index 0000000..fb0b375 --- /dev/null +++ b/conf.avail/unhinted.conf @@ -0,0 +1,9 @@ + + + + + + + false + + diff --git a/conf.avail/yes-bitmaps.conf b/conf.avail/yes-bitmaps.conf new file mode 100644 index 0000000..c539c70 --- /dev/null +++ b/conf.avail/yes-bitmaps.conf @@ -0,0 +1,13 @@ + + + + + + + + + false + + + + diff --git a/conf.d/10-fonts-persian.conf b/conf.d/10-fonts-persian.conf deleted file mode 100644 index e30c4d9..0000000 --- a/conf.d/10-fonts-persian.conf +++ /dev/null @@ -1,539 +0,0 @@ - - - - - - - - - - - - - - - - Nesf - - - Nesf2 - - - - - Nesf2 - - - Persian_sansserif_default - - - - - - - - - - - - Nazanin - - - Nazli - - - - - Lotus - - - Lotoos - - - - - - - Yaqut - - - Yaghoot - - - - - Yagut - - - Yaghoot - - - - - Yaghut - - - Yaghoot - - - - - Traffic - - - Terafik - - - - - Ferdowsi - - - Ferdosi - - - - - Fantezy - - - Fantezi - - - - - - - - - - Jadid - - - Persian_title - - - - - Titr - - - Persian_title - - - - - - - Kamran - - - Homa - - - Persian_fantasy - - - - - Homa - - - Kamran - - - Persian_fantasy - - - - - Fantezi - - - Persian_fantasy - - - - - Tabassom - - - Persian_fantasy - - - - - - - Arshia - - - Persian_square - - - - - Nasim - - - Persian_square - - - - - Elham - - - Farnaz - - - Persian_square - - - - - Farnaz - - - Elham - - - Persian_square - - - - - Sina - - - Persian_square - - - - - - - - - Persian_title - - - Persian_serif - - - Jadid - - - Titr - - - - - - - Persian_fantasy - - - Persian_square - - - Tabassom - - - Fantezi - - - Kamran - - - Homa - - - - - - - Persian_square - - - Persian_serif - - - Sina - - - Nasim - - - Farnaz - - - Elham - - - Arshia - - - - - - - - Elham - - - farsiweb - - - - - - Homa - - - farsiweb - - - - - - Koodak - - - farsiweb - - - - - - Nazli - - - farsiweb - - - - - - Roya - - - farsiweb - - - - - - Terafik - - - farsiweb - - - - - - Titr - - - farsiweb - - - - - - - - - - TURNED-OFF - - - farsiweb - - - - roman - - - - roman - - - - - matrix - 1-0.2 - 01 - - - - - - oblique - - - - - - - - - farsiweb - - - false - - - false - - - false - - - - - - - - - serif - - Nazli - Lotoos - Mitra - Ferdosi - Badr - Zar - - - - - - sans-serif - - Roya - Koodak - Terafik - - - - - - monospace - - - Terafik - - - - - - - - - - serif - - - 200 - - - 24 - - - Titr - - - - - - - sans-serif - - - 200 - - - 24 - - - Titr - - - - - - - Persian_sansserif_default - - - 200 - - - 24 - - - Titr - - - - - - - - - Persian_sansserif_default - - - Roya - - - - diff --git a/conf.d/10LohitGujarati.conf b/conf.d/10LohitGujarati.conf deleted file mode 100644 index eb51f86..0000000 --- a/conf.d/10LohitGujarati.conf +++ /dev/null @@ -1,5 +0,0 @@ - - - Lohit Gujarati - false - \ No newline at end of file diff --git a/conf.d/60-delicious.conf b/conf.d/60-delicious.conf deleted file mode 100644 index 701429b..0000000 --- a/conf.d/60-delicious.conf +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - Delicious - - - Heavy - - - heavy - - - - diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am deleted file mode 100644 index 98e8dbd..0000000 --- a/conf.d/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# -# $Id$ -# -# Copyright © 2005 Keith Packard -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -CONF_FILES = \ - 10LohitGujarati.conf \ - 10-fonts-persian.conf \ - 60-delicious.conf \ - autohint.conf \ - no-bitmaps.conf \ - no-sub-pixel.conf \ - sub-pixel.conf \ - unhinted.conf \ - yes-bitmaps.conf - -EXTRA_DIST = $(CONF_FILES) - -configdir=$(CONFDIR) -confddir=$(configdir)/conf.d - -confd_DATA=$(CONF_FILES) diff --git a/conf.d/README b/conf.d/README deleted file mode 100644 index 7e6cd2c..0000000 --- a/conf.d/README +++ /dev/null @@ -1,8 +0,0 @@ -conf.d/README - -Each file in this directory is a fontconfig configuration file. Fontconfig -scans this directory, loading all files of the form [0-9][0-9]*, so if you -want to use any of these options, link them to a name of that form. E.g. - - $ ln -s no-bitmaps.conf 10no-bitmaps.conf - diff --git a/conf.d/autohint.conf b/conf.d/autohint.conf deleted file mode 100644 index 5406f4e..0000000 --- a/conf.d/autohint.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - true - - diff --git a/conf.d/no-bitmaps.conf b/conf.d/no-bitmaps.conf deleted file mode 100644 index e8fb6a9..0000000 --- a/conf.d/no-bitmaps.conf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - false - - - - diff --git a/conf.d/no-sub-pixel.conf b/conf.d/no-sub-pixel.conf deleted file mode 100644 index 5d64a0b..0000000 --- a/conf.d/no-sub-pixel.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - none - - diff --git a/conf.d/sub-pixel.conf b/conf.d/sub-pixel.conf deleted file mode 100644 index c4e8a42..0000000 --- a/conf.d/sub-pixel.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - rgb - - diff --git a/conf.d/unhinted.conf b/conf.d/unhinted.conf deleted file mode 100644 index fb0b375..0000000 --- a/conf.d/unhinted.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - false - - diff --git a/conf.d/yes-bitmaps.conf b/conf.d/yes-bitmaps.conf deleted file mode 100644 index c539c70..0000000 --- a/conf.d/yes-bitmaps.conf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - false - - - -