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

[fcformat] Enumerate langsets like we do arrays of values 

If one asks for a format like '%{[]elt{expr}}' and the first value
for elt is a langset, we enumerate the langset languages in expr.
This commit is contained in:
Behdad Esfahbod 2009-02-13 16:33:58 -08:00
parent d62b85af21
commit 9d58d01c5c
1 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/fcformat.c
View File

@ -31,7 +31,6 @@
/* /*
* Some ideas for future syntax extensions: * Some ideas for future syntax extensions:
* *
* - langset enumeration using same syntax as array enumeration
* - allow indexing subexprs using '%{[idx]elt1,elt2{subexpr}}' * - allow indexing subexprs using '%{[idx]elt1,elt2{subexpr}}'
* - conditional/filtering/deletion on binding (using '(w)'/'(s)'/'(=)' notation) * - conditional/filtering/deletion on binding (using '(w)'/'(s)'/'(=)' notation)
*/ */
@ -540,6 +539,7 @@ interpret_array (FcFormatContext *c,
const FcChar8 *format_save; const FcChar8 *format_save;
int idx; int idx;
FcBool ret, done; FcBool ret, done;
FcStrList *lang_strs;
if (!expect_char (c, '[') || if (!expect_char (c, '[') ||
!expect_char (c, ']')) !expect_char (c, ']'))
@ -562,6 +562,22 @@ interpret_array (FcFormatContext *c,
} }
while (consume_char (c, ',')); while (consume_char (c, ','));
/* If we have one element and it's of type FcLangSet, we want
* to enumerate the languages in it. */
lang_strs = NULL;
if (os->nobject == 1)
{
FcLangSet *langset;
if (FcResultMatch ==
FcPatternGetLangSet (pat, os->objects[0], idx, &langset))
{
FcStrSet *ss;
if (!(ss = FcLangSetGetLangs (langset)) ||
!(lang_strs = FcStrListCreate (ss)))
goto bail0;
}
}
subpat = FcPatternDuplicate (pat); subpat = FcPatternDuplicate (pat);
if (!subpat) if (!subpat)
goto bail0; goto bail0;
@ -574,22 +590,36 @@ interpret_array (FcFormatContext *c,
done = FcTrue; done = FcTrue;
for (i = 0; i < os->nobject; i++) if (lang_strs)
{ {
FcValue v; FcChar8 *lang;
/* XXX this can be optimized by accessing valuelist linked lists FcPatternDel (subpat, os->objects[0]);
* directly and remembering where we were. Most (all) value lists if ((lang = FcStrListNext (lang_strs)))
* in normal uses are pretty short though (language tags are
* stored as a LangSet, not separate values.). */
FcPatternDel (subpat, os->objects[i]);
if (FcResultMatch ==
FcPatternGet (pat, os->objects[i], idx, &v))
{ {
FcPatternAdd (subpat, os->objects[i], v, FcFalse); FcPatternAddString (subpat, os->objects[0], lang);
done = FcFalse; done = FcFalse;
} }
} }
else
{
for (i = 0; i < os->nobject; i++)
{
FcValue v;
/* XXX this can be optimized by accessing valuelist linked lists
* directly and remembering where we were. Most (all) value lists
* in normal uses are pretty short though (language tags are
* stored as a LangSet, not separate values.). */
FcPatternDel (subpat, os->objects[i]);
if (FcResultMatch ==
FcPatternGet (pat, os->objects[i], idx, &v))
{
FcPatternAdd (subpat, os->objects[i], v, FcFalse);
done = FcFalse;
}
}
}
if (!done) if (!done)
{ {
@ -602,9 +632,14 @@ interpret_array (FcFormatContext *c,
idx++; idx++;
} while (!done); } while (!done);
if (c->format == format_save)
skip_subexpr (c);
bail: bail:
FcPatternDestroy (subpat); FcPatternDestroy (subpat);
bail0: bail0:
if (lang_strs)
FcStrListDone (lang_strs);
FcObjectSetDestroy (os); FcObjectSetDestroy (os);
return ret; return ret;