From 5a0bb292eec67cff0924379f50291333e1a03516 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 29 Sep 2019 13:03:48 +0200 Subject: font: calculate underline/strikeout metrics in font, not main --- font.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'font.c') diff --git a/font.c b/font.c index 692e82d5..049a3be8 100644 --- a/font.c +++ b/font.c @@ -4,9 +4,12 @@ #include #include #include +#include #include #include +#include + #define LOG_MODULE "font" #define LOG_ENABLE_DBG 0 #include "log.h" @@ -35,6 +38,43 @@ fini(void) FcFini(); } +static void +underline_strikeout_metrics(struct font *font) +{ + FT_Face ft_face = font->face; + double x_scale = ft_face->size->metrics.x_scale / 65526.; + double height = ft_face->size->metrics.height / 64; + double descent = ft_face->size->metrics.descender / 64; + + LOG_DBG("ft: x-scale: %f, height: %f, descent: %f", + x_scale, height, descent); + + font->underline.position = round(ft_face->underline_position * x_scale / 64.); + font->underline.thickness = ceil(ft_face->underline_thickness * x_scale / 64.); + + if (font->underline.position == 0.) { + font->underline.position = round(descent / 2.); + font->underline.thickness = fabs(round(descent / 5.)); + } + + LOG_DBG("underline: pos=%d, thick=%d", + font->underline.position, font->underline.thickness); + + TT_OS2 *os2 = FT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); + if (os2 != NULL) { + font->strikeout.position = round(os2->yStrikeoutPosition * x_scale / 64.); + font->strikeout.thickness = ceil(os2->yStrikeoutSize * x_scale / 64.); + } + + if (font->strikeout.position == 0.) { + font->strikeout.position = round(height / 2. + descent); + font->strikeout.thickness = font->underline.thickness; + } + + LOG_DBG("strikeout: pos=%d, thick=%d", + font->strikeout.position, font->strikeout.thickness); +} + static bool from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_list_t *fallbacks, const char *attributes, struct font *font, bool is_fallback) @@ -196,6 +236,7 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li } } + underline_strikeout_metrics(font); return true; } -- cgit v1.3