mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 12:38:12 +00:00
cb04e4e9da
The PDFFont class hierarchy was very simple (a top-level PDFFont class, followed by all the children classes that derived directly from it). While this design was good enough for some things, it didn't correctly model the actual organization of font types: * PDF fonts are first divided between "simple" and "composite" fonts. The latter is the Type0 font, while the rest are all simple. * PDF fonts yield a glyph per "character code". Simple fonts char codes are always 1 byte long, while Type0 char codes are of variable size. To this effect, this commit changes the hierarchy of Font classes, introducing a new SimpleFont class, deriving from PDFFont, and acting as the parent of Type1Font and TrueTypeFont, while Type0 still derives from PDFFont directly. This distinction allows us now to: * Model string rendering differently from simple and composite fonts: PDFFont now offers a generic draw_string method that takes a whole string to be rendered instead of a single char code. SimpleFont implements this as a loop over individual bytes of the string, with T1 and TT implementing draw_glyph for drawing a single char code. * Some common fields between T1 and TT fonts now live under SimpleFont instead of under PDFfont, where they previously resided. * Some other interfaces specific to SimpleFont have been cleaned up, with u16/u32 not appearing on these classes (or in PDFFont) anymore. * Type0Font's rendering still remains unimplemented. As part of this exercise I also took the chance to perform the following cleanups and restructurings: * Refactored the creation and initialisation of fonts. They are all centrally created at PDFFont::create, with a virtual "initialize" method that allows them to initialise their inner members in the correct order (parent first, child later) after creation. * Removed duplicated code. * Cleaned up some public interfaces: receive const refs, removed unnecessary ctro/dtors, etc. * Slightly changed how Type1 and TrueType fonts are implemented: if there's an embedded font that takes priority, otherwise we always look for a replacement. * This means we don't do anything special for the standard fonts. The only behavior previously associated to standard fonts was choosing an encoding, and even that was under questioning. |
||
|---|---|---|
| .. | ||
| Fonts | ||
| CMakeLists.txt | ||
| ColorSpace.cpp | ||
| ColorSpace.h | ||
| CommonNames.cpp | ||
| CommonNames.h | ||
| Document.cpp | ||
| Document.h | ||
| DocumentParser.cpp | ||
| DocumentParser.h | ||
| Encoding.cpp | ||
| Encoding.h | ||
| Encryption.cpp | ||
| Encryption.h | ||
| Error.h | ||
| Filter.cpp | ||
| Filter.h | ||
| Forward.h | ||
| Interpolation.cpp | ||
| Interpolation.h | ||
| Object.h | ||
| ObjectDerivatives.cpp | ||
| ObjectDerivatives.h | ||
| Operator.h | ||
| Parser.cpp | ||
| Parser.h | ||
| Reader.cpp | ||
| Reader.h | ||
| Reference.h | ||
| Renderer.cpp | ||
| Renderer.h | ||
| Value.cpp | ||
| Value.h | ||
| XRefTable.h | ||