mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
5541d5f5d3
Includes: - New option to tune word spacing: space width scale percent - Text: look for hyphenation in more words if needed - CSS: fix "hyphens:none" should override inherited "hyphens:auto" - getHtml(): grab dir= and lang= attributes from upper nodes Replace our Word Gap/Space condensing toggle/setting with a new Word Spacing toggle/setting, made of 2 values: - 1st number scales the normal width of spaces in all font (100% uses the font space width untouched) - 2nd number applies after the 1st has been applied, and tells how much these spaces can additionally be condensed to make more text fit on a line.
56 lines
2.4 KiB
Lua
56 lines
2.4 KiB
Lua
--[[
|
|
Centralizes migration concerns for LuaSettings & DocSettings
|
|
--]]
|
|
|
|
local DocSettings = require("docsettings")
|
|
local LuaSettings = require("luasettings")
|
|
local logger = require("logger")
|
|
|
|
local SettingsMigration = {}
|
|
|
|
-- Shockingly, handles settings migration
|
|
-- NOTE: supports LuaSettings & DocSettings objects as input, as both implement the same API
|
|
function SettingsMigration:migrateSettings(config)
|
|
-- Figure out what kind of object we were passed, to make the logging more precise
|
|
local cfg_mt_idx = getmetatable(config).__index
|
|
local cfg_class
|
|
if cfg_mt_idx == DocSettings then
|
|
cfg_class = "book"
|
|
elseif cfg_mt_idx == LuaSettings then
|
|
cfg_class = "global"
|
|
else
|
|
-- Input object isn't a supported *Settings class, warn & abort instead of going kablooey.
|
|
logger.warn("Passed an unsupported object class to SettingsMigration!")
|
|
return
|
|
end
|
|
|
|
-- Fine-grained CRe margins (#4945)
|
|
local old_margins = config:readSetting("copt_page_margins")
|
|
if old_margins then
|
|
logger.info("Migrating old", cfg_class, "CRe margin settings: L", old_margins[1], "T", old_margins[2], "R", old_margins[3], "B", old_margins[4])
|
|
-- Format was: {left, top, right, bottom}
|
|
config:saveSetting("copt_h_page_margins", {old_margins[1], old_margins[3]})
|
|
config:saveSetting("copt_t_page_margin", old_margins[2])
|
|
config:saveSetting("copt_b_page_margin", old_margins[4])
|
|
-- Wipe it
|
|
config:delSetting("copt_page_margins")
|
|
end
|
|
|
|
-- Space condensing to Word spacing
|
|
-- From a single number (space condensing) to a table of 2 numbers ({space width scale, space condensing}).
|
|
-- Be conservative and don't change space width scale: use 100%
|
|
if not config:readSetting("copt_word_spacing") and config:readSetting("copt_space_condensing") then
|
|
local space_condensing = config:readSetting("copt_space_condensing")
|
|
logger.info("Migrating old", cfg_class, "CRe space condensing:", space_condensing)
|
|
config:saveSetting("copt_word_spacing", { 100, space_condensing })
|
|
if cfg_class == "book" then
|
|
-- a bit messy that some settings are saved twice in DocSettings, with
|
|
-- and without a copt_ prefix, and they must be in sync
|
|
config:saveSetting("word_spacing", { 100, space_condensing })
|
|
end
|
|
end
|
|
|
|
end
|
|
|
|
return SettingsMigration
|