diff options
Diffstat (limited to 'fontconfig/fc-scan')
| -rw-r--r-- | fontconfig/fc-scan/fc-scan.c | 28 | ||||
| -rw-r--r-- | fontconfig/fc-scan/fc-scan.sgml | 14 |
2 files changed, 32 insertions, 10 deletions
diff --git a/fontconfig/fc-scan/fc-scan.c b/fontconfig/fc-scan/fc-scan.c index 5638b51cf..4d0b1db44 100644 --- a/fontconfig/fc-scan/fc-scan.c +++ b/fontconfig/fc-scan/fc-scan.c @@ -52,6 +52,7 @@ #define _GNU_SOURCE #include <getopt.h> static const struct option longopts[] = { + {"ignore-blanks", 0, 0, 'b'}, {"format", 1, 0, 'f'}, {"version", 0, 0, 'V'}, {"help", 0, 0, 'h'}, @@ -69,22 +70,24 @@ usage (char *program, int error) { FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (file, "usage: %s [-Vh] [-f FORMAT] [--format FORMAT] [--version] [--help] font-file...\n", + fprintf (file, "usage: %s [-Vbh] [-f FORMAT] [--ignore-blanks] [--format FORMAT] [--version] [--help] font-file...\n", program); #else - fprintf (file, "usage: %s [-Vh] [-f FORMAT] font-file...\n", + fprintf (file, "usage: %s [-Vbh] [-f FORMAT] font-file...\n", program); #endif fprintf (file, "Scan font files and directories, and print resulting pattern(s)\n"); fprintf (file, "\n"); #if HAVE_GETOPT_LONG + fprintf (file, " -b, --ignore-blanks ignore blanks to compute languages\n"); fprintf (file, " -f, --format=FORMAT use the given output format\n"); fprintf (file, " -V, --version display font config version and exit\n"); fprintf (file, " -h, --help display this help and exit\n"); #else - fprintf (file, " -f FORMAT (format) use the given output format\n"); - fprintf (file, " -V (version) display font config version and exit\n"); - fprintf (file, " -h (help) display this help and exit\n"); + fprintf (file, " -b (ignore-blanks) ignore blanks to compute languages\n"); + fprintf (file, " -f FORMAT (format) use the given output format\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); #endif exit (error); } @@ -94,17 +97,22 @@ main (int argc, char **argv) { FcChar8 *format = NULL; int i; + int ignore_blanks = 0; FcFontSet *fs; + FcBlanks *blanks = NULL; #if HAVE_GETOPT_LONG || HAVE_GETOPT int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "f:Vh", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "f:Vh")) != -1) + while ((c = getopt (argc, argv, "bf:Vh")) != -1) #endif { switch (c) { + case 'b': + ignore_blanks = 1; + break; case 'f': format = (FcChar8 *) strdup (optarg); break; @@ -127,20 +135,22 @@ main (int argc, char **argv) usage (argv[0], 1); fs = FcFontSetCreate (); + if (!ignore_blanks) + blanks = FcConfigGetBlanks (NULL); for (; i < argc; i++) { const FcChar8 *file = (FcChar8*) argv[i]; if (!FcFileIsDir (file)) - FcFileScan (fs, NULL, NULL, NULL, file, FcTrue); + FcFileScan (fs, NULL, NULL, blanks, file, FcTrue); else { FcStrSet *dirs = FcStrSetCreate (); FcStrList *strlist = FcStrListCreate (dirs); do { - FcDirScan (fs, dirs, NULL, NULL, file, FcTrue); + FcDirScan (fs, dirs, NULL, blanks, file, FcTrue); } while ((file = FcStrListNext (strlist))); FcStrListDone (strlist); diff --git a/fontconfig/fc-scan/fc-scan.sgml b/fontconfig/fc-scan/fc-scan.sgml index 9af403c1f..65a66c4f3 100644 --- a/fontconfig/fc-scan/fc-scan.sgml +++ b/fontconfig/fc-scan/fc-scan.sgml @@ -62,9 +62,13 @@ manpage.1: manpage.sgml <cmdsynopsis> <command>&dhpackage;</command> - <arg><option>-Vh</option></arg> + <arg><option>-Vbh</option></arg> <sbr> <group> + <arg><option>-b</option></arg> + <arg><option>--ignore-blanks</option></arg> + </group> + <group> <arg><option>-f</option> <option><replaceable>format</replaceable></option></arg> <arg><option>--format</option> <option><replaceable>format</replaceable></option></arg> </group> @@ -91,6 +95,14 @@ manpage.1: manpage.sgml <variablelist> <varlistentry> + <term><option>-b</option> + <option>--ignore-blanks</option> + </term> + <listitem> + <para>Ignore blanks to compute languages</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>-f</option> <option>--format</option> <option><replaceable>format</replaceable></option> |