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

[fix, desktop] Use XDG_DATA_HOME to search for fonts (#8521)

Browse Source 
Same as <https://github.com/koreader/koreader/pull/8507>.
This commit is contained in:
Alberto
2021-12-07 12:17:45 +01:00
committed by GitHub
parent 19a607b548
commit 6ebcfd9e79
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/ui/elements/font_settings.lua
View File

@@ -5,34 +5,33 @@ local _ = require("gettext")
--[[ Font settings for systems with multiple font dirs ]]--
local LINUX_FONT_PATH = "share/fonts"
local MACOS_FONT_PATH = "Library/fonts"
local function getDir(isUser)
local home = Device.home_dir
local XDG_DATA_HOME = os.getenv("XDG_DATA_HOME")
local LINUX_FONT_PATH = XDG_DATA_HOME and XDG_DATA_HOME .. "/fonts"
or home .. "/.local/share/fonts"
local LINUX_SYS_FONT_PATH = "/usr/share/fonts"
local MACOS_FONT_PATH = "Library/fonts"
if isUser and not home then return end
if Device:isAndroid() then
if isUser then
return home .. "/fonts;" .. home .. "/koreader/fonts"
else
return "/system/fonts"
end
return isUser and home .. "/fonts;" .. home .. "/koreader/fonts"
or "/system/fonts"
elseif Device:isPocketBook() then
if isUser then
return "/mnt/ext1/system/fonts"
else
return "/ebrmain/adobefonts;/ebrmain/fonts"
end
return isUser and "/mnt/ext1/system/fonts"
or "/ebrmain/adobefonts;/ebrmain/fonts"
elseif Device:isRemarkable() then
return isUser and string.format("%s/.local/%s", home, LINUX_FONT_PATH)
or string.format("/usr/%s", LINUX_FONT_PATH)
return isUser and LINUX_FONT_PATH
or LINUX_SYS_FONT_PATH
elseif Device:isDesktop() or Device:isEmulator() then
if jit.os == "OSX" then
return isUser and string.format("%s/%s", home, MACOS_FONT_PATH)
or string.format("/%s", MACOS_FONT_PATH)
return isUser and home .. "/" .. MACOS_FONT_PATH
or "/" .. MACOS_FONT_PATH
else
return isUser and string.format("%s/.local/%s", home, LINUX_FONT_PATH)
or string.format("/usr/%s", LINUX_FONT_PATH)
return isUser and LINUX_FONT_PATH
or LINUX_SYS_FONT_PATH
end
end
end