Powerpoint writer tests: add tests for two-column layout and images

Powerpoint output checked in MS PowerPoint 2013 (Windows)

5 files changed, 24 insertions, 0 deletions

diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index f78916dac..694758268 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -213,4 +213,14 @@ tests = [ pptxTest
           def { writerTableOfContents = True }
           "pptx/endnotes.native"
           "pptx/endnotes_toc.pptx"
+        , pptxTest
+          "images"
+          def
+          "pptx/images.native"
+          "pptx/images.pptx"
+        , pptxTest
+          "two-column layout"
+          def
+          "pptx/two_column.native"
+          "pptx/two_column.pptx"
         ]
diff --git a/test/pptx/images.native b/test/pptx/images.native
new file mode 100644
index 000000000..54827e5cc
--- /dev/null
+++ b/test/pptx/images.native
@@ -0,0 +1,5 @@
+Pandoc (Meta {unMeta = fromList []})
+[Para [Image ("",[],[]) [] ("lalune.jpg","")]
+,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]
+,Header 1 ("one-more",[],[]) [Str "One",Space,Str "More"]
+,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/images.pptx b/test/pptx/images.pptx
new file mode 100644
index 000000000..b42ec9ed9
--- /dev/null
+++ b/test/pptx/images.pptx
diff --git a/test/pptx/two_column.native b/test/pptx/two_column.native
new file mode 100644
index 000000000..086f74889
--- /dev/null
+++ b/test/pptx/two_column.native
@@ -0,0 +1,9 @@
+Pandoc (Meta {unMeta = fromList []})
+[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "One",Space,Str "paragraph."]
+  ,Para [Str "Another",Space,Str "paragraph."]]
+ ,Div ("",["column"],[])
+  [Para [Str "Second",Space,Str "column",Space,Str "paragraph."]
+  ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]]
diff --git a/test/pptx/two_column.pptx b/test/pptx/two_column.pptx
new file mode 100644
index 000000000..b15744443
--- /dev/null
+++ b/test/pptx/two_column.pptx