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

LibTTF: Use en-us naming table if available

Browse source 
Some fonts tend to have multiple naming tables, namely MS-Gothic has
3 tables: [macintosh, ja], [windows, en-us], [windows, ja].
This commit is contained in:
LuK1337 2021-07-07 21:10:53 +02:00 • committed by Andreas Kling
parent 934e53079f
commit a552c3bc8c
2 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Userland/Libraries/LibTTF/Font.cpp
View file

@ -166,24 +166,36 @@ String Name::string_for_id(NameId id) const
auto num_entries = be_u16(m_slice.offset_pointer(2)); auto num_entries = be_u16(m_slice.offset_pointer(2));
auto string_offset = be_u16(m_slice.offset_pointer(4)); auto string_offset = be_u16(m_slice.offset_pointer(4));
Vector<int> valid_ids;
for (int i = 0; i < num_entries; ++i) { for (int i = 0; i < num_entries; ++i) {
auto this_id = be_u16(m_slice.offset_pointer(6 + i * 12 + 6)); auto this_id = be_u16(m_slice.offset_pointer(6 + i * 12 + 6));
if (this_id != (u16)id) if (this_id == (u16)id)
continue; valid_ids.append(i);
auto platform = be_u16(m_slice.offset_pointer(6 + i * 12 + 0));
auto length = be_u16(m_slice.offset_pointer(6 + i * 12 + 8));
auto offset = be_u16(m_slice.offset_pointer(6 + i * 12 + 10));
if (platform == (u16)Platform::Windows) {
static auto& decoder = *TextCodec::decoder_for("utf-16be");
return decoder.to_utf8(StringView { (const char*)m_slice.offset_pointer(string_offset + offset), length });
}
return String((const char*)m_slice.offset_pointer(string_offset + offset), length);
} }
return String::empty(); if (valid_ids.is_empty())
return String::empty();
auto it = valid_ids.find_if([this](auto const& i) {
// check if font has naming table for en-US language id
auto platform = be_u16(m_slice.offset_pointer(6 + i * 12 + 0));
auto language_id = be_u16(m_slice.offset_pointer(6 + i * 12 + 4));
return (platform == (u16)Platform::Macintosh && language_id == (u16)MacintoshLanguage::English)
|| (platform == (u16)Platform::Windows && language_id == (u16)WindowsLanguage::EnglishUnitedStates);
});
auto i = it != valid_ids.end() ? *it : valid_ids.first();
auto platform = be_u16(m_slice.offset_pointer(6 + i * 12 + 0));
auto length = be_u16(m_slice.offset_pointer(6 + i * 12 + 8));
auto offset = be_u16(m_slice.offset_pointer(6 + i * 12 + 10));
if (platform == (u16)Platform::Windows) {
static auto& decoder = *TextCodec::decoder_for("utf-16be");
return decoder.to_utf8(StringView { (const char*)m_slice.offset_pointer(string_offset + offset), length });
}
return String((const char*)m_slice.offset_pointer(string_offset + offset), length);
} }
GlyphHorizontalMetrics Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const GlyphHorizontalMetrics Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const

6
Userland/Libraries/LibTTF/Tables.h
View file

@ -133,6 +133,12 @@ public:
Macintosh = 1, Macintosh = 1,
Windows = 3, Windows = 3,
}; };
enum class MacintoshLanguage {
English = 0,
};
enum class WindowsLanguage {
EnglishUnitedStates = 0x0409,
};
static Optional<Name> from_slice(const ReadonlyBytes&); static Optional<Name> from_slice(const ReadonlyBytes&);
String family_name() const { return string_for_id(NameId::FamilyName); } String family_name() const { return string_for_id(NameId::FamilyName); }