walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Observe blanks to compute correct languages in fc-query/fc-scan 

Added --ignore-blanks option to get back the behavior.

https://bugs.freedesktop.org/show_bug.cgi?id=79955
This commit is contained in:
Akira TAGOH 2015-04-22 19:37:46 +09:00
parent 4a6f5efd5f
commit 4c040d393d
4 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fc-query/fc-query.c
View File

@ -52,6 +52,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <getopt.h> #include <getopt.h>
static const struct option longopts[] = { static const struct option longopts[] = {
{"ignore-blanks", 0, 0, 'b'},
{"index", 1, 0, 'i'}, {"index", 1, 0, 'i'},
{"format", 1, 0, 'f'}, {"format", 1, 0, 'f'},
{"version", 0, 0, 'V'}, {"version", 0, 0, 'V'},
@ -70,15 +71,16 @@ usage (char *program, int error)
{ {
FILE *file = error ? stderr : stdout; FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG #if HAVE_GETOPT_LONG
fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] [--index index] [--format FORMAT] [--version] [--help] font-file...\n", fprintf (file, "usage: %s [-Vbh] [-i index] [-f FORMAT] [--ignore-blanks] [--index index] [--format FORMAT] [--version] [--help] font-file...\n",
program); program);
#else #else
fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] font-file...\n", fprintf (file, "usage: %s [-Vbh] [-i index] [-f FORMAT] font-file...\n",
program); program);
#endif #endif
fprintf (file, "Query font files and print resulting pattern(s)\n"); fprintf (file, "Query font files and print resulting pattern(s)\n");
fprintf (file, "\n"); fprintf (file, "\n");
#if HAVE_GETOPT_LONG #if HAVE_GETOPT_LONG
fprintf (file, " -b, --ignore-blanks ignore blanks to compute langauges\n");
fprintf (file, " -i, --index INDEX display the INDEX face of each font file only\n"); fprintf (file, " -i, --index INDEX display the INDEX face of each font file only\n");
fprintf (file, " -f, --format=FORMAT use the given output format\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, " -V, --version display font config version and exit\n");
@ -97,19 +99,24 @@ main (int argc, char **argv)
{ {
int index_set = 0; int index_set = 0;
int set_index = 0; int set_index = 0;
int ignore_blanks = 0;
FcChar8 *format = NULL; FcChar8 *format = NULL;
FcBlanks *blanks = NULL;
int err = 0; int err = 0;
int i; int i;
#if HAVE_GETOPT_LONG || HAVE_GETOPT #if HAVE_GETOPT_LONG || HAVE_GETOPT
int c; int c;
#if HAVE_GETOPT_LONG #if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "i:f:Vh", longopts, NULL)) != -1) while ((c = getopt_long (argc, argv, "bi:f:Vh", longopts, NULL)) != -1)
#else #else
while ((c = getopt (argc, argv, "i:f:Vh")) != -1) while ((c = getopt (argc, argv, "bi:f:Vh")) != -1)
#endif #endif
{ {
switch (c) { switch (c) {
case 'b':
ignore_blanks = 1;
break;
case 'i': case 'i':
index_set = 1; index_set = 1;
set_index = atoi (optarg); set_index = atoi (optarg);
@ -135,6 +142,8 @@ main (int argc, char **argv)
if (i == argc) if (i == argc)
usage (argv[0], 1); usage (argv[0], 1);
if (!ignore_blanks)
blanks = FcConfigGetBlanks (NULL);
for (; i < argc; i++) for (; i < argc; i++)
{ {
int index; int index;
@ -145,7 +154,7 @@ main (int argc, char **argv)
do { do {
FcPattern *pat; FcPattern *pat;
pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, NULL, &count); pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, blanks, &count);
if (pat) if (pat)
{ {
if (format) if (format)

12
fc-query/fc-query.sgml
View File

@ -64,6 +64,10 @@ manpage.1: manpage.sgml
<arg><option>-Vh</option></arg> <arg><option>-Vh</option></arg>
<sbr> <sbr>
<group>
<arg><option>-b</option></arg>
<arg><option>--ignore-blanks</option></arg>
</group>
<group> <group>
<arg><option>-i</option> <option><replaceable>index</replaceable></option></arg> <arg><option>-i</option> <option><replaceable>index</replaceable></option></arg>
<arg><option>--index</option> <option><replaceable>index</replaceable></option></arg> <arg><option>--index</option> <option><replaceable>index</replaceable></option></arg>
@ -96,6 +100,14 @@ manpage.1: manpage.sgml
options is included below.</para> options is included below.</para>
<variablelist> <variablelist>
<varlistentry>
<term><option>-b</option>
<option>--ignore-blanks</option>
</term>
<listitem>
<para>Ignore blanks to compute languages</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>-i</option> <term><option>-i</option>
<option>--index</option> <option>--index</option>

21
fc-scan/fc-scan.c
View File

@ -52,6 +52,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <getopt.h> #include <getopt.h>
static const struct option longopts[] = { static const struct option longopts[] = {
{"ignore-blanks", 0, 0, 'b'},
{"format", 1, 0, 'f'}, {"format", 1, 0, 'f'},
{"version", 0, 0, 'V'}, {"version", 0, 0, 'V'},
{"help", 0, 0, 'h'}, {"help", 0, 0, 'h'},
@ -69,15 +70,16 @@ usage (char *program, int error)
{ {
FILE *file = error ? stderr : stdout; FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG #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); program);
#else #else
fprintf (file, "usage: %s [-Vh] [-f FORMAT] font-file...\n", fprintf (file, "usage: %s [-Vbh] [-f FORMAT] font-file...\n",
program); program);
#endif #endif
fprintf (file, "Scan font files and directories, and print resulting pattern(s)\n"); fprintf (file, "Scan font files and directories, and print resulting pattern(s)\n");
fprintf (file, "\n"); fprintf (file, "\n");
#if HAVE_GETOPT_LONG #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, " -f, --format=FORMAT use the given output format\n");
fprintf (file, " -V, --version display font config version and exit\n"); fprintf (file, " -V, --version display font config version and exit\n");
fprintf (file, " -h, --help display this help and exit\n"); fprintf (file, " -h, --help display this help and exit\n");
@ -94,17 +96,22 @@ main (int argc, char **argv)
{ {
FcChar8 *format = NULL; FcChar8 *format = NULL;
int i; int i;
int ignore_blanks = 0;
FcFontSet *fs; FcFontSet *fs;
FcBlanks *blanks = NULL;
#if HAVE_GETOPT_LONG || HAVE_GETOPT #if HAVE_GETOPT_LONG || HAVE_GETOPT
int c; int c;
#if HAVE_GETOPT_LONG #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 #else
while ((c = getopt (argc, argv, "f:Vh")) != -1) while ((c = getopt (argc, argv, "bf:Vh")) != -1)
#endif #endif
{ {
switch (c) { switch (c) {
case 'b':
ignore_blanks = 1;
break;
case 'f': case 'f':
format = (FcChar8 *) strdup (optarg); format = (FcChar8 *) strdup (optarg);
break; break;
@ -127,20 +134,22 @@ main (int argc, char **argv)
usage (argv[0], 1); usage (argv[0], 1);
fs = FcFontSetCreate (); fs = FcFontSetCreate ();
if (!ignore_blanks)
blanks = FcConfigGetBlanks (NULL);
for (; i < argc; i++) for (; i < argc; i++)
{ {
const FcChar8 *file = (FcChar8*) argv[i]; const FcChar8 *file = (FcChar8*) argv[i];
if (!FcFileIsDir (file)) if (!FcFileIsDir (file))
FcFileScan (fs, NULL, NULL, NULL, file, FcTrue); FcFileScan (fs, NULL, NULL, blanks, file, FcTrue);
else else
{ {
FcStrSet *dirs = FcStrSetCreate (); FcStrSet *dirs = FcStrSetCreate ();
FcStrList *strlist = FcStrListCreate (dirs); FcStrList *strlist = FcStrListCreate (dirs);
do do
{ {
FcDirScan (fs, dirs, NULL, NULL, file, FcTrue); FcDirScan (fs, dirs, NULL, blanks, file, FcTrue);
} }
while ((file = FcStrListNext (strlist))); while ((file = FcStrListNext (strlist)));
FcStrListDone (strlist); FcStrListDone (strlist);

14
fc-scan/fc-scan.sgml
View File

@ -62,8 +62,12 @@ manpage.1: manpage.sgml
<cmdsynopsis> <cmdsynopsis>
<command>&dhpackage;</command> <command>&dhpackage;</command>
<arg><option>-Vh</option></arg> <arg><option>-Vbh</option></arg>
<sbr> <sbr>
<group>
<arg><option>-b</option></arg>
<arg><option>--ignore-blanks</option></arg>
</group>
<group> <group>
<arg><option>-f</option> <option><replaceable>format</replaceable></option></arg> <arg><option>-f</option> <option><replaceable>format</replaceable></option></arg>
<arg><option>--format</option> <option><replaceable>format</replaceable></option></arg> <arg><option>--format</option> <option><replaceable>format</replaceable></option></arg>
@ -90,6 +94,14 @@ manpage.1: manpage.sgml
options is included below.</para> options is included below.</para>
<variablelist> <variablelist>
<varlistentry>
<term><option>-b</option>
<option>--ignore-blanks</option>
</term>
<listitem>
<para>Ignore blanks to compute languages</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>-f</option> <term><option>-f</option>
<option>--format</option> <option>--format</option>