aboutsummaryrefslogtreecommitdiff
path: root/pandoc.cabal
diff options
context:
space:
mode:
authorEmily Bourke <undergroundquizscene@protonmail.com>2021-09-08 14:05:22 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2021-09-13 08:30:36 -0700
commit0ebe65e651766a2b3d006d3dee4afdfd43a386d5 (patch)
tree55bf6ebc804e6fca086c2318b38af66b6ecdfa84 /pandoc.cabal
parent6271b09c50444b107d8595f553700fa382718246 (diff)
downloadpandoc-0ebe65e651766a2b3d006d3dee4afdfd43a386d5.tar.gz
pptx: Fix logic for choosing Comparison layout
There was a mistake in the logic used to choose between the Comparison and Two Content layouts: if one column contained only non-text (an image or a table) and the other contained only text, the Comparison layout was chosen instead of the desired Two Content layout. This commit fixes that logic: > If either column contains text followed by non-text, use Comparison. Otherwise, use Two Content. It also adds a test asserting this behaviour.
Diffstat (limited to 'pandoc.cabal')
-rw-r--r--pandoc.cabal6
1 files changed, 4 insertions, 2 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 3de7da39c..347c33d51 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -446,8 +446,10 @@ extra-source-files:
test/pptx/start-numbering-at/*.pptx
test/pptx/tables/input.native
test/pptx/tables/*.pptx
- test/pptx/two-column/input.native
- test/pptx/two-column/*.pptx
+ test/pptx/two-column/all-text/input.native
+ test/pptx/two-column/all-text/*.pptx
+ test/pptx/two-column/text-and-image/input.native
+ test/pptx/two-column/text-and-image/*.pptx
test/ipynb/*.in.native
test/ipynb/*.out.native
test/ipynb/*.ipynb