diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-10-30 21:26:21 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-10-30 21:26:21 -0700 |
| commit | 4f1224dc0bfc4a5ca02467dc9a37c388277002a3 (patch) | |
| tree | 303ead6e2d51d830651f7cf00f9b3d576a06a656 | |
| parent | c6e936dec2fc0f0e4d15b7c6f7c4ed6934dd233a (diff) | |
| download | pandoc-4f1224dc0bfc4a5ca02467dc9a37c388277002a3.tar.gz | |
Use latest doclayout.
Closes #5863.
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | 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:</text:p> fruit</text:p><text:p text:style-name="Definition_20_Definition">contains seeds, crisp, pleasant to taste</text:p> <text:p text:style-name="Definition_20_Term"><text:span text:style-name="T1">orange</text:span></text:p> -<text:p text:style-name="Definition_20_Definition">orange fruit</text:p><text:p text:style-name="P42">{ orange code block }</text:p><text:p text:style-name="P43">orange +<text:p text:style-name="Definition_20_Definition">orange +fruit</text:p><text:p text:style-name="P42">{ orange code block }</text:p><text:p text:style-name="P43">orange block quote</text:p> <text:p text:style-name="First_20_paragraph">Multiple definitions, tight:</text:p> |