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

LibPDF: Use right encoding for standard fonts Symbol and ZapfDingbats

Browse source 
We use Liberation Sans for the actual glyph for these, and that's
missing some (Symbol) / all (ZapfDingbats) of the glyphs we need
for these two standard fonts (...or at least the mapping from
name to glyph, not sure). But still, better rendering squares than
completely incorrect glpyhs.

Our code deciding what to do when a value isn't found in an encoding,
or when the name doesn't map to a glpyh, also needs work, but that's
mostly independent of this change. I think this is a nice small
standalone progression.
This commit is contained in:
Nico Weber 2024-02-27 09:09:09 -05:00 • committed by Tim Flynn
parent f5eb57f6bb
commit 9aa31157d5
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibPDF/Fonts/Type1Font.cpp
View file

@ -54,8 +54,28 @@ PDFErrorOr<void> Type1Font::initialize(Document* document, NonnullRefPtr<DictObj
auto font = TRY(replacement_for(base_font_name().to_lowercase(), font_size)); auto font = TRY(replacement_for(base_font_name().to_lowercase(), font_size));
auto effective_encoding = encoding(); auto effective_encoding = encoding();
if (!effective_encoding) if (!effective_encoding) {
// PDF 1.7 spec, APPENDIX D Character Sets and Encodings
// "Sections D.4, “Symbol Set and Encoding,” and D.5, “ZapfDingbats Set and Encoding,”
// describe the character sets and built-in encodings for the Symbol and ZapfDingbats (ITC Zapf Dingbats)
// font programs, which are among the standard 14 predefined fonts. These fonts have built-in encodings
// that are unique to each font. (The characters for ZapfDingbats are ordered by code instead of by name,
// since the names in that font are meaningless.)"
// FIXME: We use Liberation Sans for both Symbol and ZapfDingbats. It doesn't have all Symbol
// characters, or at least not under the codepoints used in AdobeGlpyhList. It doesn't
// have any ZapfDingbats characters, or at least not the names for it. Not sure what to do about
// this -- we either need a different font, or need to tweak the encoding somehow.
// (For Helvetica / Times / Courier, the Liberation family doesn't have the right metrics.)
if (base_font_name() == "Symbol"sv)
effective_encoding = Encoding::symbol_encoding();
else if (base_font_name() == "ZapfDingbats"sv)
effective_encoding = Encoding::zapf_encoding();
else
effective_encoding = Encoding::standard_encoding(); effective_encoding = Encoding::standard_encoding();
}
// FIXME: For the standard 14 fonts, set some m_flags bits (symbolic/nonsymbolic, italic, bold, fixed pitch, serif).
m_fallback_font_painter = TrueTypePainter::create(document, dict, *this, *font, *effective_encoding); m_fallback_font_painter = TrueTypePainter::create(document, dict, *this, *font, *effective_encoding);
} }