From 5ebd740ee8d28bb3fb75d95542afba8a306fd599 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 22 Apr 2025 19:28:16 -0600 Subject: [PATCH] [font] Move font_h_extents emboldening to font layer --- src/hb-font.hh | 16 +++++++++++++--- src/hb-ft.cc | 2 +- src/hb-ot-font.cc | 13 +++---------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/hb-font.hh b/src/hb-font.hh index 5e23bd040..8cab91824 100644 --- a/src/hb-font.hh +++ b/src/hb-font.hh @@ -266,9 +266,19 @@ struct hb_font_t hb_bool_t get_font_h_extents (hb_font_extents_t *extents) { hb_memset (extents, 0, sizeof (*extents)); - return klass->get.f.font_h_extents (this, user_data, - extents, - !klass->user_data ? nullptr : klass->user_data->font_h_extents); + bool ret = klass->get.f.font_h_extents (this, user_data, + extents, + !klass->user_data ? nullptr : klass->user_data->font_h_extents); + + if (ret) + { + /* Embolden */ + int y_shift = y_strength; + if (y_scale < 0) y_shift = -y_shift; + extents->ascender += y_shift; + } + + return ret; } hb_bool_t get_font_v_extents (hb_font_extents_t *extents) { diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 0c0e69386..cfb8634bf 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -797,7 +797,7 @@ hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED, metrics->line_gap = ft_face->size->metrics.height - (metrics->ascender - metrics->descender); } - metrics->ascender = (hb_position_t) (y_mult * (metrics->ascender + font->y_strength)); + metrics->ascender = (hb_position_t) (y_mult * metrics->ascender); metrics->descender = (hb_position_t) (y_mult * metrics->descender); metrics->line_gap = (hb_position_t) (y_mult * metrics->line_gap); diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index d505b5b09..66d7d55dd 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -472,16 +472,9 @@ hb_ot_get_font_h_extents (hb_font_t *font, hb_font_extents_t *metrics, void *user_data HB_UNUSED) { - bool ret = _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, &metrics->ascender) && - _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER, &metrics->descender) && - _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP, &metrics->line_gap); - - /* Embolden */ - int y_shift = font->y_strength; - if (font->y_scale < 0) y_shift = -y_shift; - metrics->ascender += y_shift; - - return ret; + return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, &metrics->ascender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER, &metrics->descender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP, &metrics->line_gap); } #ifndef HB_NO_VERTICAL