aboutsummaryrefslogtreecommitdiff
path: root/test/pptx
diff options
context:
space:
mode:
authorEmily Bourke <undergroundquizscene@protonmail.com>2021-08-10 17:20:53 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2021-08-17 09:35:25 -0700
commit72823ad947face43ef45eaeb7e611979531abed6 (patch)
tree974bdd36c361a437381d00da1305646473e218da /test/pptx
parent9204e5c9b1ef5d1f038dbc93928f6bbc71bf6b2f (diff)
downloadpandoc-72823ad947face43ef45eaeb7e611979531abed6.tar.gz
pptx: Select layouts from reference doc by name
Until now, users had to make sure that their reference doc contains layouts in a specific order: the first four layouts in the file had to have a specific structure, or else pandoc would error (or sometimes successfully produce a pptx file, which PowerPoint would then fail to open). This commit changes the layout selection to use the layout names rather than order: users must make sure their reference doc contains four layouts with specific names, and if a layout with the right name isn’t found pandoc will output a warning and use the corresponding layout from the default reference doc as a fallback. I believe the use of names rather than order will be clearer to users, and the clearer errors will help them troubleshoot when things go wrong. - Add tests for moved layouts - Add tests for deleted layouts - Add newly included layouts to slideMaster1.xml to fix tests
Diffstat (limited to 'test/pptx')
-rw-r--r--test/pptx/code-custom_deleted_layouts.pptxbin0 -> 31033 bytes
-rw-r--r--test/pptx/code-custom_moved_layouts.pptxbin0 -> 41822 bytes
-rw-r--r--test/pptx/code_deleted_layouts.pptxbin0 -> 31032 bytes
-rw-r--r--test/pptx/code_moved_layouts.pptxbin0 -> 41826 bytes
-rw-r--r--test/pptx/document-properties-short-desc_deleted_layouts.pptxbin0 -> 29806 bytes
-rw-r--r--test/pptx/document-properties-short-desc_moved_layouts.pptxbin0 -> 40600 bytes
-rw-r--r--test/pptx/document-properties_deleted_layouts.pptxbin0 -> 30210 bytes
-rw-r--r--test/pptx/document-properties_moved_layouts.pptxbin0 -> 41004 bytes
-rw-r--r--test/pptx/endnotes_deleted_layouts.pptxbin0 -> 29774 bytes
-rw-r--r--test/pptx/endnotes_moved_layouts.pptxbin0 -> 40566 bytes
-rw-r--r--test/pptx/endnotes_toc_deleted_layouts.pptxbin0 -> 30596 bytes
-rw-r--r--test/pptx/endnotes_toc_moved_layouts.pptxbin0 -> 41384 bytes
-rw-r--r--test/pptx/images_deleted_layouts.pptxbin0 -> 47424 bytes
-rw-r--r--test/pptx/images_moved_layouts.pptxbin0 -> 58213 bytes
-rw-r--r--test/pptx/inline_formatting_deleted_layouts.pptxbin0 -> 28966 bytes
-rw-r--r--test/pptx/inline_formatting_moved_layouts.pptxbin0 -> 39758 bytes
-rw-r--r--test/pptx/lists_deleted_layouts.pptxbin0 -> 29861 bytes
-rw-r--r--test/pptx/lists_moved_layouts.pptxbin0 -> 40653 bytes
-rw-r--r--test/pptx/raw_ooxml_deleted_layouts.pptxbin0 -> 29754 bytes
-rw-r--r--test/pptx/raw_ooxml_moved_layouts.pptxbin0 -> 40546 bytes
-rw-r--r--test/pptx/reference_deleted_layouts.pptxbin0 -> 18160 bytes
-rw-r--r--test/pptx/reference_moved_layouts.pptxbin0 -> 44237 bytes
-rw-r--r--test/pptx/remove_empty_slides_deleted_layouts.pptxbin0 -> 46867 bytes
-rw-r--r--test/pptx/remove_empty_slides_moved_layouts.pptxbin0 -> 57656 bytes
-rw-r--r--test/pptx/slide_breaks_deleted_layouts.pptxbin0 -> 31378 bytes
-rw-r--r--test/pptx/slide_breaks_moved_layouts.pptxbin0 -> 42171 bytes
-rw-r--r--test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptxbin0 -> 30554 bytes
-rw-r--r--test/pptx/slide_breaks_slide_level_1_moved_layouts.pptxbin0 -> 41343 bytes
-rw-r--r--test/pptx/slide_breaks_toc_deleted_layouts.pptxbin0 -> 32328 bytes
-rw-r--r--test/pptx/slide_breaks_toc_moved_layouts.pptxbin0 -> 43118 bytes
-rw-r--r--test/pptx/speaker_notes_after_metadata_deleted_layouts.pptxbin0 -> 34473 bytes
-rw-r--r--test/pptx/speaker_notes_after_metadata_moved_layouts.pptxbin0 -> 45269 bytes
-rw-r--r--test/pptx/speaker_notes_afterheader_deleted_layouts.pptxbin0 -> 33500 bytes
-rw-r--r--test/pptx/speaker_notes_afterheader_moved_layouts.pptxbin0 -> 44297 bytes
-rw-r--r--test/pptx/speaker_notes_afterseps_deleted_layouts.pptxbin0 -> 54390 bytes
-rw-r--r--test/pptx/speaker_notes_afterseps_moved_layouts.pptxbin0 -> 65181 bytes
-rw-r--r--test/pptx/speaker_notes_deleted_layouts.pptxbin0 -> 38203 bytes
-rw-r--r--test/pptx/speaker_notes_moved_layouts.pptxbin0 -> 49002 bytes
-rw-r--r--test/pptx/start_numbering_at_deleted_layouts.pptxbin0 -> 29837 bytes
-rw-r--r--test/pptx/start_numbering_at_moved_layouts.pptxbin0 -> 40630 bytes
-rw-r--r--test/pptx/tables_deleted_layouts.pptxbin0 -> 30381 bytes
-rw-r--r--test/pptx/tables_moved_layouts.pptxbin0 -> 41174 bytes
-rw-r--r--test/pptx/two_column_deleted_layouts.pptxbin0 -> 28883 bytes
-rw-r--r--test/pptx/two_column_moved_layouts.pptxbin0 -> 39676 bytes
44 files changed, 0 insertions, 0 deletions
diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom_deleted_layouts.pptx
new file mode 100644
index 000000000..9282e6354
--- /dev/null
+++ b/test/pptx/code-custom_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom_moved_layouts.pptx
new file mode 100644
index 000000000..a14eeb6c8
--- /dev/null
+++ b/test/pptx/code-custom_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code_deleted_layouts.pptx
new file mode 100644
index 000000000..0f503f553
--- /dev/null
+++ b/test/pptx/code_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code_moved_layouts.pptx
new file mode 100644
index 000000000..4d66b1310
--- /dev/null
+++ b/test/pptx/code_moved_layouts.pptx
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
new file mode 100644
index 000000000..e4cf6bd7b
--- /dev/null
+++ b/test/pptx/document-properties-short-desc_deleted_layouts.pptx
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
new file mode 100644
index 000000000..8834f885f
--- /dev/null
+++ b/test/pptx/document-properties-short-desc_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties_deleted_layouts.pptx
new file mode 100644
index 000000000..a00c8059d
--- /dev/null
+++ b/test/pptx/document-properties_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties_moved_layouts.pptx
new file mode 100644
index 000000000..c1d2d5282
--- /dev/null
+++ b/test/pptx/document-properties_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes_deleted_layouts.pptx
new file mode 100644
index 000000000..5c69a6310
--- /dev/null
+++ b/test/pptx/endnotes_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes_moved_layouts.pptx
new file mode 100644
index 000000000..0d4c491b9
--- /dev/null
+++ b/test/pptx/endnotes_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes_toc_deleted_layouts.pptx
new file mode 100644
index 000000000..46708544c
--- /dev/null
+++ b/test/pptx/endnotes_toc_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes_toc_moved_layouts.pptx
new file mode 100644
index 000000000..d1200bd7d
--- /dev/null
+++ b/test/pptx/endnotes_toc_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images_deleted_layouts.pptx
new file mode 100644
index 000000000..7a38ea625
--- /dev/null
+++ b/test/pptx/images_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images_moved_layouts.pptx
new file mode 100644
index 000000000..08d1c27e0
--- /dev/null
+++ b/test/pptx/images_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline_formatting_deleted_layouts.pptx
new file mode 100644
index 000000000..bbd5bfeb4
--- /dev/null
+++ b/test/pptx/inline_formatting_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline_formatting_moved_layouts.pptx
new file mode 100644
index 000000000..427492130
--- /dev/null
+++ b/test/pptx/inline_formatting_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists_deleted_layouts.pptx
new file mode 100644
index 000000000..6512e44bb
--- /dev/null
+++ b/test/pptx/lists_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists_moved_layouts.pptx
new file mode 100644
index 000000000..2947c3211
--- /dev/null
+++ b/test/pptx/lists_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw_ooxml_deleted_layouts.pptx
new file mode 100644
index 000000000..2ea155657
--- /dev/null
+++ b/test/pptx/raw_ooxml_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw_ooxml_moved_layouts.pptx
new file mode 100644
index 000000000..e58304172
--- /dev/null
+++ b/test/pptx/raw_ooxml_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference_deleted_layouts.pptx
new file mode 100644
index 000000000..a9a74ecd5
--- /dev/null
+++ b/test/pptx/reference_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference_moved_layouts.pptx
new file mode 100644
index 000000000..72c4f3fd7
--- /dev/null
+++ b/test/pptx/reference_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove_empty_slides_deleted_layouts.pptx
new file mode 100644
index 000000000..7ae4a5fab
--- /dev/null
+++ b/test/pptx/remove_empty_slides_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove_empty_slides_moved_layouts.pptx
new file mode 100644
index 000000000..2572f2447
--- /dev/null
+++ b/test/pptx/remove_empty_slides_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide_breaks_deleted_layouts.pptx
new file mode 100644
index 000000000..86dfad3b2
--- /dev/null
+++ b/test/pptx/slide_breaks_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide_breaks_moved_layouts.pptx
new file mode 100644
index 000000000..90b3b94a6
--- /dev/null
+++ b/test/pptx/slide_breaks_moved_layouts.pptx
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
new file mode 100644
index 000000000..2c7fd4d8b
--- /dev/null
+++ b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx
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
new file mode 100644
index 000000000..8471b1d10
--- /dev/null
+++ b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide_breaks_toc_deleted_layouts.pptx
new file mode 100644
index 000000000..1e0b76d46
--- /dev/null
+++ b/test/pptx/slide_breaks_toc_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide_breaks_toc_moved_layouts.pptx
new file mode 100644
index 000000000..918264bc5
--- /dev/null
+++ b/test/pptx/slide_breaks_toc_moved_layouts.pptx
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
new file mode 100644
index 000000000..1298870e2
--- /dev/null
+++ b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx
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
new file mode 100644
index 000000000..b844a0b51
--- /dev/null
+++ b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx
new file mode 100644
index 000000000..853b918cb
--- /dev/null
+++ b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx
new file mode 100644
index 000000000..9fff9f855
--- /dev/null
+++ b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx
new file mode 100644
index 000000000..1e7f4968d
--- /dev/null
+++ b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx
new file mode 100644
index 000000000..e092ae444
--- /dev/null
+++ b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker_notes_deleted_layouts.pptx
new file mode 100644
index 000000000..6a5ad524f
--- /dev/null
+++ b/test/pptx/speaker_notes_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker_notes_moved_layouts.pptx
new file mode 100644
index 000000000..f95df9622
--- /dev/null
+++ b/test/pptx/speaker_notes_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start_numbering_at_deleted_layouts.pptx
new file mode 100644
index 000000000..d9cf91804
--- /dev/null
+++ b/test/pptx/start_numbering_at_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start_numbering_at_moved_layouts.pptx
new file mode 100644
index 000000000..e1b2d4de8
--- /dev/null
+++ b/test/pptx/start_numbering_at_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables_deleted_layouts.pptx
new file mode 100644
index 000000000..a52222551
--- /dev/null
+++ b/test/pptx/tables_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables_moved_layouts.pptx
new file mode 100644
index 000000000..56608a039
--- /dev/null
+++ b/test/pptx/tables_moved_layouts.pptx
Binary files differ
diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two_column_deleted_layouts.pptx
new file mode 100644
index 000000000..60a244f94
--- /dev/null
+++ b/test/pptx/two_column_deleted_layouts.pptx
Binary files differ
diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two_column_moved_layouts.pptx
new file mode 100644
index 000000000..a17f96b18
--- /dev/null
+++ b/test/pptx/two_column_moved_layouts.pptx
Binary files differ