From 396d1fbf46856b988630c4163bee6267fd99ff00 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Wed, 13 Jan 2021 20:26:14 +0100
Subject: [PATCH] bump crengine: parsing, lists, 2-pages mode fixes & tweaks
 (#7138)

Includes:
- EPUB: fix truncated HEAD>STYLE stylesheet
- XML parsing: slightly better parsing of <script>
- Update German hyphenation patterns
- (chore) Silence some clang warnings
- (Upstream) CSS content: fix regression with open-quote/close-quote
- (Upstream) HTML lists: support the 'reversed' attribute
- (Upstream) Tweak list items disc/circle/square symbols
- 2-pages mode: option to skip geometry checks

CRE bottom menu: allow toggling Dual Pages in portrait mode.
---
 base                              | 2 +-
 frontend/document/credocument.lua | 2 +-
 frontend/ui/data/creoptions.lua   | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/base b/base
index 22d3b504d..b0f821d29 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 22d3b504d43e058a0d06c585fda8459749de0c3e
+Subproject commit b0f821d2920c257ab2ee80169e98a3e104a3f0c2
diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 53b6693b8..434653b16 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -1134,7 +1134,7 @@ end
 
 function CreDocument:setVisiblePageCount(new_count)
     logger.dbg("CreDocument: set visible page count", new_count)
-    self._document:setVisiblePageCount(new_count)
+    self._document:setVisiblePageCount(new_count, false)
 end
 
 function CreDocument:setBatteryState(state)
diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua
index dbe71a110..e7c18ce18 100644
--- a/frontend/ui/data/creoptions.lua
+++ b/frontend/ui/data/creoptions.lua
@@ -40,6 +40,7 @@ local CreOptions = {
                 args = {1, 2},
                 default_arg = 1,
                 event = "SetVisiblePages",
+                --[[ Commented out, to have it also available in portrait mode
                 current_func = function()
                     -- If not in landscape mode, shows "1" as selected
                     if Device.screen:getScreenMode() ~= "landscape" then
@@ -48,9 +49,10 @@ local CreOptions = {
                     -- if we return nil, ConfigDialog will pick the one from the
                     -- configurable as if we hadn't provided this 'current_func'
                 end,
+                ]]--
                 enabled_func = function(configurable)
-                    return Device.screen:getScreenMode() == "landscape" and
-                        optionsutil.enableIfEquals(configurable, "view_mode", 0) -- "page"
+                    return optionsutil.enableIfEquals(configurable, "view_mode", 0) -- "page" mode
+                        -- and Device.screen:getScreenMode() == "landscape"
                 end,
                 name_text_hold_callback = optionsutil.showValues,
                 help_text = _([[In landscape mode, you can choose to display one or two pages of the book on the screen.