From 57d7fd8aaa616c0571dae9c076ef98c819493bf6 Mon Sep 17 00:00:00 2001 From: poire-z Date: Wed, 1 Sep 2021 14:17:33 +0200 Subject: [PATCH] bump crengine: support for 'box-sizing', and other fixes Includes among others: - (Upstream) Various CHM handling fixes, and others - HTML documents: rebuild TOC from headings after load - Font: use metrics for underline offset and thickness - epub.css, html5.css: tweak ruby styling - CSS: fix EPUB's head>style content encoding - CSS: add support for 'box-sizing: content-box/border-box' - CSS: support for styling the element Also bump KoboUSBMS to v1.2.2 and FBInk to v1.24.0. ReaderFont's "Generate font test document": update the generated HTML so its ToC is build from proper HTML headings. --- base | 2 +- frontend/apps/reader/modules/readerfont.lua | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base b/base index 7711a0abc..2a526000d 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 7711a0abc3f2d603e96c18c31a4b7ee885ab2de5 +Subproject commit 2a526000d9c0a92e4951caef9202d0f12e8b343b diff --git a/frontend/apps/reader/modules/readerfont.lua b/frontend/apps/reader/modules/readerfont.lua index a3c17e459..91f4e59e0 100644 --- a/frontend/apps/reader/modules/readerfont.lua +++ b/frontend/apps/reader/modules/readerfont.lua @@ -440,18 +440,19 @@ function ReaderFont:buildFontsTestDocument() %s -
%s
+

%s

]], _("Available fonts test document"), _("AVAILABLE FONTS"))) local face_list = cre.getFontFaces() f:write("
\n") @@ -462,7 +463,7 @@ a { color: black; } f:write("
\n\n") for _, font_name in ipairs(face_list) do local font_id = font_name:gsub(" ", "_"):gsub("'", "_") - f:write(string.format("
%s
\n", font_id, font_name)) + f:write(string.format("

%s

\n", font_id, font_name)) f:write(string.format("
\n", font_name)) f:write(html_sample) f:write("\n
\n\n")