136 files changed, 582 insertions, 0 deletions

diff --git a/test/pptx/background-image/input.native b/test/pptx/background-image/input.native
new file mode 100644
index 000000000..22b089a95
--- /dev/null
+++ b/test/pptx/background-image/input.native
@@ -0,0 +1,17 @@
+[Header 1 ("section-header-with-background-image",[],[("background-image","movie.jpg")]) [Str "Section",Space,Str "Header",Space,Str "(with",Space,Str "background",Space,Str "image)"]
+,Header 2 ("slide-1",[],[("background-image","lalune.jpg")]) [Str "Slide",Space,Str "1"]
+,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "moon",Space,Str "background."]
+,Header 2 ("slide-2",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "2"]
+,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "movie",Space,Str "background."]
+,Header 2 ("slide-3",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "3"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Background",Space,Str "images",Space,Str "work",Space,Str "in",Space,Str "two-column",Space,Str "layout."]]
+ ,Div ("",["column"],[])
+  [Para [Str "hello"]]]
+,Header 2 ("slide-4",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "4"]
+,Para [Str "You",Space,Str "can",Space,Str "have",Space,Str "images",Space,Str "on",Space,Str "slides",Space,Str "that",Space,Str "have",Space,Str "background",Space,Str "images:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]
+,Header 2 ("section",[],[("background-image","lalune.jpg")]) []
+,Div ("",["notes"],[])
+ [Para [Str "Blank",Space,Str "slides",Space,Str "can",Space,Str "have",Space,Str "background",Space,Str "images."]]]
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
new file mode 100644
index 000000000..1e678e0a4
--- /dev/null
+++ b/test/pptx/background-image/output.pptx
diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx
new file mode 100644
index 000000000..0f2879022
--- /dev/null
+++ b/test/pptx/background-image/templated.pptx
diff --git a/test/pptx/blanks/just-speaker-notes/input.native b/test/pptx/blanks/just-speaker-notes/input.native
new file mode 100644
index 000000000..d2e2cfbe2
--- /dev/null
+++ b/test/pptx/blanks/just-speaker-notes/input.native
@@ -0,0 +1,7 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Nothing",Space,Str "to",Space,Str "see",Space,Str "here"]
+,Header 1 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "Some",Space,Str "notes",Space,Str "here:",Space,Str "this",Space,Str "first",Space,Str "slide",Space,Str "should",Space,Str "use",Space,Str "the",Space,Str "Blank",Space,Str "template"]]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "The",Space,Str "second",Space,Str "slide",Space,Str "should",Space,Str "be",Space,Str "blank"]]
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
new file mode 100644
index 000000000..9a36ccf1f
--- /dev/null
+++ b/test/pptx/blanks/just-speaker-notes/output.pptx
diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx
new file mode 100644
index 000000000..f9eca6f8c
--- /dev/null
+++ b/test/pptx/blanks/just-speaker-notes/templated.pptx
diff --git a/test/pptx/blanks/nbsp-in-body/input.native b/test/pptx/blanks/nbsp-in-body/input.native
new file mode 100644
index 000000000..56c105fb0
--- /dev/null
+++ b/test/pptx/blanks/nbsp-in-body/input.native
@@ -0,0 +1,6 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Uninteresting,",Space,Str "normal"]
+,Header 1 ("section",[],[]) []
+,Para [Str "\160"]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]]
diff --git a/test/pptx/code-custom.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
index 5e9c2c630..08c764feb 100644
--- a/test/pptx/code-custom.pptx
+++ b/test/pptx/blanks/nbsp-in-body/output.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1_templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx
index e2815159a..758502dd0 100644
--- a/test/pptx/slide_breaks_slide_level_1_templated.pptx
+++ b/test/pptx/blanks/nbsp-in-body/templated.pptx
diff --git a/test/pptx/blanks/nbsp-in-heading/input.native b/test/pptx/blanks/nbsp-in-heading/input.native
new file mode 100644
index 000000000..a5c7fc1ca
--- /dev/null
+++ b/test/pptx/blanks/nbsp-in-heading/input.native
@@ -0,0 +1,5 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Uninteresting,",Space,Str "normal"]
+,Header 1 ("section",[],[]) [Str "\160"]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]]
diff --git a/test/pptx/code.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
index aab0cc6f5..08c764feb 100644
--- a/test/pptx/code.pptx
+++ b/test/pptx/blanks/nbsp-in-heading/output.pptx
diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx
new file mode 100644
index 000000000..758502dd0
--- /dev/null
+++ b/test/pptx/blanks/nbsp-in-heading/templated.pptx
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
new file mode 100644
index 000000000..1e5085e9c
--- /dev/null
+++ b/test/pptx/code-custom/output.pptx
diff --git a/test/pptx/slide_breaks_templated.pptx b/test/pptx/code-custom/templated.pptx
index 71ba99701..116865c1f 100644
--- a/test/pptx/slide_breaks_templated.pptx
+++ b/test/pptx/code-custom/templated.pptx
diff --git a/test/pptx/code.native b/test/pptx/code/input.native
index be7f512f7..be7f512f7 100644
--- a/test/pptx/code.native
+++ b/test/pptx/code/input.native
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
new file mode 100644
index 000000000..a3f31dfdc
--- /dev/null
+++ b/test/pptx/code/output.pptx
diff --git a/test/pptx/code_templated.pptx b/test/pptx/code/templated.pptx
index a03109217..0d7db048f 100644
--- a/test/pptx/code_templated.pptx
+++ b/test/pptx/code/templated.pptx
diff --git a/test/pptx/comparison/both-columns/input.native b/test/pptx/comparison/both-columns/input.native
new file mode 100644
index 000000000..2557880d4
--- /dev/null
+++ b/test/pptx/comparison/both-columns/input.native
@@ -0,0 +1,23 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
new file mode 100644
index 000000000..efb67f2e7
--- /dev/null
+++ b/test/pptx/comparison/both-columns/output.pptx
diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx
new file mode 100644
index 000000000..945bc6dc4
--- /dev/null
+++ b/test/pptx/comparison/both-columns/templated.pptx
diff --git a/test/pptx/comparison/extra-image/input.native b/test/pptx/comparison/extra-image/input.native
new file mode 100644
index 000000000..34aeb8f2b
--- /dev/null
+++ b/test/pptx/comparison/extra-image/input.native
@@ -0,0 +1,24 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]
+  ,Para [Image ("",[],[]) [Str "And",Space,Str "another",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
new file mode 100644
index 000000000..e26e5b49c
--- /dev/null
+++ b/test/pptx/comparison/extra-image/output.pptx
diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx
new file mode 100644
index 000000000..2e48ffe87
--- /dev/null
+++ b/test/pptx/comparison/extra-image/templated.pptx
diff --git a/test/pptx/comparison/extra-text/input.native b/test/pptx/comparison/extra-text/input.native
new file mode 100644
index 000000000..2557880d4
--- /dev/null
+++ b/test/pptx/comparison/extra-text/input.native
@@ -0,0 +1,23 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
new file mode 100644
index 000000000..efb67f2e7
--- /dev/null
+++ b/test/pptx/comparison/extra-text/output.pptx
diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx
new file mode 100644
index 000000000..debb62d52
--- /dev/null
+++ b/test/pptx/comparison/extra-text/templated.pptx
diff --git a/test/pptx/comparison/non-text-first/input.native b/test/pptx/comparison/non-text-first/input.native
new file mode 100644
index 000000000..a8caad151
--- /dev/null
+++ b/test/pptx/comparison/non-text-first/input.native
@@ -0,0 +1,21 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Plus",Space,Str "a",Space,Str "paragraph",Space,Str "here"]]
+ ,Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "Just",Space,Str "an",Space,Str "image",Space,Str "on",Space,Str "this",Space,Str "side"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
new file mode 100644
index 000000000..f36c53ddb
--- /dev/null
+++ b/test/pptx/comparison/non-text-first/output.pptx
diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx
new file mode 100644
index 000000000..a19b469b1
--- /dev/null
+++ b/test/pptx/comparison/non-text-first/templated.pptx
diff --git a/test/pptx/comparison/one-column/input.native b/test/pptx/comparison/one-column/input.native
new file mode 100644
index 000000000..b99740a14
--- /dev/null
+++ b/test/pptx/comparison/one-column/input.native
@@ -0,0 +1,21 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])]
+ ,Div ("",["column"],[])
+  [Para [Str "Only",Space,Str "a",Space,Str "paragraph",Space,Str "here"]]]]
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
new file mode 100644
index 000000000..8d9031ac8
--- /dev/null
+++ b/test/pptx/comparison/one-column/output.pptx
diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx
new file mode 100644
index 000000000..fa5c2dc87
--- /dev/null
+++ b/test/pptx/comparison/one-column/templated.pptx
diff --git a/test/pptx/content-with-caption/heading-text-image/input.native b/test/pptx/content-with-caption/heading-text-image/input.native
new file mode 100644
index 000000000..576bc1658
--- /dev/null
+++ b/test/pptx/content-with-caption/heading-text-image/input.native
@@ -0,0 +1,3 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Para [Str "Some",Space,Str "text",Space,Str "here"]
+,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
new file mode 100644
index 000000000..6802b7361
--- /dev/null
+++ b/test/pptx/content-with-caption/heading-text-image/output.pptx
diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx
new file mode 100644
index 000000000..059d4f460
--- /dev/null
+++ b/test/pptx/content-with-caption/heading-text-image/templated.pptx
diff --git a/test/pptx/content-with-caption/image-text/input.native b/test/pptx/content-with-caption/image-text/input.native
new file mode 100644
index 000000000..2ffbf0888
--- /dev/null
+++ b/test/pptx/content-with-caption/image-text/input.native
@@ -0,0 +1,2 @@
+[Para [Image ("",[],[]) [Str "The",Space,Str "picture",Space,Str "first"] ("lalune.jpg","fig:")]
+,Para [Str "Then",Space,Str "some",Space,Str "text",Space,Str "here"]]
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
new file mode 100644
index 000000000..0bd64e340
--- /dev/null
+++ b/test/pptx/content-with-caption/image-text/output.pptx
diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx
new file mode 100644
index 000000000..a9c6aa43d
--- /dev/null
+++ b/test/pptx/content-with-caption/image-text/templated.pptx
diff --git a/test/pptx/content-with-caption/text-image/input.native b/test/pptx/content-with-caption/text-image/input.native
new file mode 100644
index 000000000..762d18426
--- /dev/null
+++ b/test/pptx/content-with-caption/text-image/input.native
@@ -0,0 +1,2 @@
+[Para [Str "Some",Space,Str "text",Space,Str "here"]
+,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
new file mode 100644
index 000000000..a0d8806c0
--- /dev/null
+++ b/test/pptx/content-with-caption/text-image/output.pptx
diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx
new file mode 100644
index 000000000..185314bf4
--- /dev/null
+++ b/test/pptx/content-with-caption/text-image/templated.pptx
diff --git a/test/pptx/document-properties-short-desc.native b/test/pptx/document-properties-short-desc/input.native
index fe3193dc1..fe3193dc1 100644
--- a/test/pptx/document-properties-short-desc.native
+++ b/test/pptx/document-properties-short-desc/input.native
diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc/output.pptx
index de5e68151..418d158ca 100644
--- a/test/pptx/document-properties-short-desc.pptx
+++ b/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
index d39dc0c91..4feccdac7 100644
--- a/test/pptx/document-properties-short-desc_templated.pptx
+++ b/test/pptx/document-properties-short-desc/templated.pptx
diff --git a/test/pptx/document-properties.native b/test/pptx/document-properties/input.native
index 59ca53f4d..59ca53f4d 100644
--- a/test/pptx/document-properties.native
+++ b/test/pptx/document-properties/input.native
diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties/output.pptx
index 6bcbd1b9c..55ca48b5d 100644
--- a/test/pptx/document-properties.pptx
+++ b/test/pptx/document-properties/output.pptx
diff --git a/test/pptx/document-properties_templated.pptx b/test/pptx/document-properties/templated.pptx
index 841ae8c42..df6acb70c 100644
--- a/test/pptx/document-properties_templated.pptx
+++ b/test/pptx/document-properties/templated.pptx
diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes-toc/output.pptx
index a028b346f..a6cc2db24 100644
--- a/test/pptx/endnotes_toc.pptx
+++ b/test/pptx/endnotes-toc/output.pptx
diff --git a/test/pptx/endnotes_toc_templated.pptx b/test/pptx/endnotes-toc/templated.pptx
index 38a0c437d..63b066f0d 100644
--- a/test/pptx/endnotes_toc_templated.pptx
+++ b/test/pptx/endnotes-toc/templated.pptx
diff --git a/test/pptx/endnotes.native b/test/pptx/endnotes/input.native
index f6caeb62f..f6caeb62f 100644
--- a/test/pptx/endnotes.native
+++ b/test/pptx/endnotes/input.native
diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes/output.pptx
index 9d46036fe..ea29cbcf8 100644
--- a/test/pptx/endnotes.pptx
+++ b/test/pptx/endnotes/output.pptx
diff --git a/test/pptx/endnotes_templated.pptx b/test/pptx/endnotes/templated.pptx
index 863cc29d4..a97a7eed8 100644
--- a/test/pptx/endnotes_templated.pptx
+++ b/test/pptx/endnotes/templated.pptx
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
new file mode 100644
index 000000000..2af46108c
--- /dev/null
+++ b/test/pptx/footer/basic/output.pptx
diff --git a/test/pptx/footer/basic/reference.pptx b/test/pptx/footer/basic/reference.pptx
new file mode 100644
index 000000000..61f926fa6
--- /dev/null
+++ b/test/pptx/footer/basic/reference.pptx
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
new file mode 100644
index 000000000..678ecdb87
--- /dev/null
+++ b/test/pptx/footer/fixed-date/output.pptx
diff --git a/test/pptx/footer/fixed-date/reference.pptx b/test/pptx/footer/fixed-date/reference.pptx
new file mode 100644
index 000000000..78bd3ce0d
--- /dev/null
+++ b/test/pptx/footer/fixed-date/reference.pptx
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
new file mode 100644
index 000000000..651491107
--- /dev/null
+++ b/test/pptx/footer/higher-slide-number/output.pptx
diff --git a/test/pptx/footer/higher-slide-number/reference.pptx b/test/pptx/footer/higher-slide-number/reference.pptx
new file mode 100644
index 000000000..6ada45399
--- /dev/null
+++ b/test/pptx/footer/higher-slide-number/reference.pptx
diff --git a/test/pptx/footer/input.native b/test/pptx/footer/input.native
new file mode 100644
index 000000000..2c0ae5c06
--- /dev/null
+++ b/test/pptx/footer/input.native
@@ -0,0 +1,66 @@
+Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Me"]),("date",MetaInlines [Str "14/09/1995"]),("title",MetaInlines [Str "Slides"])]})
+[Header 2 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Para [Str "Hello",Space,Str "there"]
+,Header 1 ("layouts",[],[]) [Str "Layouts"]
+,Header 2 ("slide-3",[],[]) [Str "Slide",Space,Str "3"]
+,Para [Str "Does",Space,Str "it",Space,Str "work",Space,Str "on",Space,Str "other",Space,Str "layouts?"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)
+ ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "2"]]]])]
+ (TableFoot ("",[],[])
+ [])
+,Header 2 ("slide-4",[],[]) [Str "Slide",Space,Str "4"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "hello",Space,Str "hello"]]
+ ,Div ("",["column"],[])
+  [Para [Str "goood",Space,Str "bye"]]]
+,Header 2 ("slide-5",[],[]) [Str "Slide",Space,Str "5"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Hello",Space,Str "there"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)
+   ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "1"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]
+ ,Div ("",["column"],[])
+  [Para [Str "oh",Space,Str "wait"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)
+   ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "1"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 2 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "blank",Space,Str "slide:",Space,Str "does",Space,Str "it",Space,Str "have",Space,Str "a",Space,Str "footer?"]]]
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
new file mode 100644
index 000000000..c470cbb94
--- /dev/null
+++ b/test/pptx/footer/no-title-slide/output.pptx
diff --git a/test/pptx/footer/no-title-slide/reference.pptx b/test/pptx/footer/no-title-slide/reference.pptx
new file mode 100644
index 000000000..ecd524a9b
--- /dev/null
+++ b/test/pptx/footer/no-title-slide/reference.pptx
diff --git a/test/pptx/images.native b/test/pptx/images/input.native
index 54827e5cc..54827e5cc 100644
--- a/test/pptx/images.native
+++ b/test/pptx/images/input.native
diff --git a/test/pptx/images.pptx b/test/pptx/images/output.pptx
index 670a825de..098547e87 100644
--- a/test/pptx/images.pptx
+++ b/test/pptx/images/output.pptx
diff --git a/test/pptx/images_templated.pptx b/test/pptx/images/templated.pptx
index 48ebf66d6..cad0b2f04 100644
--- a/test/pptx/images_templated.pptx
+++ b/test/pptx/images/templated.pptx
diff --git a/test/pptx/incremental-lists/with-flag/input.native b/test/pptx/incremental-lists/with-flag/input.native
new file mode 100644
index 000000000..b690794dc
--- /dev/null
+++ b/test/pptx/incremental-lists/with-flag/input.native
@@ -0,0 +1,139 @@
+[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"]
+,BulletList
+ [[Plain [Str "These"]]
+ ,[Plain [Str "bullets"]]
+ ,[Plain [Str "should"]]
+ ,[Plain [Str "be"]]
+ ,[Plain [Str "incremental"]]]
+,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"]
+,BulletList
+ [[Para [Str "as"]]
+ ,[Para [Str "should"]]
+ ,[Para [Str "these"]]]
+,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"]
+,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"]
+,BulletList
+ [[Plain [Str "also"]]
+ ,[Plain [Str "be"]]
+ ,[Plain [Str "incremental"]]]
+,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"]
+,OrderedList (1,Decimal,Period)
+ [[Plain [Str "These"]]
+ ,[Plain [Str "are"]]
+ ,[Plain [Str "incremental"]]]
+,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"]
+,BulletList
+ [[Plain [Str "But"]]
+ ,[Plain [Str "these"]]
+ ,[Plain [Str "are"]]]
+,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"]
+  ,BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "by"]]
+   ,[Plain [Str "one"]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "below"]]
+ ,Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"]
+  ,BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "by"]]
+   ,[Plain [Str "one"]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "else",Space,Str "below"]]]
+,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [BulletList
+   [[Plain [Str "An"]]
+   ,[Plain [Str "Incremental"]]
+   ,[Plain [Str "List"]]]]]
+,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"]
+,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"]
+,BulletList
+ [[Plain [Str "one"]]
+ ,[Plain [Str "two"]]
+ ,[Plain [Str "three"]]]
+,Para [Str "Then,",Space,Str "a",Space,Str "picture:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]
+,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]
+  ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [OrderedList (1,Decimal,Period)
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "1"]]]])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 1 ("slide-9-content",[],[]) [Str "Slide",Space,Str "9",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "not"]]
+  ,[Plain [Str "incremental"]]]]
+,BulletList
+ [[Plain [Str "these"]]
+ ,[Plain [Str "are"]]]
+,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"]
+,Div ("",["incremental","nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]
+  ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]]
+,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"]
+,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "not",Space,Str "incremental:"]
+,BlockQuote
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "These",Space,Str "are:"]
+,Div ("",["nonincremental"],[])
+ [BlockQuote
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Para [Str "These",Space,Str "are",Space,Str "not:"]
+,BlockQuote
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "incremental"]]]]]
+,Div ("",["incremental"],[])
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "not"]]]]]]
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
new file mode 100644
index 000000000..230d29253
--- /dev/null
+++ b/test/pptx/incremental-lists/with-flag/output.pptx
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
new file mode 100644
index 000000000..263d9c355
--- /dev/null
+++ b/test/pptx/incremental-lists/with-flag/templated.pptx
diff --git a/test/pptx/incremental-lists/without-flag/input.native b/test/pptx/incremental-lists/without-flag/input.native
new file mode 100644
index 000000000..87a4aea7e
--- /dev/null
+++ b/test/pptx/incremental-lists/without-flag/input.native
@@ -0,0 +1,137 @@
+[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "These"]]
+  ,[Plain [Str "bullets"]]
+  ,[Plain [Str "should"]]
+  ,[Plain [Str "be"]]
+  ,[Plain [Str "incremental"]]]]
+,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"]
+,BulletList
+ [[Plain [Str "These"]]
+ ,[Plain [Str "are"]]
+ ,[Plain [Str "not"]]]
+,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"]
+,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "also"]]
+  ,[Plain [Str "be"]]
+  ,[Plain [Str "incremental"]]]]
+,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"]
+,Div ("",["incremental"],[])
+ [OrderedList (1,Decimal,Period)
+  [[Plain [Str "These"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]]]
+,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"]
+,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"]
+  ,Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "by"]]
+    ,[Plain [Str "one"]]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "below"]]
+ ,Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"]
+  ,Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "by"]]
+    ,[Plain [Str "one"]]]]
+  ,BulletList
+   [[Plain [Str "already"]]
+   ,[Plain [Str "here"]]
+   ,[Plain [Str "though"]]]]]
+,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "An"]]
+    ,[Plain [Str "Incremental"]]
+    ,[Plain [Str "List"]]]]]]
+,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"]
+,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "Then,",Space,Str "a",Space,Str "picture:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]
+,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "two"]]
+    ,[Plain [Str "three"]]]]
+  ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [OrderedList (1,Decimal,Period)
+    [[Plain [Str "one"]]
+    ,[Plain [Str "two"]]
+    ,[Plain [Str "three"]]]]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "1"]]]])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"]
+,Div ("",["incremental","nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]
+  ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]]
+,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"]
+,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "incremental:"]
+,BlockQuote
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "These",Space,Str "are",Space,Str "not:"]
+,Div ("",["incremental"],[])
+ [BlockQuote
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Para [Str "These",Space,Str "are:"]
+,BlockQuote
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "incremental"]]]]]
+,Div ("",["incremental"],[])
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "not"]]]]]]
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
new file mode 100644
index 000000000..450cd16ea
--- /dev/null
+++ b/test/pptx/incremental-lists/without-flag/output.pptx
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
new file mode 100644
index 000000000..e7ab48aa0
--- /dev/null
+++ b/test/pptx/incremental-lists/without-flag/templated.pptx
diff --git a/test/pptx/inline_formatting.native b/test/pptx/inline-formatting/input.native
index 164176af2..164176af2 100644
--- a/test/pptx/inline_formatting.native
+++ b/test/pptx/inline-formatting/input.native
diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline-formatting/output.pptx
index 473b9498d..7744b7d2e 100644
--- a/test/pptx/inline_formatting.pptx
+++ b/test/pptx/inline-formatting/output.pptx
diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline-formatting/templated.pptx
index dd778a102..6930b785c 100644
--- a/test/pptx/inline_formatting_templated.pptx
+++ b/test/pptx/inline-formatting/templated.pptx
diff --git a/test/pptx/layouts/deleted.pptx b/test/pptx/layouts/deleted.pptx
new file mode 100644
index 000000000..f7116b2f4
--- /dev/null
+++ b/test/pptx/layouts/deleted.pptx
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
--- /dev/null
+++ b/test/pptx/layouts/moved.pptx
diff --git a/test/pptx/list-level/input.native b/test/pptx/list-level/input.native
new file mode 100644
index 000000000..e0b36b8e5
--- /dev/null
+++ b/test/pptx/list-level/input.native
@@ -0,0 +1,20 @@
+[Header 1 ("slide",[],[]) [Str "Slide"]
+,BulletList
+ [[Para [Str "Top-level"]
+  ,Para [Str "With",Space,Str "continuation",Space,Str "paragraph"]]
+ ,[Para [Str "Then:"]
+  ,BulletList
+   [[Plain [Str "nested"]]
+   ,[Plain [Str "list"]]
+   ,[Plain [Str "items"]]]]]
+,Header 1 ("slide-1",[],[]) [Str "Slide"]
+,Para [Str "Paragraph."]
+,OrderedList (1,Decimal,Period)
+ [[Para [Str "Top-level"]
+  ,Para [Str "Continuation"]
+  ,OrderedList (1,Decimal,Period)
+   [[Para [Str "Sub-list"]
+    ,Para [Str "With",Space,Str "Continuation"]]
+   ,[Para [Str "(still",Space,Str "sub-list)"]]]]
+ ,[Para [Str "(back",Space,Str "to",Space,Str "top-level)"]]]
+,Para [Str "Paragraph."]]
diff --git a/test/pptx/lists.pptx b/test/pptx/list-level/output.pptx
index ffc2eb9f7..02c609b40 100644
--- a/test/pptx/lists.pptx
+++ b/test/pptx/list-level/output.pptx
diff --git a/test/pptx/tables_templated.pptx b/test/pptx/list-level/templated.pptx
index 0a8c3e8d9..a7b23ccf9 100644
--- a/test/pptx/tables_templated.pptx
+++ b/test/pptx/list-level/templated.pptx
diff --git a/test/pptx/lists.native b/test/pptx/lists/input.native
index 61249c7fe..61249c7fe 100644
--- a/test/pptx/lists.native
+++ b/test/pptx/lists/input.native
diff --git a/test/pptx/tables.pptx b/test/pptx/lists/output.pptx
index e41219844..857a3e28c 100644
--- a/test/pptx/tables.pptx
+++ b/test/pptx/lists/output.pptx
diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists/templated.pptx
index 2493e7890..5510a7123 100644
--- a/test/pptx/lists_templated.pptx
+++ b/test/pptx/lists/templated.pptx
diff --git a/test/pptx/pauses/without-incremental/output.pptx b/test/pptx/pauses/without-incremental/output.pptx
new file mode 100644
index 000000000..9085db330
--- /dev/null
+++ b/test/pptx/pauses/without-incremental/output.pptx
diff --git a/test/pptx/pauses/without-incremental/templated.pptx b/test/pptx/pauses/without-incremental/templated.pptx
new file mode 100644
index 000000000..6662e2451
--- /dev/null
+++ b/test/pptx/pauses/without-incremental/templated.pptx
diff --git a/test/pptx/raw_ooxml.native b/test/pptx/raw-ooxml/input.native
index ae5bdd140..ae5bdd140 100644
--- a/test/pptx/raw_ooxml.native
+++ b/test/pptx/raw-ooxml/input.native
diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw-ooxml/output.pptx
index 29164af15..1813bbd28 100644
--- a/test/pptx/raw_ooxml.pptx
+++ b/test/pptx/raw-ooxml/output.pptx
diff --git a/test/pptx/raw_ooxml_templated.pptx b/test/pptx/raw-ooxml/templated.pptx
index 0f20f9826..1dd23da2e 100644
--- a/test/pptx/raw_ooxml_templated.pptx
+++ b/test/pptx/raw-ooxml/templated.pptx
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
diff --git a/test/pptx/reference_depth.pptx b/test/pptx/reference-depth.pptx
index 97f444788..97f444788 100644
--- a/test/pptx/reference_depth.pptx
+++ b/test/pptx/reference-depth.pptx
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
diff --git a/test/pptx/remove_empty_slides.native b/test/pptx/remove-empty-slides/input.native
index 51c042281..51c042281 100644
--- a/test/pptx/remove_empty_slides.native
+++ b/test/pptx/remove-empty-slides/input.native
diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx
new file mode 100644
index 000000000..d0d5e824c
--- /dev/null
+++ b/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
new file mode 100644
index 000000000..c730b2103
--- /dev/null
+++ b/test/pptx/remove-empty-slides/templated.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index 449339778..d443bc04e 100644
--- a/test/pptx/slide_breaks_slide_level_1.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/output.pptx
diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
index 0e640f373..ca2e844cc 100644
--- a/test/pptx/code-custom_templated.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/templated.pptx
diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide-breaks-toc/output.pptx
index 9dbfa41a0..e24b45e12 100644
--- a/test/pptx/slide_breaks_toc.pptx
+++ b/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
index b83f3f596..0a2bdb857 100644
--- a/test/pptx/slide_breaks_toc_templated.pptx
+++ b/test/pptx/slide-breaks-toc/templated.pptx
diff --git a/test/pptx/slide_breaks.native b/test/pptx/slide-breaks/input.native
index 084c61737..084c61737 100644
--- a/test/pptx/slide_breaks.native
+++ b/test/pptx/slide-breaks/input.native
diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide-breaks/output.pptx
index e06d9079d..a5208ecf8 100644
--- a/test/pptx/slide_breaks.pptx
+++ b/test/pptx/slide-breaks/output.pptx
diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx
new file mode 100644
index 000000000..5bf186f4e
--- /dev/null
+++ b/test/pptx/slide-breaks/templated.pptx
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/input.native b/test/pptx/slide-level-0/h1-h2-with-table/input.native
new file mode 100644
index 000000000..c6e65ecf5
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-h2-with-table/input.native
@@ -0,0 +1,14 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Header 2 ("there",[],[]) [Str "There"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])]
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
new file mode 100644
index 000000000..bd772d44e
--- /dev/null
+++ b/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
new file mode 100644
index 000000000..b270d2d4f
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx
diff --git a/test/pptx/slide-level-0/h1-with-image/input.native b/test/pptx/slide-level-0/h1-with-image/input.native
new file mode 100644
index 000000000..0f5033b54
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-with-image/input.native
@@ -0,0 +1,2 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index c6df8e18e..1102f549c 100644
--- a/test/pptx/remove_empty_slides.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/output.pptx
diff --git a/test/pptx/remove_empty_slides_templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
index 1df48c5ad..7a023480f 100644
--- a/test/pptx/remove_empty_slides_templated.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/templated.pptx
diff --git a/test/pptx/slide-level-0/h1-with-table/input.native b/test/pptx/slide-level-0/h1-with-table/input.native
new file mode 100644
index 000000000..b961e900d
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-with-table/input.native
@@ -0,0 +1,13 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])]
diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx
new file mode 100644
index 000000000..c0bc6b162
--- /dev/null
+++ b/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
new file mode 100644
index 000000000..eb2a78647
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-with-table/templated.pptx
diff --git a/test/pptx/slide-level-0/h2-with-image/input.native b/test/pptx/slide-level-0/h2-with-image/input.native
new file mode 100644
index 000000000..5def0cb92
--- /dev/null
+++ b/test/pptx/slide-level-0/h2-with-image/input.native
@@ -0,0 +1,2 @@
+[Header 2 ("hello",[],[]) [Str "Hello"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
new file mode 100644
index 000000000..1102f549c
--- /dev/null
+++ b/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
new file mode 100644
index 000000000..7a023480f
--- /dev/null
+++ b/test/pptx/slide-level-0/h2-with-image/templated.pptx
diff --git a/test/pptx/speaker_notes_after_metadata.native b/test/pptx/speaker-notes-after-metadata/input.native
index 6fda4b1ab..6fda4b1ab 100644
--- a/test/pptx/speaker_notes_after_metadata.native
+++ b/test/pptx/speaker-notes-after-metadata/input.native
diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index 6343bffe4..4e5635e0c 100644
--- a/test/pptx/speaker_notes_after_metadata.pptx
+++ b/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
index 8d27c4c68..fd95c935e 100644
--- a/test/pptx/speaker_notes_after_metadata_templated.pptx
+++ b/test/pptx/speaker-notes-after-metadata/templated.pptx
diff --git a/test/pptx/speaker_notes_afterheader.native b/test/pptx/speaker-notes-afterheader/input.native
index 0f7dd95d7..0f7dd95d7 100644
--- a/test/pptx/speaker_notes_afterheader.native
+++ b/test/pptx/speaker-notes-afterheader/input.native
diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index d581681aa..f59b29f6a 100644
--- a/test/pptx/speaker_notes_afterheader.pptx
+++ b/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
index d8d8481df..b85f22961 100644
--- a/test/pptx/speaker_notes_afterheader_templated.pptx
+++ b/test/pptx/speaker-notes-afterheader/templated.pptx
diff --git a/test/pptx/speaker_notes_afterseps.native b/test/pptx/speaker-notes-afterseps/input.native
index 4fd7b1ccb..4fd7b1ccb 100644
--- a/test/pptx/speaker_notes_afterseps.native
+++ b/test/pptx/speaker-notes-afterseps/input.native
diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 13f564bf0..aad79e3dc 100644
--- a/test/pptx/speaker_notes_afterseps.pptx
+++ b/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
index 9c22eaf38..3b272ab1b 100644
--- a/test/pptx/speaker_notes_afterseps_templated.pptx
+++ b/test/pptx/speaker-notes-afterseps/templated.pptx
diff --git a/test/pptx/speaker_notes.native b/test/pptx/speaker-notes/input.native
index 4eeca2107..4eeca2107 100644
--- a/test/pptx/speaker_notes.native
+++ b/test/pptx/speaker-notes/input.native
diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker-notes/output.pptx
index 0ab1302da..7b44c50c2 100644
--- a/test/pptx/speaker_notes.pptx
+++ b/test/pptx/speaker-notes/output.pptx
diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker-notes/templated.pptx
index 930377fbf..f35bf5d88 100644
--- a/test/pptx/speaker_notes_templated.pptx
+++ b/test/pptx/speaker-notes/templated.pptx
diff --git a/test/pptx/start_numbering_at.native b/test/pptx/start-numbering-at/input.native
index ecffbb0ef..ecffbb0ef 100644
--- a/test/pptx/start_numbering_at.native
+++ b/test/pptx/start-numbering-at/input.native
diff --git a/test/pptx/start_numbering_at.pptx b/test/pptx/start-numbering-at/output.pptx
index 4320128b3..e08d300e5 100644
--- a/test/pptx/start_numbering_at.pptx
+++ b/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
index efc56ac7a..30a097eb8 100644
--- a/test/pptx/start_numbering_at_templated.pptx
+++ b/test/pptx/start-numbering-at/templated.pptx
diff --git a/test/pptx/tables.native b/test/pptx/tables/input.native
index 27b843f2b..27b843f2b 100644
--- a/test/pptx/tables.native
+++ b/test/pptx/tables/input.native
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
new file mode 100644
index 000000000..407062ca3
--- /dev/null
+++ b/test/pptx/tables/output.pptx
diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx
new file mode 100644
index 000000000..7259e15dd
--- /dev/null
+++ b/test/pptx/tables/templated.pptx
diff --git a/test/pptx/two_column.native b/test/pptx/two-column/all-text/input.native
index 086f74889..086f74889 100644
--- a/test/pptx/two_column.native
+++ b/test/pptx/two-column/all-text/input.native
diff --git a/test/pptx/two_column.pptx b/test/pptx/two-column/all-text/output.pptx
index 270a7eeac..8a1dce949 100644
--- a/test/pptx/two_column.pptx
+++ b/test/pptx/two-column/all-text/output.pptx
diff --git a/test/pptx/two_column_templated.pptx b/test/pptx/two-column/all-text/templated.pptx
index 6d9470372..01a3cdb0c 100644
--- a/test/pptx/two_column_templated.pptx
+++ b/test/pptx/two-column/all-text/templated.pptx
diff --git a/test/pptx/two-column/text-and-image/input.native b/test/pptx/two-column/text-and-image/input.native
new file mode 100644
index 000000000..796c2c7f4
--- /dev/null
+++ b/test/pptx/two-column/text-and-image/input.native
@@ -0,0 +1,12 @@
+[Header 1 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Para [Str "This",Space,Str "should",Space,Str "use",Space,Str "Two",Space,Str "Content,",Space,Emph [Str "not"],Space,Str "Comparison!"]]]
+,Header 1 ("slide-2",[],[]) [Str "Slide",Space,Str "2"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This",Space,Str "should",Space,Str "also",Space,Str "use",Space,Str "Two",Space,Str "Content"]]
+ ,Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
new file mode 100644
index 000000000..e45bf3d58
--- /dev/null
+++ b/test/pptx/two-column/text-and-image/output.pptx
diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx
new file mode 100644
index 000000000..5cae9b43b
--- /dev/null
+++ b/test/pptx/two-column/text-and-image/templated.pptx