From aa78765bf9d21b3a617a9eafba59dd59e362aa6b Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Thu, 7 Oct 2021 15:25:15 +0100
Subject: pptx: Remove excessive layout tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 test/Tests/Writers/Powerpoint.hs                   |  35 +++++++++------------
 test/pptx/background-image/deleted-layouts.pptx    | Bin 56230 -> 0 bytes
 test/pptx/background-image/moved-layouts.pptx      | Bin 66932 -> 0 bytes
 .../blanks/just-speaker-notes/deleted-layouts.pptx | Bin 35147 -> 0 bytes
 .../blanks/just-speaker-notes/moved-layouts.pptx   | Bin 45837 -> 0 bytes
 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx | Bin 32085 -> 0 bytes
 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx   | Bin 42772 -> 0 bytes
 .../blanks/nbsp-in-heading/deleted-layouts.pptx    | Bin 32085 -> 0 bytes
 .../pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 42772 -> 0 bytes
 test/pptx/code-custom/deleted-layouts.pptx         | Bin 32697 -> 0 bytes
 test/pptx/code-custom/moved-layouts.pptx           | Bin 43385 -> 0 bytes
 test/pptx/code/deleted-layouts.pptx                | Bin 32695 -> 0 bytes
 test/pptx/code/moved-layouts.pptx                  | Bin 43383 -> 0 bytes
 .../comparison/both-columns/deleted-layouts.pptx   | Bin 47441 -> 0 bytes
 .../comparison/both-columns/moved-layouts.pptx     | Bin 58159 -> 0 bytes
 .../comparison/extra-image/deleted-layouts.pptx    | Bin 47470 -> 0 bytes
 .../pptx/comparison/extra-image/moved-layouts.pptx | Bin 58185 -> 0 bytes
 .../comparison/extra-text/deleted-layouts.pptx     | Bin 47441 -> 0 bytes
 test/pptx/comparison/extra-text/moved-layouts.pptx | Bin 58159 -> 0 bytes
 .../comparison/non-text-first/deleted-layouts.pptx | Bin 47355 -> 0 bytes
 .../comparison/non-text-first/moved-layouts.pptx   | Bin 58050 -> 0 bytes
 .../comparison/one-column/deleted-layouts.pptx     | Bin 30780 -> 0 bytes
 test/pptx/comparison/one-column/moved-layouts.pptx | Bin 41499 -> 0 bytes
 .../heading-text-image/deleted-layouts.pptx        | Bin 47189 -> 0 bytes
 .../heading-text-image/moved-layouts.pptx          | Bin 57887 -> 0 bytes
 .../image-text/deleted-layouts.pptx                | Bin 47891 -> 0 bytes
 .../image-text/moved-layouts.pptx                  | Bin 58578 -> 0 bytes
 .../text-image/deleted-layouts.pptx                | Bin 47129 -> 0 bytes
 .../text-image/moved-layouts.pptx                  | Bin 57827 -> 0 bytes
 .../deleted-layouts.pptx                           | Bin 31483 -> 0 bytes
 .../moved-layouts.pptx                             | Bin 42171 -> 0 bytes
 test/pptx/document-properties/deleted-layouts.pptx | Bin 31886 -> 0 bytes
 test/pptx/document-properties/moved-layouts.pptx   | Bin 42573 -> 0 bytes
 test/pptx/endnotes-toc/deleted-layouts.pptx        | Bin 32280 -> 0 bytes
 test/pptx/endnotes-toc/moved-layouts.pptx          | Bin 42967 -> 0 bytes
 test/pptx/endnotes/deleted-layouts.pptx            | Bin 31458 -> 0 bytes
 test/pptx/endnotes/moved-layouts.pptx              | Bin 42146 -> 0 bytes
 test/pptx/images/deleted-layouts.pptx              | Bin 49113 -> 0 bytes
 test/pptx/images/moved-layouts.pptx                | Bin 59801 -> 0 bytes
 .../with-flag/deleted-layouts.pptx                 | Bin 80042 -> 0 bytes
 .../incremental-lists/with-flag/moved-layouts.pptx | Bin 90782 -> 0 bytes
 .../without-flag/deleted-layouts.pptx              | Bin 78282 -> 0 bytes
 .../without-flag/moved-layouts.pptx                | Bin 89020 -> 0 bytes
 test/pptx/inline-formatting/deleted-layouts.pptx   | Bin 30651 -> 0 bytes
 test/pptx/inline-formatting/moved-layouts.pptx     | Bin 41339 -> 0 bytes
 test/pptx/layouts/deleted.pptx                     | Bin 0 -> 55694 bytes
 test/pptx/layouts/input.native                     |  23 ++++++++++++++
 test/pptx/layouts/moved.pptx                       | Bin 0 -> 66430 bytes
 test/pptx/lists/deleted-layouts.pptx               | Bin 31540 -> 0 bytes
 test/pptx/lists/moved-layouts.pptx                 | Bin 42230 -> 0 bytes
 test/pptx/raw-ooxml/deleted-layouts.pptx           | Bin 31438 -> 0 bytes
 test/pptx/raw-ooxml/moved-layouts.pptx             | Bin 42126 -> 0 bytes
 test/pptx/remove-empty-slides/deleted-layouts.pptx | Bin 47866 -> 0 bytes
 test/pptx/remove-empty-slides/moved-layouts.pptx   | Bin 58553 -> 0 bytes
 .../deleted-layouts.pptx                           | Bin 32233 -> 0 bytes
 .../slide-breaks-slide-level-1/moved-layouts.pptx  | Bin 42923 -> 0 bytes
 test/pptx/slide-breaks-toc/deleted-layouts.pptx    | Bin 34006 -> 0 bytes
 test/pptx/slide-breaks-toc/moved-layouts.pptx      | Bin 44696 -> 0 bytes
 test/pptx/slide-breaks/deleted-layouts.pptx        | Bin 33056 -> 0 bytes
 test/pptx/slide-breaks/moved-layouts.pptx          | Bin 43746 -> 0 bytes
 .../h1-h2-with-table/deleted-layouts.pptx          | Bin 30786 -> 0 bytes
 .../h1-h2-with-table/moved-layouts.pptx            | Bin 41479 -> 0 bytes
 .../h1-with-image/deleted-layouts.pptx             | Bin 47114 -> 0 bytes
 .../slide-level-0/h1-with-image/moved-layouts.pptx | Bin 57800 -> 0 bytes
 .../h1-with-table/deleted-layouts.pptx             | Bin 30693 -> 0 bytes
 .../slide-level-0/h1-with-table/moved-layouts.pptx | Bin 41381 -> 0 bytes
 .../h2-with-image/deleted-layouts.pptx             | Bin 47114 -> 0 bytes
 .../slide-level-0/h2-with-image/moved-layouts.pptx | Bin 57800 -> 0 bytes
 .../deleted-layouts.pptx                           | Bin 34486 -> 0 bytes
 .../moved-layouts.pptx                             | Bin 45176 -> 0 bytes
 .../speaker-notes-afterheader/deleted-layouts.pptx | Bin 33507 -> 0 bytes
 .../speaker-notes-afterheader/moved-layouts.pptx   | Bin 44195 -> 0 bytes
 .../speaker-notes-afterseps/deleted-layouts.pptx   | Bin 54374 -> 0 bytes
 .../speaker-notes-afterseps/moved-layouts.pptx     | Bin 65064 -> 0 bytes
 test/pptx/speaker-notes/deleted-layouts.pptx       | Bin 38206 -> 0 bytes
 test/pptx/speaker-notes/moved-layouts.pptx         | Bin 48899 -> 0 bytes
 test/pptx/start-numbering-at/deleted-layouts.pptx  | Bin 31502 -> 0 bytes
 test/pptx/start-numbering-at/moved-layouts.pptx    | Bin 42192 -> 0 bytes
 test/pptx/tables/deleted-layouts.pptx              | Bin 32040 -> 0 bytes
 test/pptx/tables/moved-layouts.pptx                | Bin 42729 -> 0 bytes
 test/pptx/two-column/all-text/deleted-layouts.pptx | Bin 30567 -> 0 bytes
 test/pptx/two-column/all-text/moved-layouts.pptx   | Bin 41255 -> 0 bytes
 .../two-column/text-and-image/deleted-layouts.pptx | Bin 48381 -> 0 bytes
 .../two-column/text-and-image/moved-layouts.pptx   | Bin 59075 -> 0 bytes
 84 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 test/pptx/background-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/background-image/moved-layouts.pptx
 delete mode 100644 test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
 delete mode 100644 test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
 delete mode 100644 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
 delete mode 100644 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
 delete mode 100644 test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
 delete mode 100644 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
 delete mode 100644 test/pptx/code-custom/deleted-layouts.pptx
 delete mode 100644 test/pptx/code-custom/moved-layouts.pptx
 delete mode 100644 test/pptx/code/deleted-layouts.pptx
 delete mode 100644 test/pptx/code/moved-layouts.pptx
 delete mode 100644 test/pptx/comparison/both-columns/deleted-layouts.pptx
 delete mode 100644 test/pptx/comparison/both-columns/moved-layouts.pptx
 delete mode 100644 test/pptx/comparison/extra-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/comparison/extra-image/moved-layouts.pptx
 delete mode 100644 test/pptx/comparison/extra-text/deleted-layouts.pptx
 delete mode 100644 test/pptx/comparison/extra-text/moved-layouts.pptx
 delete mode 100644 test/pptx/comparison/non-text-first/deleted-layouts.pptx
 delete mode 100644 test/pptx/comparison/non-text-first/moved-layouts.pptx
 delete mode 100644 test/pptx/comparison/one-column/deleted-layouts.pptx
 delete mode 100644 test/pptx/comparison/one-column/moved-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/image-text/deleted-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/image-text/moved-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/text-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/content-with-caption/text-image/moved-layouts.pptx
 delete mode 100644 test/pptx/document-properties-short-desc/deleted-layouts.pptx
 delete mode 100644 test/pptx/document-properties-short-desc/moved-layouts.pptx
 delete mode 100644 test/pptx/document-properties/deleted-layouts.pptx
 delete mode 100644 test/pptx/document-properties/moved-layouts.pptx
 delete mode 100644 test/pptx/endnotes-toc/deleted-layouts.pptx
 delete mode 100644 test/pptx/endnotes-toc/moved-layouts.pptx
 delete mode 100644 test/pptx/endnotes/deleted-layouts.pptx
 delete mode 100644 test/pptx/endnotes/moved-layouts.pptx
 delete mode 100644 test/pptx/images/deleted-layouts.pptx
 delete mode 100644 test/pptx/images/moved-layouts.pptx
 delete mode 100644 test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
 delete mode 100644 test/pptx/incremental-lists/with-flag/moved-layouts.pptx
 delete mode 100644 test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
 delete mode 100644 test/pptx/incremental-lists/without-flag/moved-layouts.pptx
 delete mode 100644 test/pptx/inline-formatting/deleted-layouts.pptx
 delete mode 100644 test/pptx/inline-formatting/moved-layouts.pptx
 create mode 100644 test/pptx/layouts/deleted.pptx
 create mode 100644 test/pptx/layouts/input.native
 create mode 100644 test/pptx/layouts/moved.pptx
 delete mode 100644 test/pptx/lists/deleted-layouts.pptx
 delete mode 100644 test/pptx/lists/moved-layouts.pptx
 delete mode 100644 test/pptx/raw-ooxml/deleted-layouts.pptx
 delete mode 100644 test/pptx/raw-ooxml/moved-layouts.pptx
 delete mode 100644 test/pptx/remove-empty-slides/deleted-layouts.pptx
 delete mode 100644 test/pptx/remove-empty-slides/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks-toc/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks-toc/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-breaks/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-afterheader/moved-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes-afterseps/moved-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes/deleted-layouts.pptx
 delete mode 100644 test/pptx/speaker-notes/moved-layouts.pptx
 delete mode 100644 test/pptx/start-numbering-at/deleted-layouts.pptx
 delete mode 100644 test/pptx/start-numbering-at/moved-layouts.pptx
 delete mode 100644 test/pptx/tables/deleted-layouts.pptx
 delete mode 100644 test/pptx/tables/moved-layouts.pptx
 delete mode 100644 test/pptx/two-column/all-text/deleted-layouts.pptx
 delete mode 100644 test/pptx/two-column/all-text/moved-layouts.pptx
 delete mode 100644 test/pptx/two-column/text-and-image/deleted-layouts.pptx
 delete mode 100644 test/pptx/two-column/text-and-image/moved-layouts.pptx

