From 62630706bbbe0b648ca85faa4569f3448e162961 Mon Sep 17 00:00:00 2001 From: poire-z Date: Mon, 7 May 2018 23:58:12 +0200 Subject: [PATCH] bump base/crengine: stylesheet handling improvements (#3934) Includes: - Fix a few CSS selector issues - CSS: add support for some pseudo-classes - Hyphenation: update fr & de patterns - CSS: Fix non-lowercasing of specific elements names - Revert parts of recent BR handling fixes --- base | 2 +- spec/unit/readerlink_spec.lua | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base b/base index ed2a7bd6a..a5ee5e14e 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit ed2a7bd6a3a126e30c7e5cd46d8dd468b64508d8 +Subproject commit a5ee5e14ed077a9d76700929b10f40d35a508982 diff --git a/spec/unit/readerlink_spec.lua b/spec/unit/readerlink_spec.lua index d12eaf1f0..75767f410 100644 --- a/spec/unit/readerlink_spec.lua +++ b/spec/unit/readerlink_spec.lua @@ -16,9 +16,9 @@ describe("ReaderLink module", function() local readerui = ReaderUI:new{ document = DocumentRegistry:openDocument(sample_epub), } - readerui.rolling:onGotoPage(6) - readerui.link:onTap(nil, {pos = {x = 336, y = 166}}) - assert.is.same(40, readerui.rolling.current_page) + readerui.rolling:onGotoPage(4) + readerui.link:onTap(nil, {pos = {x = 336, y = 668}}) + assert.is.same(36, readerui.rolling.current_page) end) it("should jump to links in pdf page mode", function() @@ -53,11 +53,11 @@ describe("ReaderLink module", function() local readerui = ReaderUI:new{ document = DocumentRegistry:openDocument(sample_epub), } - readerui.rolling:onGotoPage(6) - readerui.link:onTap(nil, {pos = {x = 336, y = 166}}) - assert.is.same(40, readerui.rolling.current_page) + readerui.rolling:onGotoPage(4) + readerui.link:onTap(nil, {pos = {x = 336, y = 668}}) + assert.is.same(36, readerui.rolling.current_page) readerui.link:onGoBackLink() - assert.is.same(6, readerui.rolling.current_page) + assert.is.same(4, readerui.rolling.current_page) end) it("should be able to go back after link jump in pdf page mode", function()