From dce92020c19c03c547ce62f88d7eef81f5374fa1 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Mon, 1 Apr 2024 16:38:10 +0000 Subject: [PATCH 1/7] bump base: fix sdcv binaries on non-Android/macOS platforms (#11609) Closes #11604. --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index 366d9c9ca..4a94e03da 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 366d9c9ca842748be76eaf948cc8719c9e51e494 +Subproject commit 4a94e03da4c544e09f1557647dca086070e57cf4 From b9261e024596bb79e570d20fd9deb686b984a01e Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 3 Apr 2024 17:55:41 +0200 Subject: [PATCH 2/7] [i18n] Font UI fallbacks: insert replacement characters with template for Weblate compatibility (#11614) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added in and unproblematic for the past two years, but Weblate has now decided to complain about it to the extent of disabling translations: > Error message String contains control character: 'If some book titles, dictionary entries and such are not displayed well but shown as \ufffe\ufffe or ��, it may be necessary to download the required fonts for those languages. They can then be enabled as additional UI fallback fonts.\nFonts for many languages can be downloaded at:\n\nhttps://fonts.google.com/noto\n\nOnly fonts named "Noto Sans xyz" or "Noto Sans xyz UI" (regular, not bold nor italic, not Serif) will be available in this menu. However, bold fonts will be used if their corresponding regular fonts exist.' --- frontend/ui/elements/font_ui_fallbacks.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/ui/elements/font_ui_fallbacks.lua b/frontend/ui/elements/font_ui_fallbacks.lua index 1b43ec71b..9b0e09a9f 100644 --- a/frontend/ui/elements/font_ui_fallbacks.lua +++ b/frontend/ui/elements/font_ui_fallbacks.lua @@ -50,13 +50,13 @@ local genFallbackCandidates = function() end end -local more_info_text = _([[ -If some book titles, dictionary entries and such are not displayed well but shown as ￾￾ or ��, it may be necessary to download the required fonts for those languages. They can then be enabled as additional UI fallback fonts. +local more_info_text = T(_([[ +If some book titles, dictionary entries and such are not displayed well but shown as %1 or %2, it may be necessary to download the required fonts for those languages. They can then be enabled as additional UI fallback fonts. Fonts for many languages can be downloaded at: https://fonts.google.com/noto -Only fonts named "Noto Sans xyz" or "Noto Sans xyz UI" (regular, not bold nor italic, not Serif) will be available in this menu. However, bold fonts will be used if their corresponding regular fonts exist.]]) +Only fonts named "Noto Sans xyz" or "Noto Sans xyz UI" (regular, not bold nor italic, not Serif) will be available in this menu. However, bold fonts will be used if their corresponding regular fonts exist.]]), "￾￾", "��") local getSubMenuItems = function() genFallbackCandidates() From b1a80921addf6525aa5326118f704751826228a1 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 3 Apr 2024 19:04:27 +0200 Subject: [PATCH 3/7] Revert "ReaderPaging: enable Kindle page-turn animations (#11424)" (#11617) This reverts commit ee7c3ab551f320ff0095c276bdadfac77beeee69. --- frontend/apps/reader/modules/readerpaging.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index 431e4e982..3bf67199e 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -565,7 +565,7 @@ function ReaderPaging:onGotoPercent(percent) if dest > self.number_of_pages then dest = self.number_of_pages end - self:onGotoPage(dest) + self:_gotoPage(dest) return true end @@ -575,7 +575,6 @@ function ReaderPaging:onGotoViewRel(diff) else self:onGotoPageRel(diff) end - self.ui:handleEvent(Event:new("PageChangeAnimation", diff > 0)) self:setPagePosition(self:getTopPage(), self:getTopPosition()) return true end @@ -1128,11 +1127,8 @@ function ReaderPaging:_gotoPage(number, orig_mode) end function ReaderPaging:onGotoPage(number, pos) - local same_page = number == self.current_page; - local animation_direction = number > self.current_page; self:setPagePosition(number, 0) self:_gotoPage(number) - self.ui:handleEvent(Event:new("PageChangeAnimation", animation_direction)) if pos then local rect_p = Geom:new{ x = pos.x or 0, y = pos.y or 0 } local rect_s = Geom:new(rect_p):copy() @@ -1142,7 +1138,7 @@ function ReaderPaging:onGotoPage(number, pos) else self.view:PanningUpdate(rect_s.x - self.view.visible_area.x, rect_s.y - self.view.visible_area.y) end - elseif same_page then + elseif number == self.current_page then -- gotoPage emits this event only if the page changes self.ui:handleEvent(Event:new("PageUpdate", self.current_page)) end @@ -1161,14 +1157,14 @@ function ReaderPaging:onGotoRelativePage(number) end new_page = test_page end - self:onGotoPage(new_page) + self:_gotoPage(new_page) return true end function ReaderPaging:onGotoPercentage(percentage) if percentage < 0 then percentage = 0 end if percentage > 1 then percentage = 1 end - self:onGotoPage(math.floor(percentage*self.number_of_pages)) + self:_gotoPage(math.floor(percentage*self.number_of_pages)) return true end From f6588e95e84e801a39310a5f99bd2a683515d1ae Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Thu, 4 Apr 2024 10:22:36 +0100 Subject: [PATCH 4/7] =?UTF-8?q?ReaderHighlight:=20~~strikeout~~=20?= =?UTF-8?q?=E2=86=92=20Strikethrough=20(#11619)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/apps/reader/modules/readerhighlight.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readerhighlight.lua b/frontend/apps/reader/modules/readerhighlight.lua index d5d7fe0b4..e80998717 100644 --- a/frontend/apps/reader/modules/readerhighlight.lua +++ b/frontend/apps/reader/modules/readerhighlight.lua @@ -334,7 +334,7 @@ end local highlight_style = { {_("Lighten"), "lighten"}, {_("Underline"), "underscore"}, - {_("Strikeout"), "strikeout"}, + {_("Strikethrough"), "strikeout"}, {_("Invert"), "invert"}, } From a7edf213a504dc967b2a76be9853ecf48a2cb7f7 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Thu, 4 Apr 2024 16:00:53 +0200 Subject: [PATCH 5/7] [minor] FileChooser: use en-dash instead of dash for UI (#11615) --- frontend/ui/widget/filechooser.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ui/widget/filechooser.lua b/frontend/ui/widget/filechooser.lua index 592f867f5..8e00347dc 100644 --- a/frontend/ui/widget/filechooser.lua +++ b/frontend/ui/widget/filechooser.lua @@ -212,7 +212,7 @@ local FileChooser = Menu:extend{ }, percent_natural = { -- sort 90% > 50% > 0% or on hold > unopened > 100% or finished - text = _("percent - unopened - finished last"), + text = _("percent – unopened – finished last"), menu_order = 90, can_collate_mixed = false, init_sort_func = function(cache) From ec54afcc0de666feceb11f4de1779dc0a079b18b Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Thu, 4 Apr 2024 16:01:49 +0200 Subject: [PATCH 6/7] [minor] ReaderStyletweak: fix typo (#11616) --- frontend/apps/reader/modules/readerstyletweak.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readerstyletweak.lua b/frontend/apps/reader/modules/readerstyletweak.lua index 5dd6cef55..b4f0e4661 100644 --- a/frontend/apps/reader/modules/readerstyletweak.lua +++ b/frontend/apps/reader/modules/readerstyletweak.lua @@ -880,7 +880,7 @@ You can then paste it here with long-press in the text box.]]), true}, { "-cr-hint: footnote;", _("Can be set on target of links (
) to have their link trigger as footnote popup, in case KOReader wrongly detect this target is not a footnote.")}, { "-cr-hint: noteref;", _("Can be set on links () to have them trigger as footnote popups, in case KOReader wrongly detect the links is not to a footnote.")}, { "-cr-hint: noteref-ignore;", _([[ -Can be set on links () to have them NOT trigger footnote popups and in-page footnote. +Can be set on links () to have them NOT trigger footnote popups and in-page footnotes. If some DocFragment presents an index of names with cross references, resulting in in-page footnotes taking half of these pages, you can avoid this with: DocFragment[id$=_16] a { -cr-hint: noteref-ignore }]])}, }}, From 601925ab87bc7538eb96b8f32de9b4e37bfc676d Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Thu, 4 Apr 2024 16:02:02 +0200 Subject: [PATCH 7/7] =?UTF-8?q?[minor]=20CSS=20tweaks:=20fix=20typo=20cell?= =?UTF-8?q?pading=20=E2=86=92=20celpadding=20(#11618)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/ui/data/css_tweaks.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ui/data/css_tweaks.lua b/frontend/ui/data/css_tweaks.lua index c81a3fbd3..951bbde68 100644 --- a/frontend/ui/data/css_tweaks.lua +++ b/frontend/ui/data/css_tweaks.lua @@ -574,7 +574,7 @@ body, h1, h2, h3, h4, h5, h6, div, li, td, th { text-indent: 0 !important; } { id = "table_no_presentational_hints", title = _("Ignore tables related HTML presentational hints"), - description = _("Ignore HTML attributes that contribute to styles on the element and its sub-elements (ie. align, valign, frame, rules, border, cellpading, cellspacing…)."), + description = _("Ignore HTML attributes that contribute to styles on the
element and its sub-elements (ie. align, valign, frame, rules, border, cellpadding, cellspacing…)."), css = [[table, caption, colgroup, col, thead, tbody, tfoot, tr, td, th { -cr-hint: no-presentational; }]], separator = true, },