From 8a568a2721f3b5c9f01fdf2e4050cf5917996c56 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Thu, 25 Jun 2020 10:18:06 +0200
Subject: [PATCH] bump crengine: add support for <ruby> elements

Includes:
- Fix some non-recursive subtree walkers
- Text: skip formatting optimisations when inlineBoxes
- CSS parsing: parse selectors starting with [attrib]
- Use T="" for internal elements attributes
- CSS: re-order css_d_* (display) enum for easier checking
- Rendering methods: remove erm_table_cell
- Rendering methods: remove erm_table_caption
- Rendering methods: remove erm_list_item
- getRenderedWidths(): better estimate table width
- styleToTextFmtFlags(): adds is_block parameter
- Adds support for "display: ruby" and <ruby> elements
- Fix prev/next-VisibleWord-Start/End() with CJK text

Also bump HarfBuzz to 2.6.8 and evernote-lua-sdk.
---
 base                            |  2 +-
 frontend/ui/data/css_tweaks.lua | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/base b/base
index 68e433ee3..849231bf5 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 68e433ee33ddabf593273fa2536b27a3b0c2dfcf
+Subproject commit 849231bf518a6b1457459b408b9ef04e36f44b83
diff --git a/frontend/ui/data/css_tweaks.lua b/frontend/ui/data/css_tweaks.lua
index deebb9c44..961fad38c 100644
--- a/frontend/ui/data/css_tweaks.lua
+++ b/frontend/ui/data/css_tweaks.lua
@@ -281,7 +281,7 @@ DocFragment {
             },
         },
         {
-            title = _("Hyphenation and ligatures"),
+            title = _("Hyphenation, ligatures, ruby"),
             {
                 id = "hyphenate_all_auto";
                 title = _("Allow hyphenation on all text"),
@@ -300,6 +300,15 @@ h1, h2, h3, h4, h5, h6 { hyphens: none !important; }
                 css = [[
 * { font-variant: no-common-ligatures; }
                 ]],
+                separator = true,
+            },
+            {
+                id = "ruby_inline";
+                title = _("Render <ruby> content inline"),
+                description = _("Disable handling of <ruby> tags and render them inline."),
+                css = [[
+ruby { display: inline !important; }
+                ]],
             },
             separator = true,
         },