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

LibGfx: Make OTF prefer Cmap tables of the Windows platform again

Browse source 
As the different Cmap encoding records are guaranteed to be sorted by
their platform ID, we would previously prefer the Macintosh platform
because of its lower ID value. However, this platform is split up into
a lot of encoding formats for different languages, and usually only
English is included. This meant that we could not handle most unicode
characters anymore.

The Windows platform now takes precedence again, as it can handle
arbitrary code points in its supported encodings.

This solution is still far from perfect, but it makes this regression
disappear for now.
This commit is contained in:
Julian Offenhäuser 2023-01-13 17:05:13 +01:00 • committed by Andreas Kling
parent ddbdeb3ca0
commit 22b1e1076a
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
View file

@ -517,6 +517,9 @@ ErrorOr<NonnullRefPtr<Font>> Font::try_load_from_offset(ReadonlyBytes buffer, u3
if (!platform.has_value())
return Error::from_string_literal("Invalid Platform ID");
/* NOTE: The encoding records are sorted first by platform ID, then by encoding ID.
This means that the Windows platform will take precedence over Macintosh, which is
usually what we want here. */
if (platform.value() == Cmap::Subtable::Platform::Windows) {
if (subtable.encoding_id() == (u16)Cmap::Subtable::WindowsEncoding::UnicodeFullRepertoire) {
cmap.set_active_index(i);
@ -528,7 +531,6 @@ ErrorOr<NonnullRefPtr<Font>> Font::try_load_from_offset(ReadonlyBytes buffer, u3
}
} else if (platform.value() == Cmap::Subtable::Platform::Macintosh) {
cmap.set_active_index(i);
break;
}
}