beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibPDF: Add missing character quirk for WinAnsiEncoding fonts

Browse source 
Fonts with the encoding name "WinAnsiEncoding" should render missing
characters above character code 040 (octal) as a "bullet" character.

This patch adds Encoding::should_map_to_bullet(char_code) which is then
called by char_code_to_code_point() to check if the given char code
should be displayed as a bullet instead.

I didn't have a good way to test this, so I've only verified that it
works by manually overriding inputs to the function during the rendering
stage.

This takes care of a FIXME in the Annex D part of the PDF specification.
This commit is contained in:
Andreas Kling 2022-11-19 20:23:18 +01:00
parent f4f5b045ca
commit d6a3be1615
Notes: sideshowbarker 2024-07-17 03:39:30 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/d6a3be1615
Pull-request: https://github.com/SerenityOS/serenity/pull/16123
Reviewed-by: https://github.com/janso3 ✅
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibPDF/Encoding.cpp
View file

@ -115,6 +115,7 @@ NonnullRefPtr<Encoding> Encoding::windows_encoding()
encoding->m_name_mapping.set(#name, name##_code_point);
ENUMERATE_LATIN_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
encoding->m_windows = true;
}
return encoding;
@ -170,4 +171,12 @@ CharDescriptor const& Encoding::get_char_code_descriptor(u16 char_code) const
return const_cast<Encoding*>(this)->m_descriptors.ensure(char_code);
}
bool Encoding::should_map_to_bullet(u16 char_code) const
{
// PDF Annex D table D.2, note 3:
// In WinAnsiEncoding, all unused codes greater than 40 (octal) map to the bullet character. However, only
// code 225 (octal) shall be specifically assigned to the bullet character; other codes are subject to future re-assignment.
return m_windows && char_code > 040 && !m_descriptors.contains(char_code);
}
}

6
Userland/Libraries/LibPDF/Encoding.h
View file

@ -96,7 +96,7 @@
FN("]", bracketright, 93, 93, 93, 93) \
FN(" ̆", breve, 198, 249, -1, 24) \
FN("¦", brokenbar, -1, -1, 166, 166) \
FN("•", bullet, 183, 165, 149, 128) /* FIXME: Note 3 */ \
FN("•", bullet, 183, 165, 149, 128) \
FN("c", c, 99, 99, 99, 99) \
FN("ˇ", caron, 207, 255, -1, 25) \
FN("ç", ccedilla, -1, 141, 231, 231) \
@ -647,9 +647,13 @@ public:
CharDescriptor const& get_char_code_descriptor(u16 char_code) const;
bool should_map_to_bullet(u16 char_code) const;
protected:
HashMap<u16, CharDescriptor> m_descriptors;
HashMap<DeprecatedString, u16> m_name_mapping;
bool m_windows { false };
};
}

3
Userland/Libraries/LibPDF/Fonts/TrueTypeFont.cpp
View file

@ -48,6 +48,9 @@ u32 TrueTypeFont::char_code_to_code_point(u16 char_code) const
if (m_data.to_unicode)
TODO();
if (m_data.encoding->should_map_to_bullet(char_code))
return 8226; // Bullet.
auto descriptor = m_data.encoding->get_char_code_descriptor(char_code);
return descriptor.code_point;
}

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

@ -57,6 +57,9 @@ u32 Type1Font::char_code_to_code_point(u16 char_code) const
if (m_data.to_unicode)
TODO();
if (m_data.encoding->should_map_to_bullet(char_code))
return 8226; // Bullet.
auto descriptor = m_data.encoding->get_char_code_descriptor(char_code);
return descriptor.code_point;
}