svn merge ^/branches/released .

3 files changed, 539 insertions, 538 deletions

diff --git a/fontconfig/fc-match/Makefile.am b/fontconfig/fc-match/Makefile.am
index 9d725a582..f4244b6a5 100644
--- a/fontconfig/fc-match/Makefile.am
+++ b/fontconfig/fc-match/Makefile.am
@@ -1,59 +1,59 @@
-# 
-#  fontconfig/fc-match/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.
-# 
-#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL THE AUTHOR(S) 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-match
-
-DOC2MAN = docbook2man
-
-FC_MATCH_SRC=${top_srcdir}/fc-match
-
-SGML = ${FC_MATCH_SRC}/fc-match.sgml
-
-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
-
-BUILT_MANS=fc-match.1
-
-if ENABLE_DOCS
-man_MANS=${BUILT_MANS}
-endif
-
-EXTRA_DIST=fc-match.sgml $(BUILT_MANS)
-
-fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
-
-if USEDOCBOOK
-
-${man_MANS}: ${SGML}
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
-
-all-local: $(man_MANS)
-
-clean-local:
-	$(RM) $(man_MANS)
-
-else
-all-local:
-clean-local:
-endif
+# 

+#  fontconfig/fc-match/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 the author(s) not be used in

+#  advertising or publicity pertaining to distribution of the software without

+#  specific, written prior permission.  The authors make no

+#  representations about the suitability of this software for any purpose.  It

+#  is provided "as is" without express or implied warranty.

+# 

+#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+#  EVENT SHALL THE AUTHOR(S) 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-match

+

+DOC2MAN = docbook2man

+

+FC_MATCH_SRC=${top_srcdir}/fc-match

+

+SGML = ${FC_MATCH_SRC}/fc-match.sgml

+

+INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)

+

+BUILT_MANS=fc-match.1

+

+if ENABLE_DOCS

+man_MANS=${BUILT_MANS}

+endif

+

+EXTRA_DIST=fc-match.sgml $(BUILT_MANS)

+

+fc_match_LDADD = ${top_builddir}/src/libfontconfig.la

+

+if USEDOCBOOK

+

+${man_MANS}: ${SGML}

+	$(RM) $@

+	$(DOC2MAN) ${SGML}

+	$(RM) manpage.*

+

+all-local: $(man_MANS)

+

+clean-local:

+	$(RM) $(man_MANS)

+

+else

+all-local:

+clean-local:

+endif

