From c8b8ee3ba974ec299022b40b7c2f3a3a701c062e Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Tue, 18 Aug 2020 13:34:28 +0200
Subject: [PATCH] bump crengine: better linebreaks at em-dash, fb2 fixes
 (#6521)

Includes:
- (Upstream) LVBase64NodeStream: fix possible segfault
- (Upstream) Fix getting encoding from HTML META tags
- FB2: also look for cover in <src-title-info>
- FB2: fix cover image colors
- FB2: don't draw cover in scroll mode
- TextLang: better linebreaks at em-dash (EN/ES/FR)
- TextLang: increase _lb_props static array size

FB2 footnotes style tweaks: avoid gap above first footnote,
caused by the title bottom margin collapsing into it.
---
 base                            |  2 +-
 frontend/ui/data/css_tweaks.lua | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/base b/base
index a96cb1c55..65d3ee1e4 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit a96cb1c555c42d77ce88d9e97e89c87cd164d923
+Subproject commit 65d3ee1e46a595da2adfde97f7e941567dc522d0
diff --git a/frontend/ui/data/css_tweaks.lua b/frontend/ui/data/css_tweaks.lua
index 9711b16b6..adc6629ba 100644
--- a/frontend/ui/data/css_tweaks.lua
+++ b/frontend/ui/data/css_tweaks.lua
@@ -652,6 +652,8 @@ This is just an example, that will need to be adapted into a user style tweak.]]
 Show FB2 footnote text at the bottom of pages that contain links to them.]]),
                     -- Restrict this to FB2 documents, even if we won't probably
                     -- match in any other kind of document
+                    -- (Last selector avoids title bottom margin from collapsing
+                    -- into the first footnote by substituting it with padding.)
                     css = [[
 body[name="notes"] section {
     -cr-only-if: fb2-document;
@@ -661,6 +663,11 @@ body[name="notes"] section {
 body[name="notes"] > section {
     -cr-only-if: fb2-document;
         font-size: 0.75rem;
+}
+body[name="notes"] > title {
+    -cr-only-if: fb2-document;
+        margin-bottom: 0;
+        padding-bottom: 0.5em;
 }
                     ]],
                 },
@@ -678,6 +685,11 @@ body[name="comments"] section {
 body[name="comments"] > section {
     -cr-only-if: fb2-document;
         font-size: 0.85rem;
+}
+body[name="comments"] > title {
+    -cr-only-if: fb2-document;
+        margin-bottom: 0;
+        padding-bottom: 0.5em;
 }
                     ]],
                     separator = true,