RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:37:35 +00:00
Code Issues Activity Actions

LibPDF: Ask OpenType font programs for glyph widths if needed

Browse source 
If the font dictionary didn't specify custom glyph widths, we would fall
back to the specified "missing width" (or 0 in most cases!), which meant
that we would draw glyphs on top of each other in a lot of cases, namely
for TrueTypeFonts or standard Type1Fonts with an OpenType fallback.

What we actually want to do in this case is ask the OpenType font for
the correct width.
This commit is contained in:
Julian Offenhäuser 2023-03-24 22:22:33 +01:00 • committed by Andrew Kaster
parent 2b3a41be74
commit fec7ccf020
6 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibPDF/Fonts/SimpleFont.cpp
View file

@ -45,17 +45,18 @@ PDFErrorOr<void> SimpleFont::initialize(Document* document, NonnullRefPtr<DictOb
return {};
}
float SimpleFont::get_char_width(u8 char_code) const
{
return static_cast<float>(m_widths.get(char_code).value_or(m_missing_width)) / 1000.0f;
}
PDFErrorOr<Gfx::FloatPoint> SimpleFont::draw_string(Gfx::Painter& painter, Gfx::FloatPoint glyph_position, DeprecatedString const& string, Color const& paint_color, float font_size, float character_spacing, float horizontal_scaling)
{
auto so = make_object<StringObject>(string, true);
for (auto char_code : string.bytes()) {
auto char_width = get_char_width(char_code);
auto glyph_width = char_width * font_size;
// Use the width specified in the font's dictionary if available,
// and use the default width for the given font otherwise.
float glyph_width;
if (auto width = m_widths.get(char_code); width.has_value())
glyph_width = font_size * width.value() / 1000.0f;
else
glyph_width = get_glyph_width(char_code);
draw_glyph(painter, glyph_position, glyph_width, char_code, paint_color);
auto tx = glyph_width;
tx += character_spacing;