diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-06-01 21:14:56 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-06-24 13:52:11 -0400 |
| commit | 8ea654b2aa6b4e97b369e299325da49807559511 (patch) | |
| tree | a3b7c47f18300904e12bd27b31ce85ecc066905a | |
| parent | 76845a40c58b092a9b1812830dc98b6f32e13da6 (diff) | |
Use/prefer WWS family/style (name table id 21/22)
| -rw-r--r-- | src/fcfreetype.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 0bc52d12..3dd8a9c3 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -1091,10 +1091,16 @@ static const FT_UShort platform_order[] = { #define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0])) 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_FONT_FAMILY, TT_NAME_ID_MAC_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_FONT_SUBFAMILY, TT_NAME_ID_TRADEMARK, @@ -1236,6 +1242,9 @@ FcFreeTypeQueryFace (const FT_Face face, continue; 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_FONT_FAMILY: #if 0 @@ -1266,6 +1275,9 @@ FcFreeTypeQueryFace (const FT_Face face, np = &nfullname; nlangp = &nfullname_lang; break; +#ifdef TT_NAME_ID_WWS_SUBFAMILY + case TT_NAME_ID_WWS_SUBFAMILY: +#endif case TT_NAME_ID_PREFERRED_SUBFAMILY: case TT_NAME_ID_FONT_SUBFAMILY: if (FcDebug () & FC_DBG_SCANV) |