[math] Shorten names a bit

This commit is contained in:
Behdad Esfahbod 2018-11-05 23:28:52 -05:00
parent 737efbe655
commit 61f52231f4
2 changed files with 21 additions and 16 deletions

View File

@ -700,10 +700,10 @@ struct MATH
hb_font_t *font) const hb_font_t *font) const
{ return (this+mathConstants).get_value (constant, font); } { return (this+mathConstants).get_value (constant, font); }
inline const MathGlyphInfo &get_math_glyph_info (void) const inline const MathGlyphInfo &get_glyph_info (void) const
{ return this+mathGlyphInfo; } { return this+mathGlyphInfo; }
inline const MathVariants &get_math_variants (void) const inline const MathVariants &get_variants (void) const
{ return this+mathVariants; } { return this+mathVariants; }
protected: protected:

View File

@ -96,7 +96,7 @@ hb_position_t
hb_ot_math_get_glyph_italics_correction (hb_font_t *font, hb_ot_math_get_glyph_italics_correction (hb_font_t *font,
hb_codepoint_t glyph) hb_codepoint_t glyph)
{ {
return font->face->table.MATH->get_math_glyph_info().get_italics_correction (glyph, font); return font->face->table.MATH->get_glyph_info().get_italics_correction (glyph, font);
} }
/** /**
@ -112,7 +112,7 @@ hb_position_t
hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font, hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font,
hb_codepoint_t glyph) hb_codepoint_t glyph)
{ {
return font->face->table.MATH->get_math_glyph_info().get_top_accent_attachment (glyph, font); return font->face->table.MATH->get_glyph_info().get_top_accent_attachment (glyph, font);
} }
/** /**
@ -128,7 +128,7 @@ hb_bool_t
hb_ot_math_is_glyph_extended_shape (hb_face_t *face, hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
hb_codepoint_t glyph) hb_codepoint_t glyph)
{ {
return face->table.MATH->get_math_glyph_info().is_extended_shape (glyph); return face->table.MATH->get_glyph_info().is_extended_shape (glyph);
} }
/** /**
@ -154,7 +154,10 @@ hb_ot_math_get_glyph_kerning (hb_font_t *font,
hb_ot_math_kern_t kern, hb_ot_math_kern_t kern,
hb_position_t correction_height) hb_position_t correction_height)
{ {
return font->face->table.MATH->get_math_glyph_info().get_kerning (glyph, kern, correction_height, font); return font->face->table.MATH->get_glyph_info().get_kerning (glyph,
kern,
correction_height,
font);
} }
/** /**
@ -184,10 +187,10 @@ hb_ot_math_get_glyph_variants (hb_font_t *font,
unsigned int *variants_count, /* IN/OUT */ unsigned int *variants_count, /* IN/OUT */
hb_ot_math_glyph_variant_t *variants /* OUT */) hb_ot_math_glyph_variant_t *variants /* OUT */)
{ {
return font->face->table.MATH->get_math_variants().get_glyph_variants (glyph, direction, font, return font->face->table.MATH->get_variants().get_glyph_variants (glyph, direction, font,
start_offset, start_offset,
variants_count, variants_count,
variants); variants);
} }
/** /**
@ -208,7 +211,7 @@ hb_position_t
hb_ot_math_get_min_connector_overlap (hb_font_t *font, hb_ot_math_get_min_connector_overlap (hb_font_t *font,
hb_direction_t direction) hb_direction_t direction)
{ {
return font->face->table.MATH->get_math_variants().get_min_connector_overlap (direction, font); return font->face->table.MATH->get_variants().get_min_connector_overlap (direction, font);
} }
/** /**
@ -240,9 +243,11 @@ hb_ot_math_get_glyph_assembly (hb_font_t *font,
hb_ot_math_glyph_part_t *parts, /* OUT */ hb_ot_math_glyph_part_t *parts, /* OUT */
hb_position_t *italics_correction /* OUT */) hb_position_t *italics_correction /* OUT */)
{ {
return font->face->table.MATH->get_math_variants().get_glyph_parts (glyph, direction, font, return font->face->table.MATH->get_variants().get_glyph_parts (glyph,
start_offset, direction,
parts_count, font,
parts, start_offset,
italics_correction); parts_count,
parts,
italics_correction);
} }