renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Android, fix] Revert slightly more of the Noto business (#5463)

Browse Source 
Follow-up to #5458. Cf. https://github.com/koreader/koreader/issues/5381#issuecomment-539873843.
This commit is contained in:
Frans de Jonge
2019-10-09 17:03:51 +02:00
committed by GitHub
parent b75fec4971
commit 99495aaed4
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/ui/font.lua
View File

@@ -115,25 +115,6 @@ function Font:getFace(font, size)
local builtin_font_location = FontList.fontdir.."/"..realname
local ok, face = pcall(Freetype.newFace, builtin_font_location, size)
-- We don't ship Droid and Noto on Android because they're system fonts.
-- This cuts package size in half, but 4.4 and older systems
-- might not ship Noto.
if not ok and is_android and realname:match("^Noto") then
local system_font_location = "/system/fonts"
logger.dbg("Font:", realname, "not found. Trying system location.")
ok, face = pcall(Freetype.newFace, system_font_location.."/"..realname, size)
-- Relevant Noto font not found on this device, fall back to Droid
if not ok then
if realname:match("Bold") then
realname = "DroidSans-Bold.ttf"
else
realname = "DroidSans.ttf"
end
end
end
-- Not all fonts are bundled on all platforms because they come with the system.
-- In that case, search through all font folders for the requested font.
if not ok then