[fcformat] Add element filtering and deletion

[fontconfig.git] / fc-match / fc-match.c

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 05bf7746a01da4db213690be17e1cca4db9d3b5f..86ff25387b09e02b4a085927ee99dc8092126027 100644 (file)
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -51,9 +51,10 @@
 static const struct option longopts[] = {
     {"sort", 0, 0, 's'},
     {"all", 0, 0, 'a'},
-    {"version", 0, 0, 'V'},
     {"verbose", 0, 0, 'v'},
-    {"help", 0, 0, '?'},
+    {"format", 1, 0, 'f'},
+    {"version", 0, 0, 'V'},
+    {"help", 0, 0, 'h'},
     {NULL,0,0,0},
 };
 #else
@@ -63,31 +64,35 @@ 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 [-savV?] [--sort] [--all] [--verbose] [--version] [--help] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [--sort] [--all] [--verbose] [--format=FORMAT] [--version] [--help] [pattern] {element...}\n",
             program);
 #else
-    fprintf (stderr, "usage: %s [-savV?] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n",
             program);
 #endif
-    fprintf (stderr, "List fonts matching [pattern]\n");
-    fprintf (stderr, "\n");
+    fprintf (file, "List best font matching [pattern]\n");
+    fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "  -s, --sort           display sorted list of matches\n");
-    fprintf (stderr, "  -a, --all            display unpruned 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 verbosely\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, "  -a         (all)     display unpruned 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 verbosely\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
@@ -95,7 +100,9 @@ main (int argc, char **argv)
 {
     int                verbose = 0;
     int                sort = 0, all = 0;
+    FcChar8     *format = NULL;
     int                i;
+    FcObjectSet *os = 0;
     FcFontSet  *fs;
     FcPattern   *pat;
     FcResult   result;
@@ -103,9 +110,9 @@ main (int argc, char **argv)
     int                c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "asVv?", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "asVv?")) != -1)
+    while ((c = getopt (argc, argv, "asvf:Vh")) != -1)
 #endif
     {
        switch (c) {
@@ -115,15 +122,20 @@ main (int argc, char **argv)
        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;
@@ -137,7 +149,15 @@ main (int argc, char **argv)
        return 1;
     }
     if (argv[i])
+    {
        pat = FcNameParse ((FcChar8 *) argv[i]);
+       while (argv[++i])
+       {
+           if (!os)
+               os = FcObjectSetCreate ();
+           FcObjectSetAdd (os, argv[i]);
+       }
+    }
     else
        pat = FcPatternCreate ();
 
@@ -181,9 +201,31 @@ main (int argc, char **argv)
 
        for (j = 0; j < fs->nfont; j++)
        {
+           FcPattern *font;
+
+           font = FcPatternFilter (fs->fonts[j], os);
+
            if (verbose)
            {
-               FcPatternPrint (fs->fonts[j]);
+               FcPatternPrint (font);
+           }
+           else if (format)
+           {
+               FcChar8 *s;
+
+               s = FcPatternFormat (font, format);
+               if (s)
+               {
+                   printf ("%s", s);
+                   free (s);
+               }
+           }
+           else if (os)
+           {
+               FcChar8 *str;
+               str = FcNameUnparse (font);
+               printf ("%s\n", str);
+               free (str);
            }
            else
            {
@@ -191,7 +233,7 @@ main (int argc, char **argv)
                FcChar8 *style;
                FcChar8 *file;
 
-               if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) != FcResultMatch)
+               if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch)
                    file = (FcChar8 *) "<unknown filename>";
                else
                {
@@ -199,16 +241,23 @@ main (int argc, char **argv)
                    if (slash)
                        file = slash+1;
                }
-               if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &family) != FcResultMatch)
+               if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch)
                    family = (FcChar8 *) "<unknown family>";
-               if (FcPatternGetString (fs->fonts[j], FC_STYLE, 0, &style) != FcResultMatch)
+               if (FcPatternGetString (font, FC_STYLE, 0, &style) != FcResultMatch)
                    style = (FcChar8 *) "<unknown style>";
 
                printf ("%s: \"%s\" \"%s\"\n", file, family, style);
            }
+
+           FcPatternDestroy (font);
        }
        FcFontSetDestroy (fs);
     }
+
+    if (os)
+       FcObjectSetDestroy (os);
+
     FcFini ();
+
     return 0;
 }