diff --git a/pandoc.cabal b/pandoc.cabal index da53cb1cd..7fb951488 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,7 +380,60 @@ extra-source-files: test/rtf/*.native test/rtf/*.rtf test/pptx/*.pptx - test/pptx/*.native + test/pptx/code-custom/*.pptx + test/pptx/code/input.native + test/pptx/code/*.pptx + test/pptx/comparison-both-columns/input.native + test/pptx/comparison-both-columns/*.pptx + test/pptx/comparison-extra-text/input.native + test/pptx/comparison-extra-text/*.pptx + test/pptx/comparison-non-text-first/input.native + test/pptx/comparison-non-text-first/*.pptx + test/pptx/comparison-one-column/input.native + test/pptx/comparison-one-column/*.pptx + test/pptx/document-properties-short-desc/input.native + test/pptx/document-properties-short-desc/*.pptx + test/pptx/document-properties/input.native + test/pptx/document-properties/*.pptx + test/pptx/endnotes-toc/*.pptx + test/pptx/endnotes/input.native + test/pptx/endnotes/*.pptx + test/pptx/images/input.native + test/pptx/images/*.pptx + test/pptx/inline-formatting/input.native + test/pptx/inline-formatting/*.pptx + test/pptx/lists/input.native + test/pptx/lists/*.pptx + test/pptx/raw-ooxml/input.native + test/pptx/raw-ooxml/*.pptx + test/pptx/remove-empty-slides/input.native + test/pptx/remove-empty-slides/*.pptx + test/pptx/slide-breaks-slide-level-1/*.pptx + test/pptx/slide-breaks-toc/*.pptx + test/pptx/slide-breaks/input.native + test/pptx/slide-breaks/*.pptx + test/pptx/slide-level-0/h1-h2-with-table/input.native + test/pptx/slide-level-0/h1-h2-with-table/*.pptx + test/pptx/slide-level-0/h1-with-image/input.native + test/pptx/slide-level-0/h1-with-image/*.pptx + test/pptx/slide-level-0/h1-with-table/input.native + test/pptx/slide-level-0/h1-with-table/*.pptx + test/pptx/slide-level-0/h2-with-image/input.native + test/pptx/slide-level-0/h2-with-image/*.pptx + test/pptx/speaker-notes-after-metadata/input.native + test/pptx/speaker-notes-after-metadata/*.pptx + test/pptx/speaker-notes-afterheader/input.native + test/pptx/speaker-notes-afterheader/*.pptx + test/pptx/speaker-notes-afterseps/input.native + test/pptx/speaker-notes-afterseps/*.pptx + test/pptx/speaker-notes/input.native + test/pptx/speaker-notes/*.pptx + test/pptx/start-numbering-at/input.native + 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/ipynb/*.in.native test/ipynb/*.out.native test/ipynb/*.ipynb diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index fd6d01d2d..fd9871659 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -15,13 +15,13 @@ import Data.List (unzip4) modifyPptxName :: FilePath -> String -> FilePath modifyPptxName fp suffix = - addExtension (dropExtension fp ++ suffix) "pptx" + addExtension (takeDirectory fp ++ suffix) "pptx" pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, 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" + let referenceDoc = "pptx/reference-depth.pptx" + movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx" + deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx" in ( ooxmlTest writePowerpoint @@ -34,19 +34,19 @@ pptxTests name opts native pptx = name opts{writerReferenceDoc=Just referenceDoc} native - (modifyPptxName pptx "_templated") + (modifyPptxName pptx "/templated") , ooxmlTest writePowerpoint name opts{writerReferenceDoc=Just movedLayoutsReferenceDoc} native - (modifyPptxName pptx "_moved_layouts") + (modifyPptxName pptx "/moved-layouts") , ooxmlTest writePowerpoint name opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc} native - (modifyPptxName pptx "_deleted_layouts") + (modifyPptxName pptx "/deleted-layouts") ) groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree] @@ -63,112 +63,112 @@ groupPptxTests pairs = tests :: [TestTree] tests = groupPptxTests [ pptxTests "Inline formatting" def - "pptx/inline_formatting.native" - "pptx/inline_formatting.pptx" + "pptx/inline-formatting/input.native" + "pptx/inline-formatting/output.pptx" , pptxTests "Slide breaks (default slide-level)" def - "pptx/slide_breaks.native" - "pptx/slide_breaks.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks/output.pptx" , pptxTests "slide breaks (slide-level set to 1)" def{ writerSlideLevel = Just 1 } - "pptx/slide_breaks.native" - "pptx/slide_breaks_slide_level_1.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks-slide-level-1/output.pptx" , pptxTests "lists" def - "pptx/lists.native" - "pptx/lists.pptx" + "pptx/lists/input.native" + "pptx/lists/output.pptx" , pptxTests "start ordered list at specified num" def - "pptx/start_numbering_at.native" - "pptx/start_numbering_at.pptx" + "pptx/start-numbering-at/input.native" + "pptx/start-numbering-at/output.pptx" , pptxTests "tables" def - "pptx/tables.native" - "pptx/tables.pptx" + "pptx/tables/input.native" + "pptx/tables/output.pptx" , pptxTests "table of contents" def{ writerTableOfContents = True } - "pptx/slide_breaks.native" - "pptx/slide_breaks_toc.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks-toc/output.pptx" , pptxTests "end notes" def - "pptx/endnotes.native" - "pptx/endnotes.pptx" + "pptx/endnotes/input.native" + "pptx/endnotes/output.pptx" , pptxTests "end notes, with table of contents" def { writerTableOfContents = True } - "pptx/endnotes.native" - "pptx/endnotes_toc.pptx" + "pptx/endnotes/input.native" + "pptx/endnotes-toc/output.pptx" , pptxTests "images" def - "pptx/images.native" - "pptx/images.pptx" + "pptx/images/input.native" + "pptx/images/output.pptx" , pptxTests "two-column layout" def - "pptx/two_column.native" - "pptx/two_column.pptx" + "pptx/two-column/input.native" + "pptx/two-column/output.pptx" , pptxTests "speaker notes" def - "pptx/speaker_notes.native" - "pptx/speaker_notes.pptx" + "pptx/speaker-notes/input.native" + "pptx/speaker-notes/output.pptx" , pptxTests "speaker notes after a separating block" def - "pptx/speaker_notes_afterseps.native" - "pptx/speaker_notes_afterseps.pptx" + "pptx/speaker-notes-afterseps/input.native" + "pptx/speaker-notes-afterseps/output.pptx" , pptxTests "speaker notes after a separating header" def - "pptx/speaker_notes_afterheader.native" - "pptx/speaker_notes_afterheader.pptx" + "pptx/speaker-notes-afterheader/input.native" + "pptx/speaker-notes-afterheader/output.pptx" , pptxTests "speaker notes after metadata" def - "pptx/speaker_notes_after_metadata.native" - "pptx/speaker_notes_after_metadata.pptx" + "pptx/speaker-notes-after-metadata/input.native" + "pptx/speaker-notes-after-metadata/output.pptx" , pptxTests "remove empty slides" def - "pptx/remove_empty_slides.native" - "pptx/remove_empty_slides.pptx" + "pptx/remove-empty-slides/input.native" + "pptx/remove-empty-slides/output.pptx" , pptxTests "raw ooxml" def - "pptx/raw_ooxml.native" - "pptx/raw_ooxml.pptx" + "pptx/raw-ooxml/input.native" + "pptx/raw-ooxml/output.pptx" , pptxTests "metadata, custom properties" def - "pptx/document-properties.native" - "pptx/document-properties.pptx" + "pptx/document-properties/input.native" + "pptx/document-properties/output.pptx" , pptxTests "metadata, short description" def - "pptx/document-properties-short-desc.native" - "pptx/document-properties-short-desc.pptx" + "pptx/document-properties-short-desc/input.native" + "pptx/document-properties-short-desc/output.pptx" , pptxTests "inline code and code blocks" def - "pptx/code.native" - "pptx/code.pptx" + "pptx/code/input.native" + "pptx/code/output.pptx" , pptxTests "inline code and code blocks, custom formatting" def { writerVariables = Context $ M.fromList [(pack "monofont", toVal $ pack "Consolas")] } - "pptx/code.native" - "pptx/code-custom.pptx" + "pptx/code/input.native" + "pptx/code-custom/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a h1 it's used as the " <> "slide title") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-with-image.native" - "pptx/slide-level-0-h1-with-image.pptx" + "pptx/slide-level-0/h1-with-image/input.native" + "pptx/slide-level-0/h1-with-image/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a h2 it's used as the " <> "slide title") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h2-with-image.native" - "pptx/slide-level-0-h2-with-image.pptx" + "pptx/slide-level-0/h2-with-image/input.native" + "pptx/slide-level-0/h2-with-image/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a heading it's used as the " <> "slide title (works with a table)") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-with-table.native" - "pptx/slide-level-0-h1-with-table.pptx" + "pptx/slide-level-0/h1-with-table/input.native" + "pptx/slide-level-0/h1-with-table/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a heading it's used as the " <> "slide title (two headings forces a " <> "slide break though)") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-h2-with-table.native" - "pptx/slide-level-0-h1-h2-with-table.pptx" + "pptx/slide-level-0/h1-h2-with-table/input.native" + "pptx/slide-level-0/h1-h2-with-table/output.pptx" ] diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx similarity index 100% rename from test/pptx/code-custom_deleted_layouts.pptx rename to test/pptx/code-custom/deleted-layouts.pptx diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx similarity index 100% rename from test/pptx/code-custom_moved_layouts.pptx rename to test/pptx/code-custom/moved-layouts.pptx diff --git a/test/pptx/code-custom.pptx b/test/pptx/code-custom/output.pptx similarity index 100% rename from test/pptx/code-custom.pptx rename to test/pptx/code-custom/output.pptx diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/code-custom/templated.pptx similarity index 100% rename from test/pptx/code-custom_templated.pptx rename to test/pptx/code-custom/templated.pptx diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code/deleted-layouts.pptx similarity index 100% rename from test/pptx/code_deleted_layouts.pptx rename to test/pptx/code/deleted-layouts.pptx diff --git a/test/pptx/code.native b/test/pptx/code/input.native similarity index 100% rename from test/pptx/code.native rename to test/pptx/code/input.native diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code/moved-layouts.pptx similarity index 100% rename from test/pptx/code_moved_layouts.pptx rename to test/pptx/code/moved-layouts.pptx diff --git a/test/pptx/code.pptx b/test/pptx/code/output.pptx similarity index 100% rename from test/pptx/code.pptx rename to test/pptx/code/output.pptx diff --git a/test/pptx/code_templated.pptx b/test/pptx/code/templated.pptx similarity index 100% rename from test/pptx/code_templated.pptx rename to test/pptx/code/templated.pptx diff --git a/test/pptx/document-properties-short-desc_deleted_layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx similarity index 100% rename from test/pptx/document-properties-short-desc_deleted_layouts.pptx rename to test/pptx/document-properties-short-desc/deleted-layouts.pptx diff --git a/test/pptx/document-properties-short-desc.native b/test/pptx/document-properties-short-desc/input.native similarity index 100% rename from test/pptx/document-properties-short-desc.native rename to test/pptx/document-properties-short-desc/input.native diff --git a/test/pptx/document-properties-short-desc_moved_layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx similarity index 100% rename from test/pptx/document-properties-short-desc_moved_layouts.pptx rename to test/pptx/document-properties-short-desc/moved-layouts.pptx diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc/output.pptx similarity index 100% rename from test/pptx/document-properties-short-desc.pptx rename to test/pptx/document-properties-short-desc/output.pptx diff --git a/test/pptx/document-properties-short-desc_templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx similarity index 100% rename from test/pptx/document-properties-short-desc_templated.pptx rename to test/pptx/document-properties-short-desc/templated.pptx diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx similarity index 100% rename from test/pptx/document-properties_deleted_layouts.pptx rename to test/pptx/document-properties/deleted-layouts.pptx diff --git a/test/pptx/document-properties.native b/test/pptx/document-properties/input.native similarity index 100% rename from test/pptx/document-properties.native rename to test/pptx/document-properties/input.native diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx similarity index 100% rename from test/pptx/document-properties_moved_layouts.pptx rename to test/pptx/document-properties/moved-layouts.pptx diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties/output.pptx similarity index 100% rename from test/pptx/document-properties.pptx rename to test/pptx/document-properties/output.pptx diff --git a/test/pptx/document-properties_templated.pptx b/test/pptx/document-properties/templated.pptx similarity index 100% rename from test/pptx/document-properties_templated.pptx rename to test/pptx/document-properties/templated.pptx diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx similarity index 100% rename from test/pptx/endnotes_toc_deleted_layouts.pptx rename to test/pptx/endnotes-toc/deleted-layouts.pptx diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx similarity index 100% rename from test/pptx/endnotes_toc_moved_layouts.pptx rename to test/pptx/endnotes-toc/moved-layouts.pptx diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes-toc/output.pptx similarity index 100% rename from test/pptx/endnotes_toc.pptx rename to test/pptx/endnotes-toc/output.pptx diff --git a/test/pptx/endnotes_toc_templated.pptx b/test/pptx/endnotes-toc/templated.pptx similarity index 100% rename from test/pptx/endnotes_toc_templated.pptx rename to test/pptx/endnotes-toc/templated.pptx diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx similarity index 100% rename from test/pptx/endnotes_deleted_layouts.pptx rename to test/pptx/endnotes/deleted-layouts.pptx diff --git a/test/pptx/endnotes.native b/test/pptx/endnotes/input.native similarity index 100% rename from test/pptx/endnotes.native rename to test/pptx/endnotes/input.native diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx similarity index 100% rename from test/pptx/endnotes_moved_layouts.pptx rename to test/pptx/endnotes/moved-layouts.pptx diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes/output.pptx similarity index 100% rename from test/pptx/endnotes.pptx rename to test/pptx/endnotes/output.pptx diff --git a/test/pptx/endnotes_templated.pptx b/test/pptx/endnotes/templated.pptx similarity index 100% rename from test/pptx/endnotes_templated.pptx rename to test/pptx/endnotes/templated.pptx diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images/deleted-layouts.pptx similarity index 100% rename from test/pptx/images_deleted_layouts.pptx rename to test/pptx/images/deleted-layouts.pptx diff --git a/test/pptx/images.native b/test/pptx/images/input.native similarity index 100% rename from test/pptx/images.native rename to test/pptx/images/input.native diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images/moved-layouts.pptx similarity index 100% rename from test/pptx/images_moved_layouts.pptx rename to test/pptx/images/moved-layouts.pptx diff --git a/test/pptx/images.pptx b/test/pptx/images/output.pptx similarity index 100% rename from test/pptx/images.pptx rename to test/pptx/images/output.pptx diff --git a/test/pptx/images_templated.pptx b/test/pptx/images/templated.pptx similarity index 100% rename from test/pptx/images_templated.pptx rename to test/pptx/images/templated.pptx diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx similarity index 100% rename from test/pptx/inline_formatting_deleted_layouts.pptx rename to test/pptx/inline-formatting/deleted-layouts.pptx diff --git a/test/pptx/inline_formatting.native b/test/pptx/inline-formatting/input.native similarity index 100% rename from test/pptx/inline_formatting.native rename to test/pptx/inline-formatting/input.native diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx similarity index 100% rename from test/pptx/inline_formatting_moved_layouts.pptx rename to test/pptx/inline-formatting/moved-layouts.pptx diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline-formatting/output.pptx similarity index 100% rename from test/pptx/inline_formatting.pptx rename to test/pptx/inline-formatting/output.pptx diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline-formatting/templated.pptx similarity index 100% rename from test/pptx/inline_formatting_templated.pptx rename to test/pptx/inline-formatting/templated.pptx diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists/deleted-layouts.pptx similarity index 100% rename from test/pptx/lists_deleted_layouts.pptx rename to test/pptx/lists/deleted-layouts.pptx diff --git a/test/pptx/lists.native b/test/pptx/lists/input.native similarity index 100% rename from test/pptx/lists.native rename to test/pptx/lists/input.native diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists/moved-layouts.pptx similarity index 100% rename from test/pptx/lists_moved_layouts.pptx rename to test/pptx/lists/moved-layouts.pptx diff --git a/test/pptx/lists.pptx b/test/pptx/lists/output.pptx similarity index 100% rename from test/pptx/lists.pptx rename to test/pptx/lists/output.pptx diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists/templated.pptx similarity index 100% rename from test/pptx/lists_templated.pptx rename to test/pptx/lists/templated.pptx diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx similarity index 100% rename from test/pptx/raw_ooxml_deleted_layouts.pptx rename to test/pptx/raw-ooxml/deleted-layouts.pptx diff --git a/test/pptx/raw_ooxml.native b/test/pptx/raw-ooxml/input.native similarity index 100% rename from test/pptx/raw_ooxml.native rename to test/pptx/raw-ooxml/input.native diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx similarity index 100% rename from test/pptx/raw_ooxml_moved_layouts.pptx rename to test/pptx/raw-ooxml/moved-layouts.pptx diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw-ooxml/output.pptx similarity index 100% rename from test/pptx/raw_ooxml.pptx rename to test/pptx/raw-ooxml/output.pptx diff --git a/test/pptx/raw_ooxml_templated.pptx b/test/pptx/raw-ooxml/templated.pptx similarity index 100% rename from test/pptx/raw_ooxml_templated.pptx rename to test/pptx/raw-ooxml/templated.pptx diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference-deleted-layouts.pptx similarity index 100% rename from test/pptx/reference_deleted_layouts.pptx rename to test/pptx/reference-deleted-layouts.pptx diff --git a/test/pptx/reference_depth.pptx b/test/pptx/reference-depth.pptx similarity index 100% rename from test/pptx/reference_depth.pptx rename to test/pptx/reference-depth.pptx diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference-moved-layouts.pptx similarity index 100% rename from test/pptx/reference_moved_layouts.pptx rename to test/pptx/reference-moved-layouts.pptx diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx similarity index 100% rename from test/pptx/remove_empty_slides_deleted_layouts.pptx rename to test/pptx/remove-empty-slides/deleted-layouts.pptx diff --git a/test/pptx/remove_empty_slides.native b/test/pptx/remove-empty-slides/input.native similarity index 100% rename from test/pptx/remove_empty_slides.native rename to test/pptx/remove-empty-slides/input.native diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx similarity index 100% rename from test/pptx/remove_empty_slides_moved_layouts.pptx rename to test/pptx/remove-empty-slides/moved-layouts.pptx diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/remove-empty-slides/output.pptx similarity index 100% rename from test/pptx/remove_empty_slides.pptx rename to test/pptx/remove-empty-slides/output.pptx diff --git a/test/pptx/remove_empty_slides_templated.pptx b/test/pptx/remove-empty-slides/templated.pptx similarity index 100% rename from test/pptx/remove_empty_slides_templated.pptx rename to test/pptx/remove-empty-slides/templated.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx rename to test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx rename to test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx similarity index 100% rename from test/pptx/slide_breaks_slide_level_1.pptx rename to test/pptx/slide-breaks-slide-level-1/output.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx similarity index 100% rename from test/pptx/slide_breaks_slide_level_1_templated.pptx rename to test/pptx/slide-breaks-slide-level-1/templated.pptx diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_toc_deleted_layouts.pptx rename to test/pptx/slide-breaks-toc/deleted-layouts.pptx diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_toc_moved_layouts.pptx rename to test/pptx/slide-breaks-toc/moved-layouts.pptx diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide-breaks-toc/output.pptx similarity index 100% rename from test/pptx/slide_breaks_toc.pptx rename to test/pptx/slide-breaks-toc/output.pptx diff --git a/test/pptx/slide_breaks_toc_templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx similarity index 100% rename from test/pptx/slide_breaks_toc_templated.pptx rename to test/pptx/slide-breaks-toc/templated.pptx diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_deleted_layouts.pptx rename to test/pptx/slide-breaks/deleted-layouts.pptx diff --git a/test/pptx/slide_breaks.native b/test/pptx/slide-breaks/input.native similarity index 100% rename from test/pptx/slide_breaks.native rename to test/pptx/slide-breaks/input.native diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx similarity index 100% rename from test/pptx/slide_breaks_moved_layouts.pptx rename to test/pptx/slide-breaks/moved-layouts.pptx diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide-breaks/output.pptx similarity index 100% rename from test/pptx/slide_breaks.pptx rename to test/pptx/slide-breaks/output.pptx diff --git a/test/pptx/slide_breaks_templated.pptx b/test/pptx/slide-breaks/templated.pptx similarity index 100% rename from test/pptx/slide_breaks_templated.pptx rename to test/pptx/slide-breaks/templated.pptx 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 similarity index 100% rename from test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx rename to test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-h2-with-table.native b/test/pptx/slide-level-0/h1-h2-with-table/input.native similarity index 100% rename from test/pptx/slide-level-0-h1-h2-with-table.native rename to test/pptx/slide-level-0/h1-h2-with-table/input.native 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 similarity index 100% rename from test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx rename to test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-h2-with-table.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-h2-with-table.pptx rename to test/pptx/slide-level-0/h1-h2-with-table/output.pptx diff --git a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-h2-with-table_templated.pptx rename to test/pptx/slide-level-0/h1-h2-with-table/templated.pptx 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 similarity index 100% rename from test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx rename to test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-with-image.native b/test/pptx/slide-level-0/h1-with-image/input.native similarity index 100% rename from test/pptx/slide-level-0-h1-with-image.native rename to test/pptx/slide-level-0/h1-with-image/input.native 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 similarity index 100% rename from test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx rename to test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-with-image.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-with-image.pptx rename to test/pptx/slide-level-0/h1-with-image/output.pptx diff --git a/test/pptx/slide-level-0-h1-with-image_templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-with-image_templated.pptx rename to test/pptx/slide-level-0/h1-with-image/templated.pptx 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 similarity index 100% rename from test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx rename to test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-with-table.native b/test/pptx/slide-level-0/h1-with-table/input.native similarity index 100% rename from test/pptx/slide-level-0-h1-with-table.native rename to test/pptx/slide-level-0/h1-with-table/input.native 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 similarity index 100% rename from test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx rename to test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx diff --git a/test/pptx/slide-level-0-h1-with-table.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-with-table.pptx rename to test/pptx/slide-level-0/h1-with-table/output.pptx diff --git a/test/pptx/slide-level-0-h1-with-table_templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx similarity index 100% rename from test/pptx/slide-level-0-h1-with-table_templated.pptx rename to test/pptx/slide-level-0/h1-with-table/templated.pptx 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 similarity index 100% rename from test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx rename to test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx diff --git a/test/pptx/slide-level-0-h2-with-image.native b/test/pptx/slide-level-0/h2-with-image/input.native similarity index 100% rename from test/pptx/slide-level-0-h2-with-image.native rename to test/pptx/slide-level-0/h2-with-image/input.native 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 similarity index 100% rename from test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx rename to test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx diff --git a/test/pptx/slide-level-0-h2-with-image.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx similarity index 100% rename from test/pptx/slide-level-0-h2-with-image.pptx rename to test/pptx/slide-level-0/h2-with-image/output.pptx diff --git a/test/pptx/slide-level-0-h2-with-image_templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx similarity index 100% rename from test/pptx/slide-level-0-h2-with-image_templated.pptx rename to test/pptx/slide-level-0/h2-with-image/templated.pptx diff --git a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx rename to test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx diff --git a/test/pptx/speaker_notes_after_metadata.native b/test/pptx/speaker-notes-after-metadata/input.native similarity index 100% rename from test/pptx/speaker_notes_after_metadata.native rename to test/pptx/speaker-notes-after-metadata/input.native diff --git a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_after_metadata_moved_layouts.pptx rename to test/pptx/speaker-notes-after-metadata/moved-layouts.pptx diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx similarity index 100% rename from test/pptx/speaker_notes_after_metadata.pptx rename to test/pptx/speaker-notes-after-metadata/output.pptx diff --git a/test/pptx/speaker_notes_after_metadata_templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx similarity index 100% rename from test/pptx/speaker_notes_after_metadata_templated.pptx rename to test/pptx/speaker-notes-after-metadata/templated.pptx diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_afterheader_deleted_layouts.pptx rename to test/pptx/speaker-notes-afterheader/deleted-layouts.pptx diff --git a/test/pptx/speaker_notes_afterheader.native b/test/pptx/speaker-notes-afterheader/input.native similarity index 100% rename from test/pptx/speaker_notes_afterheader.native rename to test/pptx/speaker-notes-afterheader/input.native diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_afterheader_moved_layouts.pptx rename to test/pptx/speaker-notes-afterheader/moved-layouts.pptx diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker-notes-afterheader/output.pptx similarity index 100% rename from test/pptx/speaker_notes_afterheader.pptx rename to test/pptx/speaker-notes-afterheader/output.pptx diff --git a/test/pptx/speaker_notes_afterheader_templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx similarity index 100% rename from test/pptx/speaker_notes_afterheader_templated.pptx rename to test/pptx/speaker-notes-afterheader/templated.pptx diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_afterseps_deleted_layouts.pptx rename to test/pptx/speaker-notes-afterseps/deleted-layouts.pptx diff --git a/test/pptx/speaker_notes_afterseps.native b/test/pptx/speaker-notes-afterseps/input.native similarity index 100% rename from test/pptx/speaker_notes_afterseps.native rename to test/pptx/speaker-notes-afterseps/input.native diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_afterseps_moved_layouts.pptx rename to test/pptx/speaker-notes-afterseps/moved-layouts.pptx diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker-notes-afterseps/output.pptx similarity index 100% rename from test/pptx/speaker_notes_afterseps.pptx rename to test/pptx/speaker-notes-afterseps/output.pptx diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx similarity index 100% rename from test/pptx/speaker_notes_afterseps_templated.pptx rename to test/pptx/speaker-notes-afterseps/templated.pptx diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_deleted_layouts.pptx rename to test/pptx/speaker-notes/deleted-layouts.pptx diff --git a/test/pptx/speaker_notes.native b/test/pptx/speaker-notes/input.native similarity index 100% rename from test/pptx/speaker_notes.native rename to test/pptx/speaker-notes/input.native diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx similarity index 100% rename from test/pptx/speaker_notes_moved_layouts.pptx rename to test/pptx/speaker-notes/moved-layouts.pptx diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker-notes/output.pptx similarity index 100% rename from test/pptx/speaker_notes.pptx rename to test/pptx/speaker-notes/output.pptx diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker-notes/templated.pptx similarity index 100% rename from test/pptx/speaker_notes_templated.pptx rename to test/pptx/speaker-notes/templated.pptx diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx similarity index 100% rename from test/pptx/start_numbering_at_deleted_layouts.pptx rename to test/pptx/start-numbering-at/deleted-layouts.pptx diff --git a/test/pptx/start_numbering_at.native b/test/pptx/start-numbering-at/input.native similarity index 100% rename from test/pptx/start_numbering_at.native rename to test/pptx/start-numbering-at/input.native diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx similarity index 100% rename from test/pptx/start_numbering_at_moved_layouts.pptx rename to test/pptx/start-numbering-at/moved-layouts.pptx diff --git a/test/pptx/start_numbering_at.pptx b/test/pptx/start-numbering-at/output.pptx similarity index 100% rename from test/pptx/start_numbering_at.pptx rename to test/pptx/start-numbering-at/output.pptx diff --git a/test/pptx/start_numbering_at_templated.pptx b/test/pptx/start-numbering-at/templated.pptx similarity index 100% rename from test/pptx/start_numbering_at_templated.pptx rename to test/pptx/start-numbering-at/templated.pptx diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables/deleted-layouts.pptx similarity index 100% rename from test/pptx/tables_deleted_layouts.pptx rename to test/pptx/tables/deleted-layouts.pptx diff --git a/test/pptx/tables.native b/test/pptx/tables/input.native similarity index 100% rename from test/pptx/tables.native rename to test/pptx/tables/input.native diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables/moved-layouts.pptx similarity index 100% rename from test/pptx/tables_moved_layouts.pptx rename to test/pptx/tables/moved-layouts.pptx diff --git a/test/pptx/tables.pptx b/test/pptx/tables/output.pptx similarity index 100% rename from test/pptx/tables.pptx rename to test/pptx/tables/output.pptx diff --git a/test/pptx/tables_templated.pptx b/test/pptx/tables/templated.pptx similarity index 100% rename from test/pptx/tables_templated.pptx rename to test/pptx/tables/templated.pptx diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx similarity index 100% rename from test/pptx/two_column_deleted_layouts.pptx rename to test/pptx/two-column/deleted-layouts.pptx diff --git a/test/pptx/two_column.native b/test/pptx/two-column/input.native similarity index 100% rename from test/pptx/two_column.native rename to test/pptx/two-column/input.native diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two-column/moved-layouts.pptx similarity index 100% rename from test/pptx/two_column_moved_layouts.pptx rename to test/pptx/two-column/moved-layouts.pptx diff --git a/test/pptx/two_column.pptx b/test/pptx/two-column/output.pptx similarity index 100% rename from test/pptx/two_column.pptx rename to test/pptx/two-column/output.pptx diff --git a/test/pptx/two_column_templated.pptx b/test/pptx/two-column/templated.pptx similarity index 100% rename from test/pptx/two_column_templated.pptx rename to test/pptx/two-column/templated.pptx