(limited to 'test')

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
Binary files a/test/pptx/background-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/background-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/code-custom/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/code-custom/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
deleted file mode 100644
index 3127e20e5..000000000
Binary files a/test/pptx/code/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
deleted file mode 100644
index 7a2e3b7ac..000000000
Binary files a/test/pptx/code/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/document-properties/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/document-properties/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/endnotes-toc/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/endnotes-toc/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx
deleted file mode 100644
index 1d7ccb928..000000000
Binary files a/test/pptx/endnotes/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx
deleted file mode 100644
index 0f071207c..000000000
Binary files a/test/pptx/endnotes/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
deleted file mode 100644
index 3c3ed787f..000000000
Binary files a/test/pptx/images/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
deleted file mode 100644
index b22f3652a..000000000
Binary files a/test/pptx/images/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/inline-formatting/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/inline-formatting/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/layouts/deleted.pptx b/test/pptx/layouts/deleted.pptx
new file mode 100644
index 000000000..f7116b2f4
Binary files /dev/null and b/test/pptx/layouts/deleted.pptx 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/layouts/moved.pptx b/test/pptx/layouts/moved.pptx
new file mode 100644
index 000000000..e41465a86
Binary files /dev/null and b/test/pptx/layouts/moved.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
deleted file mode 100644
index d064b7fd5..000000000
Binary files a/test/pptx/lists/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
deleted file mode 100644
index 8a9c9ec59..000000000
Binary files a/test/pptx/lists/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/raw-ooxml/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/raw-ooxml/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/remove-empty-slides/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/remove-empty-slides/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
deleted file mode 100644
index 33dedf2c3..000000000
Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
deleted file mode 100644
index 28bcf3887..000000000
Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
deleted file mode 100644
index 7ad714058..000000000
Binary files a/test/pptx/tables/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
deleted file mode 100644
index 9628717d7..000000000
Binary files a/test/pptx/tables/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/two-column/all-text/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/two-column/all-text/moved-layouts.pptx and /dev/null 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
Binary files a/test/pptx/two-column/text-and-image/deleted-layouts.pptx and /dev/null 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
Binary files a/test/pptx/two-column/text-and-image/moved-layouts.pptx and /dev/null differ
-- 
cgit v1.2.3