From 1c44c4c58439d0aafec167b0ec23deb0c8657d68 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Sun, 11 Sep 2022 19:53:07 +0200
Subject: [PATCH] bump crengine: better SVG support with extended LunaSVG

Build crengine against LunaSVG instead of NanoSVG.
Includes:
- SerialBuf: allow serializing longer strings
- Support '<img src="data:image/svg+xml,<svg...', remove ;-cr-plain,
- CSS: attribute selectors: accept ' or " as the quote char
- Embedded fonts: fix ignored name when sharing same url
- LVImg: fix possible crash on GIF images
- Fonts: DrawTextString(): allow collecting glyphs as SVG paths
- Images parsing: cache native sizes
- SVG: enhanced SVG support with LunaSVG extended
- Add ldomNode::isImage(), handle <object> and <embed> as images
- Handle the <svg> element as an SVG image
- Support SVG images as first class documents

Make credocument the preferred engine for .svg files.
---
 base                              | 2 +-
 frontend/document/credocument.lua | 1 +
 frontend/document/pdfdocument.lua | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/base b/base
index e09b79e58..d196c25aa 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit e09b79e581912bb6603de765af263c6a5642103d
+Subproject commit d196c25aa670dc7e6aca92b6454f6410ca6e0fcd
diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 7cae87a45..f471d5a93 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -1402,6 +1402,7 @@ function CreDocument:register(registry)
     registry:addProvider("prc", "application/vnd.palm", self)
     registry:addProvider("rtf", "application/rtf", self, 90)
     registry:addProvider("rtf.zip", "application/rtf+zip", self, 90) -- Alternative mimetype for OPDS.
+    registry:addProvider("svg", "image/svg+xml", self, 90)
     registry:addProvider("tcr", "application/tcr", self)
     registry:addProvider("txt", "text/plain", self, 90)
     registry:addProvider("txt.zip", "application/zip", self, 90)
diff --git a/frontend/document/pdfdocument.lua b/frontend/document/pdfdocument.lua
index f41be04b2..8683323ed 100644
--- a/frontend/document/pdfdocument.lua
+++ b/frontend/document/pdfdocument.lua
@@ -389,7 +389,7 @@ function PdfDocument:register(registry)
     registry:addProvider("png", "image/png", self, 90)
     registry:addProvider("pnm", "image/x‑portable‑bitmap", self, 90)
     registry:addProvider("ppm", "image/x‑portable‑bitmap", self, 90)
-    registry:addProvider("svg", "image/svg+xml", self, 90)
+    registry:addProvider("svg", "image/svg+xml", self, 80)
     registry:addProvider("tif", "image/tiff", self, 90)
     registry:addProvider("tiff", "image/tiff", self, 90)
     -- Windows Media Photo == JPEG XR