diff options
| author | Keith Packard <keithp@keithp.com> | 2005-07-09 23:15:37 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-07-09 23:15:37 +0000 |
| commit | 99cde389c331616f22dd6aab395c488f3a798e2e (patch) | |
| tree | f14c0b106882065b69a55acf1c31d9bb922a8a24 /include/X11 | |
| parent | 3c4ac0b9f5b7aced60a763bcaca7b32cd53a7fec (diff) | |
Rearrange configuration options so that individual font file formats drive
combined options, and so that the default matches the monolithic
defaults
Extent fontconf.h to cover all formats
Typo in src/Makefile.am failed to link in Type1 library
Missing xttcap.c from FreeType shim library.
Diffstat (limited to 'include/X11')
| -rw-r--r-- | include/X11/fonts/fontconf.h.in | 57 |
1 files changed, 53 insertions, 4 deletions
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in index 6a08acf..358e133 100644 --- a/include/X11/fonts/fontconf.h.in +++ b/include/X11/fonts/fontconf.h.in @@ -1,11 +1,60 @@ -/* Define as 1 if you have fontfile support in Xfont */ -#undef XFONT_FONTFILE +/* + * $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. + */ + +/* Define as 1 if you have FreeType support in Xfont */ +#undef XFONT_FREETYPE + +/* Define as 1 if you have Type1 font support in Xfont */ +#undef XFONT_TYPE1 + +/* Define as 1 if you have Type1 CID font support in Xfont */ +#undef XFONT_CID + +/* Define as 1 if you have Speedo support in Xfont */ +#undef XFONT_SPEEDO /* Define as 1 if you have builtin font support in Xfont */ #undef XFONT_BUILTINS -/* Define as 1 if you have FreeType support in Xfont */ -#undef XFONT_FREETYPE +/* Define as 1 if you have pcf font support in Xfont */ +#undef XFONT_PCFFORMAT + +/* Define as 1 if you have bdf font support in Xfont */ +#undef XFONT_BDFFORMAT + +/* Define as 1 if you have snf font support in Xfont */ +#undef XFONT_SNFFORMAT + +/* Define as 1 if you have bitmap font support in Xfont */ +#undef XFONT_BITMAP + +/* Define as 1 if you have fontfile support in Xfont */ +#undef XFONT_FONTFILE + +/* Define as 1 if you have font cache support in Xfont */ +#undef XFONT_FONTCACHE /* Define as 1 if you have X Font Services Protocol support in Xfont */ #undef XFONT_FC + |