From 0883202e07f571a2aba30d15a08ed3a4154ecdce Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Tue, 23 Feb 2021 20:19:49 +0100
Subject: [PATCH] bump crengine: CSS line-break/word-break, various fixes
 (#7342)

Includes:
- LVString: Fix a c/p issue in lString8::atoi64
- LVTextFm: Simplify and fix resizeImage logic
- LVXMLParser::ReadText(): fix parsing at buffer boundaries
- TextLang: fix lang_tag first part comparison
- CSS font-family: fix parsing of 'inherit' and '!important'
- CSS: support a few -epub-* and -webkit-* properties
- Text fragment flags: add LTEXT_HAS_EXTRA
- CSS: add support for 'line-break' and 'word-break'
---
 base                            | 2 +-
 frontend/ui/data/css_tweaks.lua | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/base b/base
index 86a57a879..746e5541b 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 86a57a879a7ba2ca30c54a5de3680f2e25d6a0ff
+Subproject commit 746e5541bd9f3e42ba4615b50516b418c18a8450
diff --git a/frontend/ui/data/css_tweaks.lua b/frontend/ui/data/css_tweaks.lua
index 0ab0f9e43..201eecf8d 100644
--- a/frontend/ui/data/css_tweaks.lua
+++ b/frontend/ui/data/css_tweaks.lua
@@ -318,8 +318,7 @@ ruby { display: inline !important; }
                 id = "font_family_all_inherit";
                 title = _("Ignore publisher font families"),
                 description = _("Disable font-family specified in embedded styles."),
-                -- we have to use this trick, font-family handling by crengine is a bit complex
-                css = [[* { font-family: "NoSuchFont" !important; }]],
+                css = [[* { font-family: inherit !important; }]],
             },
             {
                 id = "font_size_all_inherit";