diff --git a/.gitignore b/.gitignore
index 1c44392..3879fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,8 @@ fc-match/fc-match
fc-match/fc-match.1
fc-query/fc-query
fc-query/fc-query.1
+fc-scan/fc-scan
+fc-scan/fc-scan.1
src/fontconfig.def
fcalias.h
fcaliastail.h
diff --git a/Makefile.am b/Makefile.am
index 45c71bc..e982dd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
DOCSRC=@DOCSRC@
SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
- fc-cache fc-cat fc-list fc-match fc-query conf.d $(DOCSRC) test
+ fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test
EXTRA_DIST = \
fontconfig.pc.in \
diff --git a/configure.in b/configure.in
index bd843a2..bbca05a 100644
--- a/configure.in
+++ b/configure.in
@@ -565,6 +565,7 @@ fc-cat/Makefile
fc-list/Makefile
fc-match/Makefile
fc-query/Makefile
+fc-scan/Makefile
doc/Makefile
doc/version.sgml
test/Makefile
diff --git a/doc/fcfile.fncs b/doc/fcfile.fncs
index 7a98044..1f324b1 100644
--- a/doc/fcfile.fncs
+++ b/doc/fcfile.fncs
@@ -29,7 +29,7 @@
@TYPE3@ FcFileCache * @ARG3@ cache
@TYPE4@ FcBlanks * @ARG4@ blanks
@TYPE5@ const FcChar8 * @ARG5@ file
-@TYPE6@ FcBool% @ARG6@ force
+@TYPE6@ FcBool% @ARG6@ force
@PURPOSE@ scan a font file
@DESC@
Scans a single file and adds all fonts found to set.
@@ -61,15 +61,15 @@ returns FcFalse.
@TYPE3@ FcFileCache * @ARG3@ cache
@TYPE4@ FcBlanks * @ARG4@ blanks
@TYPE5@ const FcChar8 * @ARG5@ dir
-@TYPE6@ FcBool% @ARG6@ force
-@PURPOSE@ DEPRECATED: formerly used to scan a font directory
+@TYPE6@ FcBool% @ARG6@ force
+@PURPOSE@ scan a font directory without caching it
@DESC@
-This function does nothing aside from returning FcFalse. It used to scan an
-entire directory and add all fonts found to
-set. If force was FcTrue, then
-the directory and all files within it were scanned even if information was
-present in the per-directory cache file or cache. Any
-subdirectories found were added to dirs.
+If cache is not zero or if force
+is FcFalse, this function currently returns FcFalse. Otherwise, it scans an
+entire directory and adds all fonts found to set.
+Any subdirectories found are added to dirs. Calling
+this function does not create any cache files. Use FcDirCacheRead() if
+caching is desired.
@@
@RET@ FcBool
diff --git a/fc-cache/fc-cache.sgml b/fc-cache/fc-cache.sgml
index 20a7e85..fb9f96d 100644
--- a/fc-cache/fc-cache.sgml
+++ b/fc-cache/fc-cache.sgml
@@ -179,6 +179,7 @@ manpage.1: manpage.sgml
fc-list(1)
fc-match(1)
fc-query(1)
+ fc-scan(1)
The fontconfig user's guide, in HTML format:
diff --git a/fc-cat/fc-cat.sgml b/fc-cat/fc-cat.sgml
index 69482b5..b042dc6 100644
--- a/fc-cat/fc-cat.sgml
+++ b/fc-cat/fc-cat.sgml
@@ -135,6 +135,7 @@ manpage.1: manpage.sgml
fc-list(1)
fc-match(1)
fc-query(1)
+ fc-scan(1)
The fontconfig user's guide, in HTML format:
diff --git a/fc-list/fc-list.sgml b/fc-list/fc-list.sgml
index 5807ed1..cc98779 100644
--- a/fc-list/fc-list.sgml
+++ b/fc-list/fc-list.sgml
@@ -174,12 +174,13 @@ manpage.1: manpage.sgml
SEE ALSO
- fc-cat(1)
- fc-cache(1)
fc-match(1)
- fc-query(1)
FcFontList(3)
FcPatternFormat(3)
+ fc-cat(1)
+ fc-cache(1)
+ fc-query(1)
+ fc-scan(1)
The fontconfig user's guide, in HTML format:
diff --git a/fc-match/fc-match.sgml b/fc-match/fc-match.sgml
index bb0d84e..8c71033 100644
--- a/fc-match/fc-match.sgml
+++ b/fc-match/fc-match.sgml
@@ -164,13 +164,14 @@ are printed. The option works like
SEE ALSO
- fc-cat(1)
- fc-cache(1)
fc-list(1)
- fc-query(1)
FcFontMatch(3)
FcFontSort(3)
FcPatternFormat(3)
+ fc-cat(1)
+ fc-cache(1)
+ fc-query(1)
+ fc-scal(1)
The fontconfig user's guide, in HTML format:
diff --git a/fc-query/fc-query.sgml b/fc-query/fc-query.sgml
index e363db5..59fd635 100644
--- a/fc-query/fc-query.sgml
+++ b/fc-query/fc-query.sgml
@@ -152,12 +152,13 @@ manpage.1: manpage.sgml
SEE ALSO
+ fc-scan(1)
+ FcFreeTypeQuery(3)
+ FcPatternFormat(3)
fc-cat(1)
fc-cache(1)
fc-list(1)
fc-match(1)
- FcFreeTypeQuery(3)
- FcPatternFormat(3)
The fontconfig user's guide, in HTML format:
diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
new file mode 100644
index 0000000..cb7f5ab
--- /dev/null
+++ b/fc-scan/Makefile.am
@@ -0,0 +1,59 @@
+#
+# fontconfig/fc-scan/Makefile.am
+#
+# Copyright © 2003 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.
+
+bin_PROGRAMS=fc-scan
+
+DOC2MAN = docbook2man
+
+FC_SCAN_SRC=${top_srcdir}/fc-scan
+
+SGML = ${FC_SCAN_SRC}/fc-scan.sgml
+
+INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+
+BUILT_MANS=fc-scan.1
+
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-scan.sgml $(BUILT_MANS)
+
+fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la
+
+if USEDOCBOOK
+
+${man_MANS}: ${SGML}
+ $(RM) $@
+ $(DOC2MAN) ${SGML}
+ $(RM) manpage.refs manpage.links
+
+all-local: $(man_MANS)
+
+clean-local:
+ $(RM) $(man_MANS)
+
+else
+all-local:
+clean-local:
+endif
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
new file mode 100644
index 0000000..573f7ef
--- /dev/null
+++ b/fc-scan/fc-scan.c
@@ -0,0 +1,181 @@
+/*
+ * fontconfig/fc-scan/fc-scan.c
+ *
+ * Copyright © 2003 Keith Packard
+ * Copyright © 2008 Red Hat, Inc.
+ * Red Hat Author(s): Behdad Esfahbod
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include
+#else
+#ifdef linux
+#define HAVE_GETOPT_LONG 1
+#endif
+#define HAVE_GETOPT 1
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifndef HAVE_GETOPT
+#define HAVE_GETOPT 0
+#endif
+#ifndef HAVE_GETOPT_LONG
+#define HAVE_GETOPT_LONG 0
+#endif
+
+#if HAVE_GETOPT_LONG
+#undef _GNU_SOURCE
+#define _GNU_SOURCE
+#include
+static const struct option longopts[] = {
+ {"format", 1, 0, 'f'},
+ {"version", 0, 0, 'V'},
+ {"help", 0, 0, 'h'},
+ {NULL,0,0,0},
+};
+#else
+#if HAVE_GETOPT
+extern char *optarg;
+extern int optind, opterr, optopt;
+#endif
+#endif
+
+static void
+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",
+ program);
+#else
+ fprintf (file, "usage: %s [-Vh] [-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, " -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");
+#endif
+ exit (error);
+}
+
+int
+main (int argc, char **argv)
+{
+ FcChar8 *format = NULL;
+ int i;
+ FcFontSet *fs;
+#if HAVE_GETOPT_LONG || HAVE_GETOPT
+ int c;
+
+#if HAVE_GETOPT_LONG
+ while ((c = getopt_long (argc, argv, "f:Vh", longopts, NULL)) != -1)
+#else
+ while ((c = getopt (argc, argv, "f:Vh")) != -1)
+#endif
+ {
+ switch (c) {
+ 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 'h':
+ usage (argv[0], 0);
+ default:
+ usage (argv[0], 1);
+ }
+ }
+ i = optind;
+#else
+ i = 1;
+#endif
+
+ if (i == argc)
+ usage (argv[0], 1);
+
+ if (!FcInit ())
+ {
+ fprintf (stderr, "Can't init font config library\n");
+ return 1;
+ }
+
+ fs = FcFontSetCreate ();
+
+ for (; i < argc; i++)
+ {
+ const FcChar8 *file = (FcChar8*) argv[i];
+
+ if (!FcFileIsDir (file))
+ FcFileScan (fs, NULL, NULL, NULL, file, FcTrue);
+ else
+ {
+ FcStrSet *dirs = FcStrSetCreate ();
+ FcStrList *strlist = FcStrListCreate (dirs);
+ do
+ {
+ FcDirScan (fs, dirs, NULL, NULL, file, FcTrue);
+ }
+ while ((file = FcStrListNext (strlist)));
+ FcStrListDone (strlist);
+ FcStrSetDestroy (dirs);
+ }
+ }
+
+ for (i = 0; i < fs->nfont; i++)
+ {
+ FcPattern *pat;
+
+ pat = fs->fonts[i];
+
+ if (format)
+ {
+ FcChar8 *s;
+
+ s = FcPatternFormat (pat, format);
+ printf ("%s", s);
+ free (s);
+ }
+ else
+ {
+ FcPatternPrint (pat);
+ }
+ }
+
+ FcFontSetDestroy (fs);
+
+ FcFini ();
+ return i > 0 ? 0 : 1;
+}
diff --git a/fc-scan/fc-scan.sgml b/fc-scan/fc-scan.sgml
new file mode 100644
index 0000000..c527c56
--- /dev/null
+++ b/fc-scan/fc-scan.sgml
@@ -0,0 +1,176 @@
+ manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+
+ Behdad">
+ Esfahbod">
+
+ Jan 15, 2009">
+
+ 1">
+ behdad@behdad.org">
+
+ fc-scan">
+
+
+ GNU">
+ GPL">
+]>
+
+
+
+
+ &dhemail;
+
+
+ &dhfirstname;
+ &dhsurname;
+
+
+ 2008
+ &dhusername;
+
+ &dhdate;
+
+
+ &dhucpackage;
+
+ &dhsection;
+
+
+ &dhpackage;
+
+ scan font files or directories
+
+
+
+ &dhpackage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DESCRIPTION
+
+ &dhpackage; scans
+ file(s) recursively
+ and prints out font pattern for each face found.
+
+
+
+ OPTIONS
+
+ This program follows the usual &gnu; command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below.
+
+
+
+
+
+
+
+
+ Format output according to the format specifier
+ format.
+
+
+
+
+
+
+
+ Show version of the program and exit.
+
+
+
+
+
+
+
+ Show summary of options.
+
+
+
+
+
+
+ Scan file recursively for font faces.
+
+
+
+
+
+
+ RETURN CODES
+ fc-scan returns error code 0 if at least one font
+ was found or 1 otherwise.
+
+
+
+ SEE ALSO
+
+
+ fc-query(1)
+ FcFileScan(3)
+ FcDirScan(3)
+ FcPatternFormat(3)
+ fc-cat(1)
+ fc-cache(1)
+ fc-list(1)
+ fc-match(1)
+
+
+ The fontconfig user's guide, in HTML format:
+ /usr/share/doc/fontconfig/fontconfig-user.html.
+
+
+
+ AUTHOR
+
+ This manual page was updated by &dhusername; &dhemail;.
+
+
+
+
+