aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEmily Bourke <undergroundquizscene@protonmail.com>2021-10-07 15:25:15 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2021-10-07 08:45:43 -0700
commitaa78765bf9d21b3a617a9eafba59dd59e362aa6b (patch)
treecf41f230a9f68d6a8504a7d62c2f00449e3fa318 /test
parent5a1bd526776a9c75a1f348f42415d15d78969e8b (diff)
downloadpandoc-aa78765bf9d21b3a617a9eafba59dd59e362aa6b.tar.gz
pptx: Remove excessive layout tests
When I added the tests for moved layouts and deleted layouts, I added them to all tests. However, this doesn’t really give a lot more info than having single tests, and the extra tests take up time and disk space. This commit removes the moved-layouts and deleted-layouts tests, in favour of a single test for each of those scenarios.
Diffstat (limited to 'test')
-rw-r--r--test/Tests/Writers/Powerpoint.hs35
-rw-r--r--test/pptx/background-image/deleted-layouts.pptxbin56230 -> 0 bytes
-rw-r--r--test/pptx/background-image/moved-layouts.pptxbin66932 -> 0 bytes
-rw-r--r--test/pptx/blanks/just-speaker-notes/deleted-layouts.pptxbin35147 -> 0 bytes
-rw-r--r--test/pptx/blanks/just-speaker-notes/moved-layouts.pptxbin45837 -> 0 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-body/deleted-layouts.pptxbin32085 -> 0 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-body/moved-layouts.pptxbin42772 -> 0 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptxbin32085 -> 0 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-heading/moved-layouts.pptxbin42772 -> 0 bytes
-rw-r--r--test/pptx/code-custom/deleted-layouts.pptxbin32697 -> 0 bytes
-rw-r--r--test/pptx/code-custom/moved-layouts.pptxbin43385 -> 0 bytes
-rw-r--r--test/pptx/code/deleted-layouts.pptxbin32695 -> 0 bytes
-rw-r--r--test/pptx/code/moved-layouts.pptxbin43383 -> 0 bytes
-rw-r--r--test/pptx/comparison/both-columns/deleted-layouts.pptxbin47441 -> 0 bytes
-rw-r--r--test/pptx/comparison/both-columns/moved-layouts.pptxbin58159 -> 0 bytes
-rw-r--r--test/pptx/comparison/extra-image/deleted-layouts.pptxbin47470 -> 0 bytes
-rw-r--r--test/pptx/comparison/extra-image/moved-layouts.pptxbin58185 -> 0 bytes
-rw-r--r--test/pptx/comparison/extra-text/deleted-layouts.pptxbin47441 -> 0 bytes
-rw-r--r--test/pptx/comparison/extra-text/moved-layouts.pptxbin58159 -> 0 bytes
-rw-r--r--test/pptx/comparison/non-text-first/deleted-layouts.pptxbin47355 -> 0 bytes
-rw-r--r--test/pptx/comparison/non-text-first/moved-layouts.pptxbin58050 -> 0 bytes
-rw-r--r--test/pptx/comparison/one-column/deleted-layouts.pptxbin30780 -> 0 bytes
-rw-r--r--test/pptx/comparison/one-column/moved-layouts.pptxbin41499 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptxbin47189 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/heading-text-image/moved-layouts.pptxbin57887 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/image-text/deleted-layouts.pptxbin47891 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/image-text/moved-layouts.pptxbin58578 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/text-image/deleted-layouts.pptxbin47129 -> 0 bytes
-rw-r--r--test/pptx/content-with-caption/text-image/moved-layouts.pptxbin57827 -> 0 bytes
-rw-r--r--test/pptx/document-properties-short-desc/deleted-layouts.pptxbin31483 -> 0 bytes
-rw-r--r--test/pptx/document-properties-short-desc/moved-layouts.pptxbin42171 -> 0 bytes
-rw-r--r--test/pptx/document-properties/deleted-layouts.pptxbin31886 -> 0 bytes
-rw-r--r--test/pptx/document-properties/moved-layouts.pptxbin42573 -> 0 bytes
-rw-r--r--test/pptx/endnotes-toc/deleted-layouts.pptxbin32280 -> 0 bytes
-rw-r--r--test/pptx/endnotes-toc/moved-layouts.pptxbin42967 -> 0 bytes
-rw-r--r--test/pptx/endnotes/deleted-layouts.pptxbin31458 -> 0 bytes
-rw-r--r--test/pptx/endnotes/moved-layouts.pptxbin42146 -> 0 bytes
-rw-r--r--test/pptx/images/deleted-layouts.pptxbin49113 -> 0 bytes
-rw-r--r--test/pptx/images/moved-layouts.pptxbin59801 -> 0 bytes
-rw-r--r--test/pptx/incremental-lists/with-flag/deleted-layouts.pptxbin80042 -> 0 bytes
-rw-r--r--test/pptx/incremental-lists/with-flag/moved-layouts.pptxbin90782 -> 0 bytes
-rw-r--r--test/pptx/incremental-lists/without-flag/deleted-layouts.pptxbin78282 -> 0 bytes
-rw-r--r--test/pptx/incremental-lists/without-flag/moved-layouts.pptxbin89020 -> 0 bytes
-rw-r--r--test/pptx/inline-formatting/deleted-layouts.pptxbin30651 -> 0 bytes
-rw-r--r--test/pptx/inline-formatting/moved-layouts.pptxbin41339 -> 0 bytes
-rw-r--r--test/pptx/layouts/deleted.pptx (renamed from test/pptx/speaker-notes-afterseps/deleted-layouts.pptx)bin54374 -> 55694 bytes
-rw-r--r--test/pptx/layouts/input.native23
-rw-r--r--test/pptx/layouts/moved.pptx (renamed from test/pptx/speaker-notes-afterseps/moved-layouts.pptx)bin65064 -> 66430 bytes
-rw-r--r--test/pptx/lists/deleted-layouts.pptxbin31540 -> 0 bytes
-rw-r--r--test/pptx/lists/moved-layouts.pptxbin42230 -> 0 bytes
-rw-r--r--test/pptx/raw-ooxml/deleted-layouts.pptxbin31438 -> 0 bytes
-rw-r--r--test/pptx/raw-ooxml/moved-layouts.pptxbin42126 -> 0 bytes
-rw-r--r--test/pptx/remove-empty-slides/deleted-layouts.pptxbin47866 -> 0 bytes
-rw-r--r--test/pptx/remove-empty-slides/moved-layouts.pptxbin58553 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptxbin32233 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks-slide-level-1/moved-layouts.pptxbin42923 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks-toc/deleted-layouts.pptxbin34006 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks-toc/moved-layouts.pptxbin44696 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks/deleted-layouts.pptxbin33056 -> 0 bytes
-rw-r--r--test/pptx/slide-breaks/moved-layouts.pptxbin43746 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptxbin30786 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptxbin41479 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptxbin47114 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-image/moved-layouts.pptxbin57800 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptxbin30693 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-table/moved-layouts.pptxbin41381 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptxbin47114 -> 0 bytes
-rw-r--r--test/pptx/slide-level-0/h2-with-image/moved-layouts.pptxbin57800 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes-after-metadata/deleted-layouts.pptxbin34486 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes-after-metadata/moved-layouts.pptxbin45176 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes-afterheader/deleted-layouts.pptxbin33507 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes-afterheader/moved-layouts.pptxbin44195 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes/deleted-layouts.pptxbin38206 -> 0 bytes
-rw-r--r--test/pptx/speaker-notes/moved-layouts.pptxbin48899 -> 0 bytes
-rw-r--r--test/pptx/start-numbering-at/deleted-layouts.pptxbin31502 -> 0 bytes
-rw-r--r--test/pptx/start-numbering-at/moved-layouts.pptxbin42192 -> 0 bytes
-rw-r--r--test/pptx/tables/deleted-layouts.pptxbin32040 -> 0 bytes
-rw-r--r--test/pptx/tables/moved-layouts.pptxbin42729 -> 0 bytes
-rw-r--r--test/pptx/two-column/all-text/deleted-layouts.pptxbin30567 -> 0 bytes
-rw-r--r--test/pptx/two-column/all-text/moved-layouts.pptxbin41255 -> 0 bytes
-rw-r--r--test/pptx/two-column/text-and-image/deleted-layouts.pptxbin48381 -> 0 bytes
-rw-r--r--test/pptx/two-column/text-and-image/moved-layouts.pptxbin59075 -> 0 bytes
82 files changed, 38 insertions, 20 deletions
diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index b2df80e5f..84bdd7476 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -7,7 +7,6 @@ import System.FilePath
import Text.DocTemplates (ToContext(toVal), Context(..))
import qualified Data.Map as M
import Data.Text (pack)
-import Data.List (unzip4)
-- templating is important enough, and can break enough things, that
-- we want to run all our tests with both default formatting and a
@@ -17,11 +16,9 @@ modifyPptxName :: FilePath -> String -> FilePath
modifyPptxName fp suffix =
addExtension (takeDirectory fp ++ suffix) "pptx"
-pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree)
+pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree)
pptxTests name opts native pptx =
let referenceDoc = "pptx/reference-depth.pptx"
- movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx"
- deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx"
in
( ooxmlTest
writePowerpoint
@@ -35,28 +32,14 @@ pptxTests name opts native pptx =
opts{writerReferenceDoc=Just referenceDoc}
native
(modifyPptxName pptx "/templated")
- , ooxmlTest
- writePowerpoint
- name
- opts{writerReferenceDoc=Just movedLayoutsReferenceDoc}
- native
- (modifyPptxName pptx "/moved-layouts")
- , ooxmlTest
- writePowerpoint
- name
- opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc}
- native
- (modifyPptxName pptx "/deleted-layouts")
)
-groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree]
+groupPptxTests :: [(TestTree, TestTree)] -> [TestTree]
groupPptxTests pairs =
- let (noRefs, refs, movedLayouts, deletedLayouts) = unzip4 pairs
+ let (noRefs, refs) = unzip pairs
in
[ testGroup "Default slide formatting" noRefs
, testGroup "With `--reference-doc` pptx file" refs
- , testGroup "With layouts in reference doc moved" movedLayouts
- , testGroup "With layouts in reference doc deleted" deletedLayouts
]
@@ -272,5 +255,17 @@ tests = let
def { writerReferenceDoc = Just "pptx/footer/higher-slide-number/reference.pptx"}
"pptx/footer/input.native"
"pptx/footer/higher-slide-number/output.pptx"
+ , ooxmlTest
+ writePowerpoint
+ "Layouts can be moved around in reference doc"
+ def {writerReferenceDoc = Just "pptx/reference-moved-layouts.pptx"}
+ "pptx/layouts/input.native"
+ "pptx/layouts/moved.pptx"
+ , ooxmlTest
+ writePowerpoint
+ "Layouts can be missing from the reference doc"
+ def {writerReferenceDoc = Just "pptx/reference-deleted-layouts.pptx"}
+ "pptx/layouts/input.native"
+ "pptx/layouts/deleted.pptx"
]
in regularTests <> referenceSpecificTests
diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx
deleted file mode 100644
index e46a58ad7..000000000
--- a/test/pptx/background-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx
deleted file mode 100644
index 98fe33095..000000000
--- a/test/pptx/background-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
deleted file mode 100644
index f729c3ce6..000000000
--- a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
deleted file mode 100644
index dfae6a645..000000000
--- a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
deleted file mode 100644
index dcd88cb24..000000000
--- a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
deleted file mode 100644
index 0a69853fa..000000000
--- a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
deleted file mode 100644
index dcd88cb24..000000000
--- a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
deleted file mode 100644
index 0a69853fa..000000000
--- a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
deleted file mode 100644
index f8b1c789e..000000000
--- a/test/pptx/code-custom/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
deleted file mode 100644
index 810b46dd1..000000000
--- a/test/pptx/code-custom/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
deleted file mode 100644
index 3127e20e5..000000000
--- a/test/pptx/code/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
deleted file mode 100644
index 7a2e3b7ac..000000000
--- a/test/pptx/code/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx
deleted file mode 100644
index 6d80e275f..000000000
--- a/test/pptx/comparison/both-columns/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx
deleted file mode 100644
index 2840e0535..000000000
--- a/test/pptx/comparison/both-columns/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx
deleted file mode 100644
index 771ad409a..000000000
--- a/test/pptx/comparison/extra-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx
deleted file mode 100644
index 2418e98c1..000000000
--- a/test/pptx/comparison/extra-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx
deleted file mode 100644
index c87b3f3ee..000000000
--- a/test/pptx/comparison/extra-text/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx
deleted file mode 100644
index 2840e0535..000000000
--- a/test/pptx/comparison/extra-text/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx
deleted file mode 100644
index 95b2e3a3c..000000000
--- a/test/pptx/comparison/non-text-first/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx
deleted file mode 100644
index 5a60028d4..000000000
--- a/test/pptx/comparison/non-text-first/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx
deleted file mode 100644
index 6a705c735..000000000
--- a/test/pptx/comparison/one-column/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx
deleted file mode 100644
index f456151a5..000000000
--- a/test/pptx/comparison/one-column/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
deleted file mode 100644
index d01a8f9d8..000000000
--- a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
deleted file mode 100644
index 69cb830a9..000000000
--- a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
deleted file mode 100644
index e9aebd579..000000000
--- a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx
deleted file mode 100644
index c27f1e1cf..000000000
--- a/test/pptx/content-with-caption/image-text/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
deleted file mode 100644
index f15e674c7..000000000
--- a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx
deleted file mode 100644
index 39566cd7f..000000000
--- a/test/pptx/content-with-caption/text-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
deleted file mode 100644
index a6da0c338..000000000
--- a/test/pptx/document-properties-short-desc/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
deleted file mode 100644
index 4cff1d486..000000000
--- a/test/pptx/document-properties-short-desc/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
deleted file mode 100644
index a2a58af34..000000000
--- a/test/pptx/document-properties/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
deleted file mode 100644
index e24d904a2..000000000
--- a/test/pptx/document-properties/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx
deleted file mode 100644
index 3e613e038..000000000
--- a/test/pptx/endnotes-toc/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/endnotes-toc/moved-layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx
deleted file mode 100644
index e64cd9c77..000000000
--- a/test/pptx/endnotes-toc/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx
deleted file mode 100644
index 1d7ccb928..000000000
--- a/test/pptx/endnotes/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx
deleted file mode 100644
index 0f071207c..000000000
--- a/test/pptx/endnotes/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
deleted file mode 100644
index 3c3ed787f..000000000
--- a/test/pptx/images/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
deleted file mode 100644
index b22f3652a..000000000
--- a/test/pptx/images/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
deleted file mode 100644
index 3e92d4dab..000000000
--- a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
deleted file mode 100644
index 050842865..000000000
--- a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
deleted file mode 100644
index 4816c0b39..000000000
--- a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
deleted file mode 100644
index 4f27db07b..000000000
--- a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx
deleted file mode 100644
index ac9fa4725..000000000
--- a/test/pptx/inline-formatting/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/inline-formatting/moved-layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx
deleted file mode 100644
index 49a2409d1..000000000
--- a/test/pptx/inline-formatting/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/layouts/deleted.pptx
index 33dedf2c3..f7116b2f4 100644
--- a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
+++ b/test/pptx/layouts/deleted.pptx
Binary files differ
diff --git a/test/pptx/layouts/input.native b/test/pptx/layouts/input.native
new file mode 100644
index 000000000..0cee2d14e
--- /dev/null
+++ b/test/pptx/layouts/input.native
@@ -0,0 +1,23 @@
+Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "Testing",Space,Str "Layouts"])]})
+[Header 2 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "title",Space,Str "and",Space,Str "content",Space,Str "slide"]
+,Header 2 ("slide-2",[],[]) [Str "Slide",Space,Str "2"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+ [Para [Str "This"]]
+ ,Div ("",["column"],[])
+ [Para [Str "\8230is",Space,Str "a",Space,Str "two-column",Space,Str "slide"]]]
+,Header 2 ("slide-3",[],[]) [Str "Slide",Space,Str "3"]
+,Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Content",Space,Str "with",Space,Str "Caption",Space,Str "slide"]
+,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]
+,Header 2 ("slide-4",[],[]) [Str "Slide",Space,Str "4"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+ [Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Comparison",Space,Str "slide:"]
+ ,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+ [Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "other",Space,Str "text"]]]
+,Header 1 ("section-header",[],[]) [Str "Section",Space,Str "header"]
+,Header 2 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "blank",Space,Str "slide"]]]
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/layouts/moved.pptx
index 28bcf3887..e41465a86 100644
--- a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
+++ b/test/pptx/layouts/moved.pptx
Binary files differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
deleted file mode 100644
index d064b7fd5..000000000
--- a/test/pptx/lists/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
deleted file mode 100644
index 8a9c9ec59..000000000
--- a/test/pptx/lists/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx
deleted file mode 100644
index a7bd12281..000000000
--- a/test/pptx/raw-ooxml/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/raw-ooxml/moved-layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx
deleted file mode 100644
index 614682671..000000000
--- a/test/pptx/raw-ooxml/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx
deleted file mode 100644
index 488abc02a..000000000
--- a/test/pptx/remove-empty-slides/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx
deleted file mode 100644
index 1e1cf1e44..000000000
--- a/test/pptx/remove-empty-slides/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
deleted file mode 100644
index b6b004cd6..000000000
--- a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
deleted file mode 100644
index 229e4c32a..000000000
--- a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
deleted file mode 100644
index e3b3b2807..000000000
--- a/test/pptx/slide-breaks-toc/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
deleted file mode 100644
index ecc942803..000000000
--- a/test/pptx/slide-breaks-toc/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
deleted file mode 100644
index ada3453b0..000000000
--- a/test/pptx/slide-breaks/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
deleted file mode 100644
index 0fe10f443..000000000
--- a/test/pptx/slide-breaks/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
deleted file mode 100644
index c315a7a7a..000000000
--- a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
deleted file mode 100644
index 81b49936d..000000000
--- a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
deleted file mode 100644
index 478dde788..000000000
--- a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
deleted file mode 100644
index 63b411888..000000000
--- a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
deleted file mode 100644
index 9d58c2c52..000000000
--- a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
deleted file mode 100644
index 62424de73..000000000
--- a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
deleted file mode 100644
index 478dde788..000000000
--- a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
deleted file mode 100644
index 63b411888..000000000
--- a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
deleted file mode 100644
index 07e21ef02..000000000
--- a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
deleted file mode 100644
index d6673aac0..000000000
--- a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
deleted file mode 100644
index 0ccdd72b7..000000000
--- a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
deleted file mode 100644
index 81f0a56cb..000000000
--- a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
deleted file mode 100644
index 5f407086a..000000000
--- a/test/pptx/speaker-notes/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
deleted file mode 100644
index 83d5ed0af..000000000
--- a/test/pptx/speaker-notes/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
deleted file mode 100644
index d99fedfa6..000000000
--- a/test/pptx/start-numbering-at/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
deleted file mode 100644
index 98db3ec74..000000000
--- a/test/pptx/start-numbering-at/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
deleted file mode 100644
index 7ad714058..000000000
--- a/test/pptx/tables/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
deleted file mode 100644
index 9628717d7..000000000
--- a/test/pptx/tables/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx
deleted file mode 100644
index a321128b5..000000000
--- a/test/pptx/two-column/all-text/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx
deleted file mode 100644
index 90b1d9254..000000000
--- a/test/pptx/two-column/all-text/moved-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx
deleted file mode 100644
index 46274ffac..000000000
--- a/test/pptx/two-column/text-and-image/deleted-layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx
deleted file mode 100644
index c25331e23..000000000
--- a/test/pptx/two-column/text-and-image/moved-layouts.pptx
+++ /dev/null
Binary files differ