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

Add proper fullname for named-instances 

Try to build a fullname from a family and a style name for a named-instance.

Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/185
This commit is contained in:
Akira TAGOH 2019-12-09 20:11:50 +09:00
parent 8bddcb1137
commit 452be8125f
1 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/fcfreetype.c
View File

@ -1495,7 +1495,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
* and treat the instance's nameid as FONT_SUBFAMILY.
* Postscript name is automatically handled by FreeType. */
if (nameid == TT_NAME_ID_WWS_SUBFAMILY ||
nameid == TT_NAME_ID_PREFERRED_SUBFAMILY)
nameid == TT_NAME_ID_PREFERRED_SUBFAMILY ||
nameid == TT_NAME_ID_FULL_NAME)
continue;
if (nameid == TT_NAME_ID_FONT_SUBFAMILY)
@ -1681,6 +1682,61 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
++nfamily;
}
/* Add the fullname into the cache */
if (!variable && !nfullname)
{
FcChar8 *family, *style, *lang;
int n = 0;
size_t len, i;
FcStrBuf sbuf;
while (FcPatternObjectGetString (pat, FC_FAMILYLANG_OBJECT, n, &lang) == FcResultMatch)
{
if (FcStrCmp (lang, (const FcChar8 *) "en") == 0)
break;
n++;
lang = NULL;
}
if (!lang)
n = 0;
if (FcPatternObjectGetString (pat, FC_FAMILY_OBJECT, n, &family) != FcResultMatch)
goto bail1;
len = strlen ((const char *) family);
for (i = len; i > 0; i--)
{
if (!isspace (family[i]))
break;
}
family[i] = 0;
while (FcPatternObjectGetString (pat, FC_STYLELANG_OBJECT, n, &lang) == FcResultMatch)
{
if (FcStrCmp (lang, (const FcChar8 *) "en") == 0)
break;
n++;
lang = NULL;
}
if (!lang)
n = 0;
if (FcPatternObjectGetString (pat, FC_STYLE_OBJECT, n, &style) != FcResultMatch)
goto bail1;
len = strlen ((const char *) style);
for (i = 0; style[i] != 0 && isspace (style[i]); i++)
break;
memcpy (style, &style[i], len - i);
FcStrBufInit (&sbuf, NULL, 0);
FcStrBufString (&sbuf, family);
FcStrBufChar (&sbuf, ' ');
FcStrBufString (&sbuf, style);
if (!FcPatternObjectAddString (pat, FC_FULLNAME_OBJECT, FcStrBufDoneStatic (&sbuf)))
{
FcStrBufDestroy (&sbuf);
goto bail1;
}
FcStrBufDestroy (&sbuf);
if (!FcPatternObjectAddString (pat, FC_FULLNAMELANG_OBJECT, (const FcChar8 *) "en"))
goto bail1;
++nfullname;
}
/* Add the PostScript name into the cache */
if (!variable)
{