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

Add Regular style when no meta data available to guess a style 

This makes sure that fullname can be constructed at least even if a style is missing
and "Regular" is omitted for fullname so this change won't affect in that case.

Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/259
This commit is contained in:
Akira TAGOH 2020-09-21 14:48:43 +09:00
parent dbd67ccc63
commit 5a291467a7
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fcfreetype.c
View File

@ -1625,13 +1625,26 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
++nfamily;
}
if (!variable && !nstyle && face->style_name &&
FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->style_name, (FcChar8 *) "") != 0)
if (!variable && !nstyle)
{
if (FcDebug () & FC_DBG_SCANV)
printf ("using FreeType style \"%s\"\n", face->style_name);
const FcChar8 *style_regular = (const FcChar8 *) "Regular";
const FcChar8 *ss;
if (!FcPatternObjectAddString (pat, FC_STYLE_OBJECT, (FcChar8 *) face->style_name))
if (face->style_name &&
FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->style_name, (FcChar8 *) "") != 0)
{
if (FcDebug () & FC_DBG_SCANV)
printf ("using FreeType style \"%s\"\n", face->style_name);
ss = (const FcChar8 *) face->style_name;
}
else
{
if (FcDebug () & FC_DBG_SCANV)
printf ("applying default style Regular\n");
ss = style_regular;
}
if (!FcPatternObjectAddString (pat, FC_STYLE_OBJECT, ss))
goto bail1;
if (!FcPatternObjectAddString (pat, FC_STYLELANG_OBJECT, (FcChar8 *) "en"))
goto bail1;