diff options
Diffstat (limited to 'src/3rdparty/harfbuzz-ng/src/hb-style.cc')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-style.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-style.cc b/src/3rdparty/harfbuzz-ng/src/hb-style.cc index dfb1017c88..bd5cb5c6be 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-style.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-style.cc @@ -46,15 +46,14 @@ static inline float _hb_angle_to_ratio (float a) { - return tanf (a * float (M_PI / 180.)); + return tanf (a * -HB_PI / 180.f); } -#if 0 + static inline float _hb_ratio_to_angle (float r) { - return atanf (r) * float (180. / M_PI); + return atanf (r) * -180.f / HB_PI; } -#endif /** * hb_style_get_value: @@ -109,11 +108,20 @@ hb_style_get_value (hb_font_t *font, hb_style_tag_t style_tag) : 12.f; } case HB_STYLE_TAG_SLANT_ANGLE: - return face->table.post->table->italicAngle.to_float (); + { + float angle = face->table.post->table->italicAngle.to_float (); + + if (font->slant) + angle = _hb_ratio_to_angle (font->slant + _hb_angle_to_ratio (angle)); + + return angle; + } case HB_STYLE_TAG_WIDTH: return face->table.OS2->has_data () ? face->table.OS2->get_width () - : (face->table.head->is_condensed () ? 75 : 100); + : (face->table.head->is_condensed () ? 75 : + face->table.head->is_expanded () ? 125 : + 100); case HB_STYLE_TAG_WEIGHT: return face->table.OS2->has_data () ? face->table.OS2->usWeightClass |