From 4f1224dc0bfc4a5ca02467dc9a37c388277002a3 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 30 Oct 2019 21:26:21 -0700 Subject: Use latest doclayout. Closes #5863. --- pandoc.cabal | 2 +- stack.yaml | 2 +- test/writer.opendocument | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index 27d2840b1..67357eae6 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -418,7 +418,7 @@ library case-insensitive >= 1.2 && < 1.3, unicode-transforms >= 0.3 && < 0.4, HsYAML >= 0.2 && < 0.3, - doclayout >= 0.2 && < 0.3, + doclayout >= 0.2.0.1 && < 0.3, ipynb >= 0.1 && < 0.2, attoparsec >= 0.12 && < 0.14, text-conversions >= 0.3 && < 0.4 diff --git a/stack.yaml b/stack.yaml index 7b7610b8c..1ae58c531 100644 --- a/stack.yaml +++ b/stack.yaml @@ -19,7 +19,7 @@ extra-deps: - skylighting-0.8.2.3 - skylighting-core-0.8.2.3 - regex-pcre-builtin-0.95.0.8.8.35 -- doclayout-0.2 +- doclayout-0.2.0.1 - HsYAML-0.2.0.0 - HsYAML-aeson-0.2.0.0 - doctemplates-0.7 diff --git a/test/writer.opendocument b/test/writer.opendocument index 5cfff6673..fa524eb26 100644 --- a/test/writer.opendocument +++ b/test/writer.opendocument @@ -1576,7 +1576,8 @@ italics: fruitcontains seeds, crisp, pleasant to taste orange -orange fruit{ orange code block }orange +orange +fruit{ orange code block }orange block quote Multiple definitions, tight: -- cgit v1.2.3