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

Let pattern FC_FONT_VARIATIONS override standard axis variations 

Ie. flip the merge order.
This commit is contained in:
Behdad Esfahbod 2017-12-19 15:51:16 -05:00
parent 650b051a25
commit 6d1d44d5ec
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fcmatch.c
View File

@ -540,12 +540,7 @@ FcFontRenderPrepare (FcConfig *config,
FcPatternObjectGetBool (font, FC_VARIABLE_OBJECT, 0, &variable); FcPatternObjectGetBool (font, FC_VARIABLE_OBJECT, 0, &variable);
assert (variable != FcDontCare); assert (variable != FcDontCare);
if (variable) if (variable)
{
FcChar8 *vars = NULL;
FcStrBufInit (&variations, NULL, 0); FcStrBufInit (&variations, NULL, 0);
if (FcPatternObjectGetString (pat, FC_FONT_VARIATIONS_OBJECT, 0, &vars) == FcResultMatch)
FcStrBufString (&variations, vars);
}
new = FcPatternCreate (); new = FcPatternCreate ();
if (!new) if (!new)
@ -739,11 +734,18 @@ FcFontRenderPrepare (FcConfig *config,
} }
} }
if (variable) if (variable && variations.len)
{ {
FcPatternObjectDel (new, FC_FONT_VARIATIONS_OBJECT); FcChar8 *vars = NULL;
FcPatternObjectAddString (new, FC_FONT_VARIATIONS_OBJECT, FcStrBufDoneStatic (&variations)); if (FcPatternObjectGetString (new, FC_FONT_VARIATIONS_OBJECT, 0, &vars) == FcResultMatch)
FcStrBufDestroy (&variations); {
FcStrBufChar (&variations, ',');
FcStrBufString (&variations, vars);
FcPatternObjectDel (new, FC_FONT_VARIATIONS_OBJECT);
}
FcPatternObjectAddString (new, FC_FONT_VARIATIONS_OBJECT, FcStrBufDoneStatic (&variations));
FcStrBufDestroy (&variations);
} }
FcConfigSubstituteWithPat (config, new, pat, FcMatchFont); FcConfigSubstituteWithPat (config, new, pat, FcMatchFont);