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

Use/prefer WWS family/style (name table id 21/22)

This commit is contained in:
Behdad Esfahbod 2009-06-01 21:14:56 -04:00
parent 76845a40c5
commit 8ea654b2aa
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fcfreetype.c
View File

@ -1091,10 +1091,16 @@ static const FT_UShort platform_order[] = {
#define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0])) #define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0]))
static const FT_UShort nameid_order[] = { static const FT_UShort nameid_order[] = {
#ifdef TT_NAME_ID_WWS_FAMILY
TT_NAME_ID_WWS_FAMILY,
#endif
TT_NAME_ID_PREFERRED_FAMILY, TT_NAME_ID_PREFERRED_FAMILY,
TT_NAME_ID_FONT_FAMILY, TT_NAME_ID_FONT_FAMILY,
TT_NAME_ID_MAC_FULL_NAME, TT_NAME_ID_MAC_FULL_NAME,
TT_NAME_ID_FULL_NAME, TT_NAME_ID_FULL_NAME,
#ifdef TT_NAME_ID_WWS_SUBFAMILY
TT_NAME_ID_WWS_SUBFAMILY,
#endif
TT_NAME_ID_PREFERRED_SUBFAMILY, TT_NAME_ID_PREFERRED_SUBFAMILY,
TT_NAME_ID_FONT_SUBFAMILY, TT_NAME_ID_FONT_SUBFAMILY,
TT_NAME_ID_TRADEMARK, TT_NAME_ID_TRADEMARK,
@ -1236,6 +1242,9 @@ FcFreeTypeQueryFace (const FT_Face face,
continue; continue;
switch (sname.name_id) { switch (sname.name_id) {
#ifdef TT_NAME_ID_WWS_FAMILY
case TT_NAME_ID_WWS_FAMILY:
#endif
case TT_NAME_ID_PREFERRED_FAMILY: case TT_NAME_ID_PREFERRED_FAMILY:
case TT_NAME_ID_FONT_FAMILY: case TT_NAME_ID_FONT_FAMILY:
#if 0 #if 0
@ -1266,6 +1275,9 @@ FcFreeTypeQueryFace (const FT_Face face,
np = &nfullname; np = &nfullname;
nlangp = &nfullname_lang; nlangp = &nfullname_lang;
break; break;
#ifdef TT_NAME_ID_WWS_SUBFAMILY
case TT_NAME_ID_WWS_SUBFAMILY:
#endif
case TT_NAME_ID_PREFERRED_SUBFAMILY: case TT_NAME_ID_PREFERRED_SUBFAMILY:
case TT_NAME_ID_FONT_SUBFAMILY: case TT_NAME_ID_FONT_SUBFAMILY:
if (FcDebug () & FC_DBG_SCANV) if (FcDebug () & FC_DBG_SCANV)