From 26bb2a880350a67768da68bbc2872b185405e474 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Wed, 29 Jan 2020 13:38:04 +0100
Subject: [PATCH] bump crengine: various text and CSS fixes

Includes:
- ldomXRange/ldomMarkedRange: update enhanced drawing flag
- Hardcoded elements list: add <script>
- CSS: ensure selectors are applied in the order met
- elementFromPoint(): fix some floats not being visited
- Fix getPageDocumentRange() on bidi text
- Text: fix: allow wrap on space around images
- CSS/Text: adds "-cr-hint: strut-confined"
- Rename mispelled 'ident' and field 'margin' to 'indent"
- text-indent: some fixes, handle negative & hanging indent
- (Upstream) Minor cleanup and ifdef wraps
- lvtextfm: avoid possible segfault when hyphenating
- lvtextfm: avoid spurious spaces when hyphenating
- lvtextfm: dont adjust space after initial quotation mark/dash
- lvtextfm: ensure page-break:avoid on inline-block and images
- (Upstream) lvtinydom.cpp: fix old minor typo
- Fix internal/footnote links not working on some books

cre.cpp: also use enhanced selection drawing when highlighting
the footnote link with footnote popups.
---
 cre.cpp                            | 6 ++++--
 thirdparty/kpvcrlib/CMakeLists.txt | 1 +
 thirdparty/kpvcrlib/crengine       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cre.cpp b/cre.cpp
index 3e26995ea..9375d90be 100644
--- a/cre.cpp
+++ b/cre.cpp
@@ -1420,7 +1420,7 @@ static int getTextFromPositions(lua_State *L) {
 
 		int rangeFlags = 0;
 		if (drawSelection) // have crengine do native highlight of selection
-			rangeFlags = drawSegmentedSelection ? 2 : 1;
+			rangeFlags = drawSegmentedSelection ? 0x11 : 0x01;
 		r.setFlags(rangeFlags);
 		tv->selectRange(r);
 
@@ -2631,7 +2631,9 @@ static int highlightXPointer(lua_State *L) {
         ldomNode * node = nodep.getNode();
         if (node->isNull())
             return 0;
-        sel.add( new ldomXRange(node, true) ); // highlight
+        ldomXRange * fullNodeRange = new ldomXRange(node, true);
+        fullNodeRange->setFlags(0x11); // draw segmented adjusted selection
+        sel.add( fullNodeRange ); // highlight it
         lua_pushboolean(L, true);
         return 1;
     }
diff --git a/thirdparty/kpvcrlib/CMakeLists.txt b/thirdparty/kpvcrlib/CMakeLists.txt
index 8aa7c514a..e0d1d9682 100644
--- a/thirdparty/kpvcrlib/CMakeLists.txt
+++ b/thirdparty/kpvcrlib/CMakeLists.txt
@@ -56,6 +56,7 @@ add_definitions(
     -DUSE_HARFBUZZ=1
     -DUSE_FRIBIDI=1
     -DUSE_UTF8PROC=1
+    -DUSE_NANOSVG=1
     -DALLOW_KERNING=1
     -DCR3_PATCH=1
 )
diff --git a/thirdparty/kpvcrlib/crengine b/thirdparty/kpvcrlib/crengine
index f20454111..fed8da73c 160000
--- a/thirdparty/kpvcrlib/crengine
+++ b/thirdparty/kpvcrlib/crengine
@@ -1 +1 @@
-Subproject commit f20454111fff249d78a1f092ff7ccba52c8b720f
+Subproject commit fed8da73cfdee016ebf12a32660e2586d564919e