diff --git a/fontconfig/fc-match/fc-match.c b/fontconfig/fc-match/fc-match.c
index 8963e7af3..14f38ff30 100644
--- a/fontconfig/fc-match/fc-match.c
+++ b/fontconfig/fc-match/fc-match.c
@@ -1,263 +1,263 @@
-/*
- * fontconfig/fc-match/fc-match.c
- *
- * 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.
- *
- * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR(S) 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 <config.h>
-#else
-#ifdef linux
-#define HAVE_GETOPT_LONG 1
-#endif
-#define HAVE_GETOPT 1
-#endif
-
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#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 <getopt.h>
-static const struct option longopts[] = {
-    {"sort", 0, 0, 's'},
-    {"all", 0, 0, 'a'},
-    {"verbose", 0, 0, 'v'},
-    {"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 [-savVh] [-f FORMAT] [--sort] [--all] [--verbose] [--format=FORMAT] [--version] [--help] [pattern] {element...}\n",
-	     program);
-#else
-    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n",
-	     program);
-#endif
-    fprintf (file, "List best font matching [pattern]\n");
-    fprintf (file, "\n");
-#if HAVE_GETOPT_LONG
-    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 (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 (error);
-}
-
-int
-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;
-#if HAVE_GETOPT_LONG || HAVE_GETOPT
-    int		c;
-
-#if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1)
-#else
-    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 'h':
-	    usage (argv[0], 0);
-	default:
-	    usage (argv[0], 1);
-	}
-    }
-    i = optind;
-#else
-    i = 1;
-#endif
-
-    if (!FcInit ())
-    {
-	fprintf (stderr, "Can't init font config library\n");
-	return 1;
-    }
-    if (argv[i])
-    {
-	pat = FcNameParse ((FcChar8 *) argv[i]);
-	while (argv[++i])
-	{
-	    if (!os)
-		os = FcObjectSetCreate ();
-	    FcObjectSetAdd (os, argv[i]);
-	}
-    }
-    else
-	pat = FcPatternCreate ();
-
-    if (!pat)
-	return 1;
-
-    FcConfigSubstitute (0, pat, FcMatchPattern);
-    FcDefaultSubstitute (pat);
-    
-    fs = FcFontSetCreate ();
-
-    if (sort || all)
-    {
-	FcFontSet	*font_patterns;
-	int	j;
-	font_patterns = FcFontSort (0, pat, all ? FcFalse : FcTrue, 0, &result);
-
-	for (j = 0; j < font_patterns->nfont; j++)
-	{
-	    FcPattern  *font_pattern;
-
-	    font_pattern = FcFontRenderPrepare (NULL, pat, font_patterns->fonts[j]);
-	    if (font_pattern)
-		FcFontSetAdd (fs, font_pattern);
-	}
-
-	FcFontSetSortDestroy (font_patterns);
-    }
-    else
-    {
-	FcPattern   *match;
-	match = FcFontMatch (0, pat, &result);
-	if (match)
-	    FcFontSetAdd (fs, match);
-    }
-    FcPatternDestroy (pat);
-
-    if (fs)
-    {
-	int	j;
-
-	for (j = 0; j < fs->nfont; j++)
-	{
-	    FcPattern *font;
-
-	    font = FcPatternFilter (fs->fonts[j], os);
-
-	    if (verbose)
-	    {
-		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
-	    {
-		FcChar8	*family;
-		FcChar8	*style;
-		FcChar8	*file;
-
-		if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch)
-		    file = (FcChar8 *) "<unknown filename>";
-		else
-		{
-		    FcChar8 *slash = (FcChar8 *) strrchr ((char *) file, '/');
-		    if (slash)
-			file = slash+1;
-		}
-		if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch)
-		    family = (FcChar8 *) "<unknown family>";
-		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;
-}
+/*

+ * fontconfig/fc-match/fc-match.c

+ *

+ * 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 the author(s) not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  The authors make no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE AUTHOR(S) 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 <config.h>

+#else

+#ifdef linux

+#define HAVE_GETOPT_LONG 1

+#endif

+#define HAVE_GETOPT 1

+#endif

+

+#include <fontconfig/fontconfig.h>

+#include <stdio.h>

+#include <unistd.h>

+#include <stdlib.h>

+#include <string.h>

+

+#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 <getopt.h>

+static const struct option longopts[] = {

+    {"sort", 0, 0, 's'},

+    {"all", 0, 0, 'a'},

+    {"verbose", 0, 0, 'v'},

+    {"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 [-savVh] [-f FORMAT] [--sort] [--all] [--verbose] [--format=FORMAT] [--version] [--help] [pattern] {element...}\n",

+	     program);

+#else

+    fprintf (file, "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n",

+	     program);

+#endif

+    fprintf (file, "List best font matching [pattern]\n");

+    fprintf (file, "\n");

+#if HAVE_GETOPT_LONG

+    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 (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 (error);

+}

+

+int

+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;

+#if HAVE_GETOPT_LONG || HAVE_GETOPT

+    int		c;

+

+#if HAVE_GETOPT_LONG

+    while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1)

+#else

+    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 'h':

+	    usage (argv[0], 0);

+	default:

+	    usage (argv[0], 1);

+	}

+    }

+    i = optind;

+#else

+    i = 1;

+#endif

+

+    if (!FcInit ())

+    {

+	fprintf (stderr, "Can't init font config library\n");

+	return 1;

+    }

+    if (argv[i])

+    {

+	pat = FcNameParse ((FcChar8 *) argv[i]);

+	while (argv[++i])

+	{

+	    if (!os)

+		os = FcObjectSetCreate ();

+	    FcObjectSetAdd (os, argv[i]);

+	}

+    }

+    else

+	pat = FcPatternCreate ();

+

+    if (!pat)

+	return 1;

+

+    FcConfigSubstitute (0, pat, FcMatchPattern);

+    FcDefaultSubstitute (pat);

+    

+    fs = FcFontSetCreate ();

+

+    if (sort || all)

+    {

+	FcFontSet	*font_patterns;

+	int	j;

+	font_patterns = FcFontSort (0, pat, all ? FcFalse : FcTrue, 0, &result);

+

+	for (j = 0; j < font_patterns->nfont; j++)

+	{

+	    FcPattern  *font_pattern;

+

+	    font_pattern = FcFontRenderPrepare (NULL, pat, font_patterns->fonts[j]);

+	    if (font_pattern)

+		FcFontSetAdd (fs, font_pattern);

+	}

+

+	FcFontSetSortDestroy (font_patterns);

+    }

+    else

+    {

+	FcPattern   *match;

+	match = FcFontMatch (0, pat, &result);

+	if (match)

+	    FcFontSetAdd (fs, match);

+    }

+    FcPatternDestroy (pat);

+

+    if (fs)

+    {

+	int	j;

+

+	for (j = 0; j < fs->nfont; j++)

+	{

+	    FcPattern *font;

+

+	    font = FcPatternFilter (fs->fonts[j], os);

+

+	    if (verbose)

+	    {

+		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

+	    {

+		FcChar8	*family;

+		FcChar8	*style;

+		FcChar8	*file;

+

+		if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch)

+		    file = (FcChar8 *) "<unknown filename>";

+		else

+		{

+		    FcChar8 *slash = (FcChar8 *) strrchr ((char *) file, '/');

+		    if (slash)

+			file = slash+1;

+		}

+		if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch)

+		    family = (FcChar8 *) "<unknown family>";

+		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;

+}

diff --git a/fontconfig/fc-match/fc-match.sgml b/fontconfig/fc-match/fc-match.sgml
index 390b733c3..5cc879037 100644
--- a/fontconfig/fc-match/fc-match.sgml
+++ b/fontconfig/fc-match/fc-match.sgml
@@ -1,216 +1,217 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > 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.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Patrick</firstname>">
-  <!ENTITY dhsurname   "<surname>Lam</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>Aug 13, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>plam@csail.mit.edu</email>">
-  <!ENTITY dhusername  "Patrick Lam">
-  <!ENTITY dhucpackage "<refentrytitle>fc-match</refentrytitle>">
-  <!ENTITY dhpackage   "fc-match">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>match available fonts</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-asvVh</option></arg>
-      <arg><option>--all</option></arg>
-      <arg><option>--sort</option></arg>
-      <arg><option>--verbose</option></arg>
-      <group>
-        <arg><option>-f</option> <option><replaceable>format</replaceable></option></arg>
-        <arg><option>--format</option> <option><replaceable>format</replaceable></option></arg>
-      </group>
-      <arg><option>--version</option></arg>
-      <arg><option>--help</option></arg>
-      <sbr>
-      <arg><option><replaceable>pattern</replaceable></option> <arg rep="repeat"><option><replaceable>element</replaceable></option></arg> </arg>
-      
-     </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> matches
-    <replaceable>pattern</replaceable> (empty
-pattern by default) using the normal fontconfig matching rules to find
-the best font available.  If <option>--sort</option> is given, the sorted list of best
-matching fonts is displayed.
-The <option>--all</option> option works like
-<option>--sort</option> except that no pruning is done on the list of fonts.</para>
-<para>If any elements are specified, only those are printed.
-Otherwise short file name, family, and style are printed, unless verbose
-output is requested.</para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-a</option>
-          <option>--all</option>
-        </term>
-        <listitem>
-          <para>Displays sorted list of best matching fonts, but do not do any
-		pruning on the list.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-s</option>
-          <option>--sort</option>
-        </term>
-        <listitem>
-          <para>Displays sorted list of best matching fonts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--verbose</option>
-        </term>
-        <listitem>
-          <para>Print verbose output of the whole font pattern for each match,
-	        or <replaceable>element</replaceable>s if any is
-		provided.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-f</option>
-          <option>--format</option>
-	  <option><replaceable>format</replaceable></option>
-        </term>
-        <listitem>
-          <para>Format output according to the format specifier
-	  <replaceable>format</replaceable>.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-V</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of the program and exit.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option><replaceable>pattern</replaceable></option>
-        </term>
-        <listitem>
-          <para>Displays fonts matching
-                <replaceable>pattern</replaceable> (uses empty pattern by default).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option><replaceable>element</replaceable></option>
-        </term>
-        <listitem>
-          <para>If set, the <replaceable>element</replaceable> property
-                is displayed for matching fonts.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>
-      <command>fc-list</command>(1)
-      <function>FcFontMatch</function>(3)
-      <function>FcFontSort</function>(3)
-      <function>FcPatternFormat</function>(3)
-      <command>fc-cat</command>(1)
-      <command>fc-cache</command>(1)
-      <command>fc-query</command>(1)
-      <command>fc-scal</command>(1)
-    </para>
-
-    <para>The fontconfig user's guide, in HTML format:
-      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
-
- </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was updated by &dhusername; &dhemail;.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [

+

+<!-- Process this file with docbook-to-man to generate an nroff manual

+     page: `docbook-to-man manpage.sgml > 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.

+

+  -->

+

+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->

+  <!ENTITY dhfirstname "<firstname>Patrick</firstname>">

+  <!ENTITY dhsurname   "<surname>Lam</surname>">

+  <!-- Please adjust the date whenever revising the manpage. -->

+  <!ENTITY dhdate      "<date>Aug 13, 2008</date>">

+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are

+       allowed: see man(7), man(1). -->

+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">

+  <!ENTITY dhemail     "<email>plam@csail.mit.edu</email>">

+  <!ENTITY dhusername  "Patrick Lam">

+  <!ENTITY dhucpackage "<refentrytitle>fc-match</refentrytitle>">

+  <!ENTITY dhpackage   "fc-match">

+

+  <!ENTITY debian      "<productname>Debian</productname>">

+  <!ENTITY gnu         "<acronym>GNU</acronym>">

+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">

+]>

+

+<refentry>

+  <refentryinfo>

+    <address>

+      &dhemail;

+    </address>

+    <author>

+      &dhfirstname;

+      &dhsurname;

+    </author>

+    <copyright>

+      <year>2003</year>

+      <holder>&dhusername;</holder>

+    </copyright>

+    &dhdate;

+  </refentryinfo>

+  <refmeta>

+    &dhucpackage;

+

+    &dhsection;

+  </refmeta>

+  <refnamediv>

+    <refname>&dhpackage;</refname>

+

+    <refpurpose>match available fonts</refpurpose>

+  </refnamediv>

+  <refsynopsisdiv>

+    <cmdsynopsis>

+      <command>&dhpackage;</command>

+

+      <arg><option>-asvVh</option></arg>

+      <arg><option>--all</option></arg>

+      <arg><option>--sort</option></arg>

+      <arg><option>--verbose</option></arg>

+      <group>

+        <arg><option>-f</option> <option><replaceable>format</replaceable></option></arg>

+        <arg><option>--format</option> <option><replaceable>format</replaceable></option></arg>

+      </group>

+      <arg><option>--version</option></arg>

+      <arg><option>--help</option></arg>

+      <sbr>

+      <arg><option><replaceable>pattern</replaceable></option> <arg rep="repeat"><option><replaceable>element</replaceable></option></arg> </arg>

+      

+     </cmdsynopsis>

+  </refsynopsisdiv>

+  <refsect1>

+    <title>DESCRIPTION</title>

+

+    <para><command>&dhpackage;</command> matches

+    <replaceable>pattern</replaceable> (empty

+pattern by default) using the normal fontconfig matching rules to find

+the best font available.  If <option>--sort</option> is given, the sorted list of best

+matching fonts is displayed.

+The <option>--all</option> option works like

+<option>--sort</option> except that no pruning is done on the list of fonts.</para>

+<para>If any elements are specified, only those are printed.

+Otherwise short file name, family, and style are printed, unless verbose

+output is requested.</para>

+  </refsect1>

+  <refsect1>

+    <title>OPTIONS</title>

+

+    <para>This program follows the usual &gnu; command line syntax,

+      with long options starting with two dashes (`-').  A summary of

+      options is included below.</para>

+

+    <variablelist>

+      <varlistentry>

+        <term><option>-a</option>

+          <option>--all</option>

+        </term>

+        <listitem>

+          <para>Displays sorted list of best matching fonts, but do not do any

+		pruning on the list.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option>-s</option>

+          <option>--sort</option>

+        </term>

+        <listitem>

+          <para>Displays sorted list of best matching fonts.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option>-v</option>

+          <option>--verbose</option>

+        </term>

+        <listitem>

+          <para>Print verbose output of the whole font pattern for each match,

+	        or <replaceable>element</replaceable>s if any is

+		provided.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option>-f</option>

+          <option>--format</option>

+	  <option><replaceable>format</replaceable></option>

+        </term>

+        <listitem>

+          <para>Format output according to the format specifier

+	  <replaceable>format</replaceable>.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option>-V</option>

+          <option>--version</option>

+        </term>

+        <listitem>

+          <para>Show version of the program and exit.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option>-h</option>

+          <option>--help</option>

+        </term>

+        <listitem>

+          <para>Show summary of options.</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option><replaceable>pattern</replaceable></option>

+        </term>

+        <listitem>

+          <para>Displays fonts matching

+                <replaceable>pattern</replaceable> (uses empty pattern by default).</para>

+        </listitem>

+      </varlistentry>

+      <varlistentry>

+        <term><option><replaceable>element</replaceable></option>

+        </term>

+        <listitem>

+          <para>If set, the <replaceable>element</replaceable> property

+                is displayed for matching fonts.</para>

+        </listitem>

+      </varlistentry>

+    </variablelist>

+  </refsect1>

+

+  <refsect1>

+    <title>SEE ALSO</title>

+

+    <para>

+      <command>fc-list</command>(1)

+      <function>FcFontMatch</function>(3)

+      <function>FcFontSort</function>(3)

+      <function>FcPatternFormat</function>(3)

+      <command>fc-cat</command>(1)

+      <command>fc-cache</command>(1)

+      <command>fc-pattern</command>(1)

+      <command>fc-query</command>(1)

+      <command>fc-scan</command>(1)

+    </para>

+

+    <para>The fontconfig user's guide, in HTML format:

+      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>

+

+ </refsect1>

+  <refsect1>

+    <title>AUTHOR</title>

+

+    <para>This manual page was updated by &dhusername; &dhemail;.</para>

+

+  </refsect1>

+</refentry>

+

+<!-- Keep this comment at the end of the file

+Local variables:

+mode: sgml

+sgml-omittag:t

+sgml-shorttag:t

+sgml-minimize-attributes:nil

+sgml-always-quote-attributes:t

+sgml-indent-step:2

+sgml-indent-data:t

+sgml-parent-document:nil

+sgml-default-dtd-file:nil

+sgml-exposed-tags:nil

+sgml-local-catalogs:nil

+sgml-local-ecat-files:nil

+End:

+-->