From: Keith Packard Date: Sat, 31 May 2003 14:58:41 +0000 (+0000) Subject: (Bug 87) Automake 1.4 doesn't do man_MAN1 correctly (Bug 88) Fix usage info X-Git-Tag: fc-2_2_90~6 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=86b1243193a1cbab3286ee97d2543bfc841a575a;p=fontconfig.git (Bug 87) Automake 1.4 doesn't do man_MAN1 correctly (Bug 88) Fix usage info on non-long option systems (Tim Mooney) --- diff --git a/ChangeLog b/ChangeLog index b177b28..3079dde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-04 Keith Packard * doc/fontconfig-devel.sgml: close the element. diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index 5830879..a0504b4 100644 --- a/fc-cache/Makefile.am +++ b/fc-cache/Makefile.am @@ -23,10 +23,10 @@ INCLUDES=$(FREETYPE_CFLAGS) -man1_MANS=fc-cache.man +man_MANS=fc-cache.1 bin_PROGRAMS=fc-cache -EXTRA_DIST=$(man1_MANS) +EXTRA_DIST=$(man_MANS) fc_cache_LDADD = ../src/libfontconfig.la diff --git a/fc-cache/fc-cache.1 b/fc-cache/fc-cache.1 new file mode 100644 index 0000000..1844b3d --- /dev/null +++ b/fc-cache/fc-cache.1 @@ -0,0 +1,51 @@ +.\" +.\" Copyright © 2002 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. +.\" +.\" +.\" $RCSId: xc/programs/fc-cache/fc-cache.man,v 1.3 2001/02/09 03:47:56 tsi Exp $ +.\" +.TH FC-CACHE 1 __vendorversion__ +.SH NAME +fc-cache, fonts.cache \- create an index of FreeType font files in a directory +.SH SYNOPSIS +.B "fc-cache" +.RI [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [ directory-name +\|.\|.\|. ] +.SH DESCRIPTION +If directory arguments are not given, +.I fc-cache +uses each directory in the current font configuration. Each directory is +scanned for font files readable by FreeType. A cache is created which +contains properties of each font and the associated filename. This cache is +used to speed application startup when using the fontconfig library. +.P +Use -f (or --force on systems supporting long arguments) to override the +usual timestamp checking and ensure that new cache files are built. +.P +Use -s (or --system-only on systems supporting long arguments) to restrict +the updates to fonts not located in the current users home directory. +.SH FILES +.TP 15 +.B fonts.cache +Maps file names to font properties. Read by the fontconfig library at +application startup to locate appropriate fonts. +.SH "SEE ALSO" +fontconfig(3) diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index be8b962..ee7c0cb 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -67,16 +67,29 @@ extern int optind, opterr, optopt; static void usage (char *program) { - fprintf (stderr, "usage: %s [-fvV?] [--force] [--verbose] [--version] [--help] [dirs]\n", +#if HAVE_GETOPT_LONG + fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", + program); +#else + fprintf (stderr, "usage: %s [-fsvV?] [dirs]\n", program); +#endif fprintf (stderr, "Build font information caches in [dirs]\n" "(all directories in font configuration by default).\n"); fprintf (stderr, "\n"); +#if HAVE_GETOPT_LONG fprintf (stderr, " -f, --force scan directories with apparently valid caches\n"); fprintf (stderr, " -s, --system-only scan system-wide directories only\n"); fprintf (stderr, " -v, --verbose display status information while busy\n"); fprintf (stderr, " -V, --version display font config version and exit\n"); fprintf (stderr, " -?, --help display this help and exit\n"); +#else + fprintf (stderr, " -f (force) scan directories with apparently valid caches\n"); + fprintf (stderr, " -s (system) scan system-wide directories only\n"); + fprintf (stderr, " -v (verbose) display status information while busy\n"); + fprintf (stderr, " -V (version) display font config version and exit\n"); + fprintf (stderr, " -? (help) display this help and exit\n"); +#endif exit (1); } @@ -216,9 +229,9 @@ main (int argc, char **argv) int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "fVv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "fVv?")) != -1) + while ((c = getopt (argc, argv, "fsVv?")) != -1) #endif { switch (c) { diff --git a/fc-cache/fc-cache.man b/fc-cache/fc-cache.man deleted file mode 100644 index 7a61d02..0000000 --- a/fc-cache/fc-cache.man +++ /dev/null @@ -1,45 +0,0 @@ -.\" -.\" Copyright © 2002 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. -.\" -.\" -.\" $RCSId: xc/programs/fc-cache/fc-cache.man,v 1.3 2001/02/09 03:47:56 tsi Exp $ -.\" -.TH FC-CACHE 1 __vendorversion__ -.SH NAME -fc-cache, fonts.cache \- create an index of FreeType font files in a directory -.SH SYNOPSIS -.B "fc-cache" -.RI [ directory-name -\|.\|.\|. ] -.SH DESCRIPTION -If directory arguments are not given, -.I fc-cache -uses each directory in the current font configuration. Each directory is -scanned for font files readable by FreeType. A cache is created which -contains properties of each font and the associated filename. This cache is -used to speed application startup when using the fontconfig library. -.SH FILES -.TP 15 -.B fonts.cache -Maps file names to font properties. Read by the fontconfig library at -application startup to locate appropriate fonts. -.SH "SEE ALSO" -fontconfig(3) diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am index 67874cb..b050a3f 100644 --- a/fc-list/Makefile.am +++ b/fc-list/Makefile.am @@ -23,10 +23,10 @@ bin_PROGRAMS=fc-list -man1_MANS=fc-list.man +man_MANS=fc-list.1 INCLUDES=$(FREETYPE_CFLAGS) -EXTRA_DIST=$(man1_MANS) +EXTRA_DIST=$(man_MANS) fc_list_LDADD = ../src/libfontconfig.la diff --git a/fc-list/fc-list.1 b/fc-list/fc-list.1 new file mode 100644 index 0000000..4efa37c --- /dev/null +++ b/fc-list/fc-list.1 @@ -0,0 +1,37 @@ +.\" +.\" Copyright © 2002 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. +.\" +.\" +.\" $RCSId: xc/programs/fc-list/fc-list.man,v 1.3 2001/02/09 03:47:56 tsi Exp $ +.\" +.TH FC-LIST 1 __vendorversion__ +.SH NAME +fc-list \- list available fonts +.SH SYNOPSIS +.B "fc-list" +.RI [-vV?] [--verbose] [--version] [ font-pattern ] { element ... } +.SH DESCRIPTION +If font pattern is not given, +.I fc-list +lists all available faces and styles in the current font configuration. +If elements are provided, list only those elements of each matching pattern. +.SH "SEE ALSO" +fontconfig(3) diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c index 404cd64..6416331 100644 --- a/fc-list/fc-list.c +++ b/fc-list/fc-list.c @@ -61,13 +61,24 @@ extern int optind, opterr, optopt; static void usage (char *program) { +#if HAVE_GETOPT_LONG fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [pattern] {element ...} \n", program); +#else + fprintf (stderr, "usage: %s [-vV?] [pattern] {element ...} \n", + program); +#endif fprintf (stderr, "List fonts matching [pattern]\n"); fprintf (stderr, "\n"); +#if HAVE_GETOPT_LONG fprintf (stderr, " -v, --verbose display status information while busy\n"); fprintf (stderr, " -V, --version display font config version and exit\n"); fprintf (stderr, " -?, --help display this help and exit\n"); +#else + fprintf (stderr, " -v (verbose) display status information while busy\n"); + fprintf (stderr, " -V (version) display font config version and exit\n"); + fprintf (stderr, " -? (help) display this help and exit\n"); +#endif exit (1); } diff --git a/fc-list/fc-list.man b/fc-list/fc-list.man deleted file mode 100644 index c1e6336..0000000 --- a/fc-list/fc-list.man +++ /dev/null @@ -1,36 +0,0 @@ -.\" -.\" Copyright © 2002 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. -.\" -.\" -.\" $RCSId: xc/programs/fc-list/fc-list.man,v 1.3 2001/02/09 03:47:56 tsi Exp $ -.\" -.TH FC-LIST 1 __vendorversion__ -.SH NAME -fc-list \- list available fonts -.SH SYNOPSIS -.B "fc-list" -.RI [ font-pattern ] -.SH DESCRIPTION -If font pattern is not given, -.I fc-list -lists all available faces and styles in the current font configuration. -.SH "SEE ALSO" -fontconfig(3)