From 5f13e68966b5a9f1d8f9779345caf6df975169f6 Mon Sep 17 00:00:00 2001 From: poire-z Date: Sun, 24 Mar 2019 22:09:50 +0100 Subject: [PATCH] bump crengine: line-height: reworked implemenation (#4835) Includes: - Revert "line-height: fix handling and inheritance" - Revert "line-height: switch base from 16 to 256 for more granularity" - CSS: parse "normal" keyword length - line-height: reworked implemenation for better conformance - 2-pages mode: fix middle margin sizing --- base | 2 +- spec/unit/readerhighlight_spec.lua | 2 +- spec/unit/readerlink_spec.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base b/base index a0088f580..8e1f86890 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit a0088f5803fd05851704c792b3add0893b47b945 +Subproject commit 8e1f86890acc1931564ed3382938f9612c6218ee diff --git a/spec/unit/readerhighlight_spec.lua b/spec/unit/readerhighlight_spec.lua index 4bb91be38..1b58560a4 100644 --- a/spec/unit/readerhighlight_spec.lua +++ b/spec/unit/readerhighlight_spec.lua @@ -86,7 +86,7 @@ describe("Readerhighlight module", function() readerui.highlight:clear() end) it("should highlight single word", function() - highlight_single_word(readerui, Geom:new{ x = 400, y = 110 }) + highlight_single_word(readerui, Geom:new{ x = 400, y = 70 }) Screen:shot("screenshots/reader_highlight_single_word_epub.png") assert.truthy(readerui.view.highlight.saved[page]) end) diff --git a/spec/unit/readerlink_spec.lua b/spec/unit/readerlink_spec.lua index 565b77514..e90f73c7a 100644 --- a/spec/unit/readerlink_spec.lua +++ b/spec/unit/readerlink_spec.lua @@ -19,7 +19,7 @@ describe("ReaderLink module", function() } readerui.rolling:onGotoPage(5) readerui.link:onTap(nil, {pos = {x = 340, y = 70}}) - assert.is.same(39, readerui.rolling.current_page) + assert.is.same(38, readerui.rolling.current_page) end) it("should jump to links in pdf page mode", function() @@ -56,7 +56,7 @@ describe("ReaderLink module", function() } readerui.rolling:onGotoPage(5) readerui.link:onTap(nil, {pos = {x = 340, y = 70}}) - assert.is.same(39, readerui.rolling.current_page) + assert.is.same(38, readerui.rolling.current_page) readerui.link:onGoBackLink() assert.is.same(5, readerui.rolling.current_page) end)