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

[font] Add hb_font_get_var_named_instance() 

Two new API:
+HB_FONT_NO_VAR_NAMED_INSTANCE
+hb_font_get_var_named_instance
This commit is contained in:
Behdad Esfahbod 2023-01-15 10:54:01 -07:00
parent 40bf30bfeb
commit 99838770ab
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/harfbuzz-sections.txt
View File

@ -411,7 +411,9 @@ hb_font_get_scale
hb_font_set_synthetic_slant hb_font_set_synthetic_slant
hb_font_get_synthetic_slant hb_font_get_synthetic_slant
hb_font_set_variations hb_font_set_variations
HB_FONT_NO_VAR_NAMED_INSTANCE
hb_font_set_var_named_instance hb_font_set_var_named_instance
hb_font_get_var_named_instance
hb_font_set_var_coords_design hb_font_set_var_coords_design
hb_font_get_var_coords_design hb_font_get_var_coords_design
hb_font_set_var_coords_normalized hb_font_set_var_coords_normalized

28
src/hb-font.cc
View File

@ -1776,7 +1776,7 @@ DEFINE_NULL_INSTANCE (hb_font_t) =
0, /* y_ppem */ 0, /* y_ppem */
0, /* ptem */ 0, /* ptem */
(unsigned) -1, /* instance_index */ HB_FONT_NO_VAR_NAMED_INSTANCE, /* instance_index */
0, /* num_coords */ 0, /* num_coords */
nullptr, /* coords */ nullptr, /* coords */
nullptr, /* design_coords */ nullptr, /* design_coords */
@ -1806,7 +1806,7 @@ _hb_font_create (hb_face_t *face)
font->x_scale = font->y_scale = face->get_upem (); font->x_scale = font->y_scale = face->get_upem ();
font->x_multf = font->y_multf = 1.f; font->x_multf = font->y_multf = 1.f;
font->x_mult = font->y_mult = 1 << 16; font->x_mult = font->y_mult = 1 << 16;
font->instance_index = (unsigned) -1; font->instance_index = HB_FONT_NO_VAR_NAMED_INSTANCE;
return font; return font;
} }
@ -2515,7 +2515,7 @@ hb_font_set_variations (hb_font_t *font,
font->serial_coords = ++font->serial; font->serial_coords = ++font->serial;
if (!variations_length && font->instance_index == (unsigned) -1) if (!variations_length && font->instance_index == HB_FONT_NO_VAR_NAMED_INSTANCE)
{ {
hb_font_set_var_coords_normalized (font, nullptr, 0); hb_font_set_var_coords_normalized (font, nullptr, 0);
return; return;
@ -2536,7 +2536,7 @@ hb_font_set_variations (hb_font_t *font,
} }
/* Initialize design coords. */ /* Initialize design coords. */
if (font->instance_index == (unsigned) -1) if (font->instance_index == HB_FONT_NO_VAR_NAMED_INSTANCE)
for (unsigned int i = 0; i < coords_length; i++) for (unsigned int i = 0; i < coords_length; i++)
design_coords[i] = axes[i].get_default (); design_coords[i] = axes[i].get_default ();
else else
@ -2608,13 +2608,13 @@ hb_font_set_var_coords_design (hb_font_t *font,
* @font: a font. * @font: a font.
* @instance_index: named instance index. * @instance_index: named instance index.
* *
* Sets design coords of a font from a named instance index. * Sets design coords of a font from a named-instance index.
* *
* Since: 2.6.0 * Since: 2.6.0
*/ */
void void
hb_font_set_var_named_instance (hb_font_t *font, hb_font_set_var_named_instance (hb_font_t *font,
unsigned instance_index) unsigned int instance_index)
{ {
if (hb_object_is_immutable (font)) if (hb_object_is_immutable (font))
return; return;
@ -2628,6 +2628,22 @@ hb_font_set_var_named_instance (hb_font_t *font,
hb_font_set_variations (font, nullptr, 0); hb_font_set_variations (font, nullptr, 0);
} }
/**
* hb_font_get_var_named_instance:
* @font: a font.
*
* Returns the currently-set named-instance index of the font.
*
* Return value: Named-instance index or %HB_FONT_NO_VAR_NAMED_INSTANCE.
*
* Since: REPLACEME
**/
unsigned int
hb_font_get_var_named_instance (hb_font_t *font)
{
return font->instance_index;
}
/** /**
* hb_font_set_var_coords_normalized: * hb_font_set_var_coords_normalized:
* @font: #hb_font_t to work upon * @font: #hb_font_t to work upon

15
src/hb-font.h
View File

@ -1160,10 +1160,23 @@ HB_EXTERN const int *
hb_font_get_var_coords_normalized (hb_font_t *font, hb_font_get_var_coords_normalized (hb_font_t *font,
unsigned int *length); unsigned int *length);
/**
* HB_FONT_NO_VAR_NAMED_INSTANCE:
*
* Constant signifying that a font does not have any
* named-instance index set. This is the default of
* a font.
*
* Since: REPLACEME
*/
#define HB_FONT_NO_VAR_NAMED_INSTANCE 0xFFFFFFFF
HB_EXTERN void HB_EXTERN void
hb_font_set_var_named_instance (hb_font_t *font, hb_font_set_var_named_instance (hb_font_t *font,
unsigned instance_index); unsigned int instance_index);
HB_EXTERN unsigned int
hb_font_get_var_named_instance (hb_font_t *font);
HB_END_DECLS HB_END_DECLS