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

[varfonts] Query varfonts if id >> 16 == 0x8000 

If "instance-number" part of face id is set to 0x8000, return a pattern
for variable font as a whole.  This might have a range for weight, width,
and size.

If no variation is found, NULL is returned.

Not hooked up to FcQueryFaceAll() yet.  For now, can be triggered using
fc-query -i 0x80000000
This commit is contained in:
Behdad Esfahbod 2017-09-13 03:35:02 -04:00
parent d3a7c3ce69
commit 83b4161108
1 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/fcfreetype.c
View File

@ -1165,6 +1165,10 @@ FcFreeTypeQueryFace (const FT_Face face,
int weight = -1; int weight = -1;
int width = -1; int width = -1;
FcBool decorative = FcFalse; FcBool decorative = FcFalse;
FcBool variable = FcFalse;
FcBool variable_weight = FcFalse;
FcBool variable_width = FcFalse;
FcBool variable_size = FcFalse;
FcCharSet *cs; FcCharSet *cs;
FcLangSet *ls; FcLangSet *ls;
#if 0 #if 0
@ -1206,8 +1210,6 @@ FcFreeTypeQueryFace (const FT_Face face,
char psname[256]; char psname[256];
const char *tmp; const char *tmp;
FcRange *r = NULL;
FcBool symbol = FcFalse; FcBool symbol = FcFalse;
FcInitDebug (); /* We might be called with no initizalization whatsoever. */ FcInitDebug (); /* We might be called with no initizalization whatsoever. */
@ -1236,20 +1238,70 @@ FcFreeTypeQueryFace (const FT_Face face,
goto bail1; goto bail1;
} }
if (!FcPatternAddBool (pat, FC_VARIABLE, FcFalse))
goto bail1;
if (id >> 16) if (id >> 16)
{ {
unsigned int instance_id = (id >> 16) - 1; if (FT_Get_MM_Var (face, &master))
if (!FT_Get_MM_Var (face, &master) && instance_id < master->num_namedstyles) goto bail1;
instance = &master->namedstyle[instance_id];
if (instance) if (id >> 16 == 0x8000)
{
/* Query variable font itself. */
unsigned int i;
for (i = 0; i < master->num_axis; i++)
{
double min_value = master->axis[i].minimum / (double) (1 << 16);
double def_value = master->axis[i].def / (double) (1 << 16);
double max_value = master->axis[i].maximum / (double) (1 << 16);
const char *elt = NULL;
if (min_value > def_value || def_value > max_value || min_value == max_value)
continue;
switch (master->axis[i].tag)
{
case FT_MAKE_TAG ('w','g','h','t'):
elt = FC_WEIGHT;
variable = variable_weight = FcTrue;
weight = 0; /* To stop looking for weight. */
break;
case FT_MAKE_TAG ('w','d','t','h'):
elt = FC_WIDTH;
variable = variable_width = FcTrue;
width = 0; /* To stop looking for width. */
break;
case FT_MAKE_TAG ('o','p','s','z'):
elt = FC_SIZE;
variable = variable_size = FcTrue;
break;
}
if (elt)
{
FcRange *r = FcRangeCreateDouble (min_value, max_value);
if (!FcPatternAddRange (pat, elt, r))
{
FcRangeDestroy (r);
goto bail1;
}
FcRangeDestroy (r);
}
}
if (!variable)
goto bail1;
id &= 0xFFFF;
}
else if ((id >> 16) - 1 < master->num_namedstyles)
{ {
/* Pull out weight and width from named-instance. */ /* Pull out weight and width from named-instance. */
unsigned int i; unsigned int i;
instance = &master->namedstyle[(id >> 16) - 1];
for (i = 0; i < master->num_axis; i++) for (i = 0; i < master->num_axis; i++)
{ {
double value = instance->coords[i] / (double) (1 << 16); double value = instance->coords[i] / (double) (1 << 16);
@ -1273,6 +1325,8 @@ FcFreeTypeQueryFace (const FT_Face face,
else else
goto bail1; goto bail1;
} }
if (!FcPatternAddBool (pat, FC_VARIABLE, variable))
goto bail1;
/* /*
* Get the OS/2 table * Get the OS/2 table
@ -1685,9 +1739,10 @@ FcFreeTypeQueryFace (const FT_Face face,
} }
#if defined (HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE) && defined (HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE) #if defined (HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE) && defined (HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE)
if (os2 && os2->version >= 0x0005 && os2->version != 0xffff) if (!variable_size && os2 && os2->version >= 0x0005 && os2->version != 0xffff)
{ {
double lower_size, upper_size; double lower_size, upper_size;
FcRange *r;
/* usLowerPointSize and usUpperPointSize is actually twips */ /* usLowerPointSize and usUpperPointSize is actually twips */
lower_size = os2->usLowerOpticalPointSize / 20.0L; lower_size = os2->usLowerOpticalPointSize / 20.0L;
@ -1841,10 +1896,10 @@ FcFreeTypeQueryFace (const FT_Face face,
if (!FcPatternAddInteger (pat, FC_SLANT, slant)) if (!FcPatternAddInteger (pat, FC_SLANT, slant))
goto bail1; goto bail1;
if (!FcPatternAddInteger (pat, FC_WEIGHT, weight)) if (!variable_weight && !FcPatternAddInteger (pat, FC_WEIGHT, weight))
goto bail1; goto bail1;
if (!FcPatternAddInteger (pat, FC_WIDTH, width)) if (!variable_width && !FcPatternAddInteger (pat, FC_WIDTH, width))
goto bail1; goto bail1;
if (!FcPatternAddString (pat, FC_FOUNDRY, foundry)) if (!FcPatternAddString (pat, FC_FOUNDRY, foundry))
@ -1983,7 +2038,7 @@ FcFreeTypeQuery(const FcChar8 *file,
if (FT_Init_FreeType (&ftLibrary)) if (FT_Init_FreeType (&ftLibrary))
return NULL; return NULL;
if (FT_New_Face (ftLibrary, (char *) file, id, &face)) if (FT_New_Face (ftLibrary, (char *) file, id & 0x7FFFFFFFF, &face))
goto bail; goto bail;
if (count) if (count)
@ -2023,7 +2078,7 @@ FcFreeTypeQueryAll(const FcChar8 *file,
FcPattern *pat; FcPattern *pat;
id = ((instance_num << 16) + face_num); id = ((instance_num << 16) + face_num);
if (FT_New_Face (ftLibrary, (const char *) file, id, &face)) if (FT_New_Face (ftLibrary, (const char *) file, id & 0x7FFFFFFF, &face))
break; break;
num_faces = face->num_faces; num_faces = face->num_faces;