From 86b1243193a1cbab3286ee97d2543bfc841a575a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 31 May 2003 14:58:41 +0000 Subject: [PATCH] (Bug 87) Automake 1.4 doesn't do man_MAN1 correctly (Bug 88) Fix usage info on non-long option systems (Tim Mooney) --- ChangeLog | 4 ++++ fc-cache/Makefile.am | 4 ++-- fc-cache/{fc-cache.man => fc-cache.1} | 8 +++++++- fc-cache/fc-cache.c | 19 ++++++++++++++++--- fc-list/Makefile.am | 4 ++-- fc-list/{fc-list.man => fc-list.1} | 3 ++- fc-list/fc-list.c | 11 +++++++++++ 7 files changed, 44 insertions(+), 9 deletions(-) rename fc-cache/{fc-cache.man => fc-cache.1} (83%) rename fc-list/{fc-list.man => fc-list.1} (91%) 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.man b/fc-cache/fc-cache.1 similarity index 83% rename from fc-cache/fc-cache.man rename to fc-cache/fc-cache.1 index 7a61d02..1844b3d 100644 --- a/fc-cache/fc-cache.man +++ b/fc-cache/fc-cache.1 @@ -27,7 +27,7 @@ fc-cache, fonts.cache \- create an index of FreeType font files in a directory .SH SYNOPSIS .B "fc-cache" -.RI [ directory-name +.RI [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [ directory-name \|.\|.\|. ] .SH DESCRIPTION If directory arguments are not given, @@ -36,6 +36,12 @@ 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 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-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.man b/fc-list/fc-list.1 similarity index 91% rename from fc-list/fc-list.man rename to fc-list/fc-list.1 index c1e6336..4efa37c 100644 --- a/fc-list/fc-list.man +++ b/fc-list/fc-list.1 @@ -27,10 +27,11 @@ fc-list \- list available fonts .SH SYNOPSIS .B "fc-list" -.RI [ font-pattern ] +.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); } -- 2.39.5