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

[fcformat] Support 'default value' for simple tags 

The format '%{family:-XXX} prints XٓٓٓٓXX if the element family is not defined.
Also works for things like '%{family[1]:-XXX}'.
This commit is contained in:
Behdad Esfahbod 2009-02-11 23:55:11 -05:00
parent 9c83a8376f
commit 0673ef3881
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fcformat.c
View File

@ -33,14 +33,12 @@
* *
* - array enumeration using '%{[]family,familylang{expr}|decorator}' * - array enumeration using '%{[]family,familylang{expr}|decorator}'
* - langset enumeration using same syntax as array enumeration * - langset enumeration using same syntax as array enumeration
* - allow indexing simple tags using '%{elt[idx]}'
* - 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)
*/ */
/* fc-match needs '<unknown filename>', etc handling. */ #define FCMATCH_FORMAT "%{file:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\""
#define FCMATCH_FORMAT "%{file|basename}: \"%{family[0]}\" \"%{style[0]}\""
#define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}" #define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}"
@ -247,7 +245,7 @@ interpret_builtin (FcFormatContext *c,
else if (0 == strcmp ((const char *) c->word, name))\ else if (0 == strcmp ((const char *) c->word, name))\
do { new_str = func (pat); ret = FcTrue; } while (0) do { new_str = func (pat); ret = FcTrue; } while (0)
BUILTIN ("unparse", FcNameUnparse); BUILTIN ("unparse", FcNameUnparse);
/* BUILTIN ("verbose", FcPatternPrint); */ /* BUILTIN ("verbose", FcPatternPrint); XXX */
#undef BUILTIN #undef BUILTIN
else else
ret = FcFalse; ret = FcFalse;
@ -543,6 +541,7 @@ interpret_simple (FcFormatContext *c,
FcBool add_colon = FcFalse; FcBool add_colon = FcFalse;
FcBool add_elt_name = FcFalse; FcBool add_elt_name = FcFalse;
int idx; int idx;
FcChar8 *else_string;
if (consume_char (c, ':')) if (consume_char (c, ':'))
add_colon = FcTrue; add_colon = FcTrue;
@ -566,6 +565,25 @@ interpret_simple (FcFormatContext *c,
if (consume_char (c, '=')) if (consume_char (c, '='))
add_elt_name = FcTrue; add_elt_name = FcTrue;
/* modifiers */
else_string = NULL;
if (consume_char (c, ':'))
{
FcChar8 *orig;
/* divert the c->word for now */
orig = c->word;
c->word = c->word + strlen ((const char *) c->word) + 1;
/* for now we just support 'default value' */
if (!expect_char (c, '-') ||
!read_chars (c, '\0'))
{
c->word = orig;
return FcFalse;
}
else_string = c->word;
c->word = orig;
}
e = FcPatternObjectFindElt (pat, e = FcPatternObjectFindElt (pat,
FcObjectFromName ((const char *) c->word)); FcObjectFromName ((const char *) c->word));
if (e) if (e)
@ -604,6 +622,8 @@ interpret_simple (FcFormatContext *c,
else else
notfound: notfound:
{ {
if (else_string)
printf ("%s", else_string);
} }
return FcTrue; return FcTrue;
@ -752,7 +772,7 @@ translate_chars (FcFormatContext *c,
from_len = strlen (from); from_len = strlen (from);
to = from + from_len + 1; to = from + from_len + 1;
/* hack: we temporarily diverge c->word */ /* hack: we temporarily divert c->word */
c->word = (FcChar8 *) to; c->word = (FcChar8 *) to;
if (!read_chars (c, ')')) if (!read_chars (c, ')'))
{ {