From 8a240dd635d188b1e4178b89d8d109ea9577722e Mon Sep 17 00:00:00 2001 From: poire-z Date: Sun, 16 Jul 2023 19:18:10 +0200 Subject: [PATCH] bump LunaSVG, crengine: add support for .docm (#10702) Includes: - bump LunaSVG: intermediate upstream bump, cleanup - bump LunaSVG: minor upstream tweaks crengine: - DocX: add support for similar DocM format - LVStyleSheet: fix LVCssDeclaration::getHash() - CSS parsing: accept Unicode values for ID and classnames - update for Harfbuzz 8, fix some compiler warning Also fix input not restored when loading failed, and KOReader not able to exit. --- base | 2 +- frontend/apps/reader/readerui.lua | 3 +++ frontend/document/credocument.lua | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/base b/base index fcf5c578b..a938d082b 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit fcf5c578b8fdcf5cac38762a8f8b5cf77ebb79e2 +Subproject commit a938d082ba3f39a9d5cc39492637ce8711b9dd3f diff --git a/frontend/apps/reader/readerui.lua b/frontend/apps/reader/readerui.lua index b3a131d9e..3bec5a614 100644 --- a/frontend/apps/reader/readerui.lua +++ b/frontend/apps/reader/readerui.lua @@ -823,6 +823,9 @@ function ReaderUI:dealWithLoadDocumentFailure() coroutine.resume(_coroutine, false) end, }) + -- Restore input, so can catch the InfoMessage dismiss and exit + Device:setIgnoreInput(false) + Input:inhibitInputUntil(0.2) coroutine.yield() -- pause till InfoMessage is dismissed end -- We have to error and exit the coroutine anyway to avoid any segfault diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index 5c60ca67f..567078368 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -1509,6 +1509,7 @@ function CreDocument:register(registry) registry:addProvider("chm", "application/vnd.ms-htmlhelp", self, 90) registry:addProvider("doc", "application/msword", self, 90) registry:addProvider("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", self, 90) + registry:addProvider("docm", "application/vnd.ms-word.document.macroEnabled.12", self, 90) registry:addProvider("epub", "application/epub+zip", self, 100) registry:addProvider("epub", "application/epub", self, 100) -- Alternative mimetype for OPDS. registry:addProvider("epub3", "application/epub+zip", self, 100)