mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
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.
This commit is contained in:
2
base
2
base
Submodule base updated: fcf5c578b8...a938d082ba
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user