iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Use Uniscribe to check glyph coverage of non-BMP characters rather than just skipping them

This commit is contained in:
Thomas Goyne 2016-04-08 10:48:58 -07:00
parent 15adac519d
commit dba8f1c062
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/Aegisub/standard-libraries.props
View File

@ -12,6 +12,7 @@
advapi32.lib; advapi32.lib;
comctl32.lib; comctl32.lib;
comdlg32.lib; comdlg32.lib;
Usp10.lib;
gdi32.lib; gdi32.lib;
kernel32.lib; kernel32.lib;
ole32.lib; ole32.lib;

50
src/font_file_lister_gdi.cpp
View File

@ -25,6 +25,8 @@
#include <ShlObj.h> #include <ShlObj.h>
#include <boost/scope_exit.hpp> #include <boost/scope_exit.hpp>
#include <unicode/utf16.h>
#include <Usp10.h>
namespace { namespace {
uint32_t murmur3(const char *data, uint32_t len) { uint32_t murmur3(const char *data, uint32_t len) {
@ -221,20 +223,52 @@ CollectionResult GdiFontFileLister::GetFontPaths(std::string const& facename, in
std::wstring utf16characters; std::wstring utf16characters;
utf16characters.reserve(characters.size()); utf16characters.reserve(characters.size());
for (int chr : characters) { for (int chr : characters) {
// GetGlyphIndices does not support surrogate pairs, so only check BMP characters if (U16_LENGTH(chr) == 1)
if (chr < std::numeric_limits<wchar_t>::max())
utf16characters.push_back(static_cast<wchar_t>(chr)); utf16characters.push_back(static_cast<wchar_t>(chr));
else {
utf16characters.push_back(U16_LEAD(chr));
utf16characters.push_back(U16_TRAIL(chr));
}
} }
// Check the glyph coverage of the matched font SCRIPT_CACHE cache = nullptr;
std::unique_ptr<WORD[]> indices(new WORD[utf16characters.size()]); std::unique_ptr<WORD[]> indices(new WORD[utf16characters.size()]);
GetGlyphIndicesW(dc, utf16characters.data(), utf16characters.size(),
indices.get(), GGI_MARK_NONEXISTING_GLYPHS);
for (size_t i = 0; i < utf16characters.size(); ++i) { // First try to check glyph coverage with Uniscribe, since it
if (indices[i] == 0xFFFF) // handles non-BMP unicode characters
ret.missing += utf16characters[i]; auto hr = ScriptGetCMap(dc, &cache, utf16characters.data(),
utf16characters.size(), 0, indices.get());
// Uniscribe doesn't like some types of fonts, so fall back to GDI
if (hr == E_HANDLE) {
GetGlyphIndicesW(dc, utf16characters.data(), utf16characters.size(),
indices.get(), GGI_MARK_NONEXISTING_GLYPHS);
for (size_t i = 0; i < utf16characters.size(); ++i) {
if (U16_IS_SURROGATE(utf16characters[i]))
continue;
if (indices[i] == SHRT_MAX)
ret.missing += utf16characters[i];
}
} }
else if (hr == S_FALSE) {
for (size_t i = 0; i < utf16characters.size(); ++i) {
// Uniscribe doesn't report glyph indexes for non-BMP characters,
// so we have to call ScriptGetCMap on each individual pair to
// determine if it's the missing one
if (U16_IS_LEAD(utf16characters[i])) {
hr = ScriptGetCMap(dc, &cache, &utf16characters[i], 2, 0, &indices[i]);
if (hr == S_FALSE) {
ret.missing += utf16characters[i];
ret.missing += utf16characters[i + 1];
}
++i;
}
else if (indices[i] == 0) {
ret.missing += utf16characters[i];
}
}
}
ScriptFreeCache(&cache);
return ret; return ret;
} }