X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-match%2Ffc-match.c;h=c40290546ba35236c46300dfff746cb032ee3ccd;hb=0c93b91db0cdf7c5e901477c266b45c8baeadd00;hp=bf9817b8064d83bcdbc4075a7a1896350f6e79ef;hpb=0602c605af04ea73af700b223ec4ac1dfd5a36f1;p=fontconfig.git

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index bf9817b..c402905 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -1,5 +1,5 @@
 /*
- * $RCSId: xc/lib/fontconfig/fc-list/fc-list.c,v 1.5 2002/06/30 23:45:40 keithp Exp $
+ * fontconfig/fc-match/fc-match.c
  *
  * Copyright © 2003 Keith Packard
  *
@@ -50,9 +50,11 @@
 #include <getopt.h>
 static const struct option longopts[] = {
     {"sort", 0, 0, 's'},
-    {"version", 0, 0, 'V'},
+    {"all", 0, 0, 'a'},
     {"verbose", 0, 0, 'v'},
-    {"help", 0, 0, '?'},
+    {"format", 1, 0, 'f'},
+    {"version", 0, 0, 'V'},
+    {"help", 0, 0, 'h'},
     {NULL,0,0,0},
 };
 #else
@@ -62,36 +64,43 @@ extern int optind, opterr, optopt;
 #endif
 #endif
 
-static void usage (char *program)
+static void
+usage (char *program, int error)
 {
+    FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "usage: %s [-svV?] [--sort] [--verbose] [--version] [--help] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [--sort] [--all] [--verbose] [--format=FORMAT] [--version] [--help] [pattern]\n",
 	     program);
 #else
-    fprintf (stderr, "usage: %s [-svV?] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [pattern]\n",
 	     program);
 #endif
-    fprintf (stderr, "List fonts matching [pattern]\n");
-    fprintf (stderr, "\n");
+    fprintf (file, "List fonts matching [pattern]\n");
+    fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "  -s, --sort           display sorted list of matches\n");
-    fprintf (stderr, "  -v, --verbose        display entire font pattern\n");
-    fprintf (stderr, "  -V, --version        display font config version and exit\n");
-    fprintf (stderr, "  -?, --help           display this help and exit\n");
+    fprintf (file, "  -s, --sort           display sorted list of matches\n");
+    fprintf (file, "  -a, --all            display unpruned sorted list of matches\n");
+    fprintf (file, "  -v, --verbose        display entire font pattern\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 (stderr, "  -s,        (sort)    display sorted list of matches\n");
-    fprintf (stderr, "  -v         (verbose) display entire font pattern\n");
-    fprintf (stderr, "  -V         (version) display font config version and exit\n");
-    fprintf (stderr, "  -?         (help)    display this help and exit\n");
+    fprintf (file, "  -s,        (sort)    display sorted list of matches\n");
+    fprintf (file, "  -a         (all)     display unpruned sorted list of matches\n");
+    fprintf (file, "  -v         (verbose) display entire font pattern\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 (1);
+    exit (error);
 }
 
 int
 main (int argc, char **argv)
 {
     int		verbose = 0;
-    int		sort = 0;
+    int		sort = 0, all = 0;
+    FcChar8     *format = NULL;
     int		i;
     FcFontSet	*fs;
     FcPattern   *pat;
@@ -100,24 +109,32 @@ main (int argc, char **argv)
     int		c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "sVv?", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "sVv?")) != -1)
+    while ((c = getopt (argc, argv, "asvf:Vh")) != -1)
 #endif
     {
 	switch (c) {
+	case 'a':
+	    all = 1;
+	    break;
 	case 's':
 	    sort = 1;
 	    break;
+	case 'v':
+	    verbose = 1;
+	    break;
+	case 'f':
+	    format = (FcChar8 *) strdup (optarg);
+	    break;
 	case 'V':
 	    fprintf (stderr, "fontconfig version %d.%d.%d\n", 
 		     FC_MAJOR, FC_MINOR, FC_REVISION);
 	    exit (0);
-	case 'v':
-	    verbose = 1;
-	    break;
+	case 'h':
+	    usage (argv[0], 0);
 	default:
-	    usage (argv[0]);
+	    usage (argv[0], 1);
 	}
     }
     i = optind;
@@ -143,11 +160,11 @@ main (int argc, char **argv)
     
     fs = FcFontSetCreate ();
 
-    if (sort)
+    if (sort || all)
     {
 	FcFontSet	*font_patterns;
 	int	j;
-	font_patterns = FcFontSort (0, pat, FcTrue, 0, &result);
+	font_patterns = FcFontSort (0, pat, all ? FcFalse : FcTrue, 0, &result);
 
 	for (j = 0; j < font_patterns->nfont; j++)
 	{
@@ -179,6 +196,14 @@ main (int argc, char **argv)
 	    {
 		FcPatternPrint (fs->fonts[j]);
 	    }
+	    else if (format)
+	    {
+	        FcChar8 *s;
+
+		s = FcPatternFormat (fs->fonts[j], format);
+		printf ("%s", s);
+		free (s);
+	    }
 	    else
 	    {
 		FcChar8	*family;
@@ -196,7 +221,7 @@ main (int argc, char **argv)
 		if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &family) != FcResultMatch)
 		    family = (FcChar8 *) "<unknown family>";
 		if (FcPatternGetString (fs->fonts[j], FC_STYLE, 0, &style) != FcResultMatch)
-		    file = (FcChar8 *) "<unknown style>";
+		    style = (FcChar8 *) "<unknown style>";
 
 		printf ("%s: \"%s\" \"%s\"\n", file, family, style);
 	    }