From 0fb6474a55427b52bf9aebd179f7b26f30c7dbaf Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Tue, 7 Sep 2021 13:38:47 +0100
Subject: pptx: Add support for incremental lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Support -i option
- Support incremental/noincremental divs
- Support older block quote syntax
- Add tests

One thing not clear from the manual is what should happen when the input
uses a combination of these things. For example, what should the
following produce?

```md
::: {.incremental .nonincremental}
- are
- these
- incremental?
:::

::: incremental
::::: nonincremental
- or
- these?
:::::
:::

::: nonincremental
> - how
> - about
> - these?
:::
```

In this commit I’ve taken the following approach, matching the observed
behaviour for beamer and reveal.js output:

- if a div with both classes, incremental wins
- the innermost incremental/nonincremental div is the one which takes
  effect
- a block quote containing a list as its first element inverts whether
  the list is incremental, whether or not the quote is inside an
  incremental/non-incremental div

I’ve added some tests to verify this behaviour.

This commit closes issue #5689
(https://github.com/jgm/pandoc/issues/5689).
---
 .../with-flag/deleted-layouts.pptx                 | Bin 0 -> 80172 bytes
 test/pptx/incremental-lists/with-flag/input.native | 139 +++++++++++++++++++++
 .../incremental-lists/with-flag/moved-layouts.pptx | Bin 0 -> 90917 bytes
 test/pptx/incremental-lists/with-flag/output.pptx  | Bin 0 -> 77298 bytes
 .../incremental-lists/with-flag/templated.pptx     | Bin 0 -> 90414 bytes
 5 files changed, 139 insertions(+)
 create mode 100644 test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
 create mode 100644 test/pptx/incremental-lists/with-flag/input.native
 create mode 100644 test/pptx/incremental-lists/with-flag/moved-layouts.pptx
 create mode 100644 test/pptx/incremental-lists/with-flag/output.pptx
 create mode 100644 test/pptx/incremental-lists/with-flag/templated.pptx

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
new file mode 100644
index 000000000..5a74826a4
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx differ
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/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
new file mode 100644
index 000000000..f20dd2906
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx differ
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..d4f76f1e7
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/output.pptx differ
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..f5ee2ff5f
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
-- 
cgit v1.2.3


From 62f83aa48633af477913bde6f615fe9f8793901a Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 4 Oct 2021 11:45:01 -0700
Subject: Powerpoint writer: consolidate text run nodes.

This should reduce the size of the generated files.
---
 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs  |  10 +++++++++-
 test/pptx/background-image/deleted-layouts.pptx     | Bin 56282 -> 56266 bytes
 test/pptx/background-image/moved-layouts.pptx       | Bin 66987 -> 66972 bytes
 test/pptx/background-image/output.pptx              | Bin 53408 -> 53393 bytes
 test/pptx/background-image/templated.pptx           | Bin 66487 -> 66472 bytes
 .../blanks/just-speaker-notes/deleted-layouts.pptx  | Bin 35178 -> 35171 bytes
 .../blanks/just-speaker-notes/moved-layouts.pptx    | Bin 45870 -> 45863 bytes
 test/pptx/blanks/just-speaker-notes/output.pptx     | Bin 32297 -> 32291 bytes
 test/pptx/blanks/just-speaker-notes/templated.pptx  | Bin 45365 -> 45358 bytes
 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx  | Bin 32092 -> 32090 bytes
 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx    | Bin 42780 -> 42778 bytes
 test/pptx/blanks/nbsp-in-body/output.pptx           | Bin 29211 -> 29210 bytes
 test/pptx/blanks/nbsp-in-body/templated.pptx        | Bin 42280 -> 42278 bytes
 .../blanks/nbsp-in-heading/deleted-layouts.pptx     | Bin 32092 -> 32090 bytes
 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 42780 -> 42778 bytes
 test/pptx/blanks/nbsp-in-heading/output.pptx        | Bin 29211 -> 29210 bytes
 test/pptx/blanks/nbsp-in-heading/templated.pptx     | Bin 42280 -> 42278 bytes
 test/pptx/code-custom/deleted-layouts.pptx          | Bin 32717 -> 32711 bytes
 test/pptx/code-custom/moved-layouts.pptx            | Bin 43405 -> 43398 bytes
 test/pptx/code-custom/output.pptx                   | Bin 29836 -> 29831 bytes
 test/pptx/code-custom/templated.pptx                | Bin 42905 -> 42897 bytes
 test/pptx/code/deleted-layouts.pptx                 | Bin 32716 -> 32709 bytes
 test/pptx/code/moved-layouts.pptx                   | Bin 43405 -> 43398 bytes
 test/pptx/code/output.pptx                          | Bin 29835 -> 29829 bytes
 test/pptx/code/templated.pptx                       | Bin 42905 -> 42897 bytes
 .../comparison/both-columns/deleted-layouts.pptx    | Bin 47453 -> 47449 bytes
 .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 58172 -> 58169 bytes
 test/pptx/comparison/both-columns/output.pptx       | Bin 44581 -> 44578 bytes
 test/pptx/comparison/both-columns/templated.pptx    | Bin 57674 -> 57671 bytes
 .../comparison/extra-image/deleted-layouts.pptx     | Bin 47482 -> 47481 bytes
 test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 58200 -> 58196 bytes
 test/pptx/comparison/extra-image/output.pptx        | Bin 44610 -> 44610 bytes
 test/pptx/comparison/extra-image/templated.pptx     | Bin 57702 -> 57699 bytes
 .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 47453 -> 47449 bytes
 test/pptx/comparison/extra-text/moved-layouts.pptx  | Bin 58172 -> 58168 bytes
 test/pptx/comparison/extra-text/output.pptx         | Bin 44581 -> 44578 bytes
 test/pptx/comparison/extra-text/templated.pptx      | Bin 57674 -> 57671 bytes
 .../comparison/non-text-first/deleted-layouts.pptx  | Bin 47366 -> 47370 bytes
 .../comparison/non-text-first/moved-layouts.pptx    | Bin 58065 -> 58063 bytes
 test/pptx/comparison/non-text-first/output.pptx     | Bin 44494 -> 44499 bytes
 test/pptx/comparison/non-text-first/templated.pptx  | Bin 57567 -> 57566 bytes
 .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 30785 -> 30785 bytes
 test/pptx/comparison/one-column/moved-layouts.pptx  | Bin 41506 -> 41506 bytes
 test/pptx/comparison/one-column/output.pptx         | Bin 27906 -> 27907 bytes
 test/pptx/comparison/one-column/templated.pptx      | Bin 41006 -> 41006 bytes
 .../heading-text-image/deleted-layouts.pptx         | Bin 47198 -> 47199 bytes
 .../heading-text-image/moved-layouts.pptx           | Bin 57896 -> 57896 bytes
 .../heading-text-image/output.pptx                  | Bin 44326 -> 44328 bytes
 .../heading-text-image/templated.pptx               | Bin 57398 -> 57399 bytes
 .../image-text/deleted-layouts.pptx                 | Bin 47896 -> 47896 bytes
 .../image-text/moved-layouts.pptx                   | Bin 58584 -> 58584 bytes
 .../content-with-caption/image-text/output.pptx     | Bin 45022 -> 45023 bytes
 .../content-with-caption/image-text/templated.pptx  | Bin 58084 -> 58084 bytes
 .../text-image/deleted-layouts.pptx                 | Bin 47137 -> 47136 bytes
 .../text-image/moved-layouts.pptx                   | Bin 57836 -> 57836 bytes
 .../content-with-caption/text-image/output.pptx     | Bin 44265 -> 44265 bytes
 .../content-with-caption/text-image/templated.pptx  | Bin 57338 -> 57338 bytes
 .../deleted-layouts.pptx                            | Bin 31490 -> 31489 bytes
 .../moved-layouts.pptx                              | Bin 42178 -> 42177 bytes
 .../pptx/document-properties-short-desc/output.pptx | Bin 28619 -> 28620 bytes
 .../document-properties-short-desc/templated.pptx   | Bin 41678 -> 41677 bytes
 test/pptx/document-properties/deleted-layouts.pptx  | Bin 31894 -> 31896 bytes
 test/pptx/document-properties/moved-layouts.pptx    | Bin 42582 -> 42583 bytes
 test/pptx/document-properties/output.pptx           | Bin 29025 -> 29026 bytes
 test/pptx/document-properties/templated.pptx        | Bin 42082 -> 42083 bytes
 test/pptx/footer/basic/output.pptx                  | Bin 52775 -> 52757 bytes
 test/pptx/footer/fixed-date/output.pptx             | Bin 51397 -> 51376 bytes
 test/pptx/footer/higher-slide-number/output.pptx    | Bin 52790 -> 52771 bytes
 test/pptx/footer/no-title-slide/output.pptx         | Bin 52362 -> 52343 bytes
 test/pptx/images/deleted-layouts.pptx               | Bin 49121 -> 49120 bytes
 test/pptx/images/moved-layouts.pptx                 | Bin 59809 -> 59808 bytes
 test/pptx/images/output.pptx                        | Bin 46244 -> 46243 bytes
 test/pptx/images/templated.pptx                     | Bin 59308 -> 59308 bytes
 .../with-flag/deleted-layouts.pptx                  | Bin 80172 -> 80140 bytes
 .../incremental-lists/with-flag/moved-layouts.pptx  | Bin 90917 -> 90883 bytes
 test/pptx/incremental-lists/with-flag/output.pptx   | Bin 77298 -> 77267 bytes
 .../pptx/incremental-lists/with-flag/templated.pptx | Bin 90414 -> 90380 bytes
 .../without-flag/deleted-layouts.pptx               | Bin 78405 -> 78375 bytes
 .../without-flag/moved-layouts.pptx                 | Bin 89148 -> 89115 bytes
 .../pptx/incremental-lists/without-flag/output.pptx | Bin 75533 -> 75504 bytes
 .../incremental-lists/without-flag/templated.pptx   | Bin 88645 -> 88612 bytes
 test/pptx/lists/deleted-layouts.pptx                | Bin 31545 -> 31545 bytes
 test/pptx/lists/moved-layouts.pptx                  | Bin 42233 -> 42233 bytes
 test/pptx/lists/output.pptx                         | Bin 28667 -> 28668 bytes
 test/pptx/lists/templated.pptx                      | Bin 41733 -> 41734 bytes
 .../slide-breaks-slide-level-1/deleted-layouts.pptx | Bin 32238 -> 32238 bytes
 .../slide-breaks-slide-level-1/moved-layouts.pptx   | Bin 42926 -> 42926 bytes
 test/pptx/slide-breaks-slide-level-1/output.pptx    | Bin 29357 -> 29358 bytes
 test/pptx/slide-breaks-slide-level-1/templated.pptx | Bin 42426 -> 42427 bytes
 test/pptx/slide-breaks-toc/deleted-layouts.pptx     | Bin 34012 -> 34013 bytes
 test/pptx/slide-breaks-toc/moved-layouts.pptx       | Bin 44701 -> 44702 bytes
 test/pptx/slide-breaks-toc/output.pptx              | Bin 31133 -> 31135 bytes
 test/pptx/slide-breaks-toc/templated.pptx           | Bin 44201 -> 44203 bytes
 test/pptx/slide-breaks/deleted-layouts.pptx         | Bin 33062 -> 33063 bytes
 test/pptx/slide-breaks/moved-layouts.pptx           | Bin 43751 -> 43752 bytes
 test/pptx/slide-breaks/output.pptx                  | Bin 30183 -> 30185 bytes
 test/pptx/slide-breaks/templated.pptx               | Bin 43250 -> 43252 bytes
 .../h1-with-image/deleted-layouts.pptx              | Bin 47118 -> 47119 bytes
 .../slide-level-0/h1-with-image/moved-layouts.pptx  | Bin 57804 -> 57805 bytes
 test/pptx/slide-level-0/h1-with-image/output.pptx   | Bin 44245 -> 44247 bytes
 .../pptx/slide-level-0/h1-with-image/templated.pptx | Bin 57306 -> 57306 bytes
 .../h2-with-image/deleted-layouts.pptx              | Bin 47118 -> 47119 bytes
 .../slide-level-0/h2-with-image/moved-layouts.pptx  | Bin 57804 -> 57805 bytes
 test/pptx/slide-level-0/h2-with-image/output.pptx   | Bin 44245 -> 44247 bytes
 .../pptx/slide-level-0/h2-with-image/templated.pptx | Bin 57306 -> 57306 bytes
 .../deleted-layouts.pptx                            | Bin 34504 -> 34500 bytes
 .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45193 -> 45189 bytes
 test/pptx/speaker-notes-after-metadata/output.pptx  | Bin 31634 -> 31632 bytes
 .../speaker-notes-after-metadata/templated.pptx     | Bin 44690 -> 44685 bytes
 .../speaker-notes-afterheader/deleted-layouts.pptx  | Bin 33532 -> 33524 bytes
 .../speaker-notes-afterheader/moved-layouts.pptx    | Bin 44220 -> 44212 bytes
 test/pptx/speaker-notes-afterheader/output.pptx     | Bin 30653 -> 30646 bytes
 test/pptx/speaker-notes-afterheader/templated.pptx  | Bin 43719 -> 43710 bytes
 .../speaker-notes-afterseps/deleted-layouts.pptx    | Bin 54429 -> 54414 bytes
 .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65119 -> 65104 bytes
 test/pptx/speaker-notes-afterseps/output.pptx       | Bin 51548 -> 51534 bytes
 test/pptx/speaker-notes-afterseps/templated.pptx    | Bin 64614 -> 64598 bytes
 test/pptx/speaker-notes/deleted-layouts.pptx        | Bin 38236 -> 38227 bytes
 test/pptx/speaker-notes/moved-layouts.pptx          | Bin 48929 -> 48920 bytes
 test/pptx/speaker-notes/output.pptx                 | Bin 35358 -> 35350 bytes
 test/pptx/speaker-notes/templated.pptx              | Bin 48423 -> 48413 bytes
 test/pptx/start-numbering-at/deleted-layouts.pptx   | Bin 31521 -> 31517 bytes
 test/pptx/start-numbering-at/moved-layouts.pptx     | Bin 42209 -> 42205 bytes
 test/pptx/start-numbering-at/output.pptx            | Bin 28643 -> 28640 bytes
 test/pptx/start-numbering-at/templated.pptx         | Bin 41709 -> 41706 bytes
 test/pptx/tables/deleted-layouts.pptx               | Bin 32065 -> 32059 bytes
 test/pptx/tables/moved-layouts.pptx                 | Bin 42753 -> 42747 bytes
 test/pptx/tables/output.pptx                        | Bin 29184 -> 29179 bytes
 test/pptx/tables/templated.pptx                     | Bin 42253 -> 42248 bytes
 test/pptx/two-column/all-text/deleted-layouts.pptx  | Bin 30568 -> 30569 bytes
 test/pptx/two-column/all-text/moved-layouts.pptx    | Bin 41256 -> 41257 bytes
 test/pptx/two-column/all-text/output.pptx           | Bin 27689 -> 27691 bytes
 test/pptx/two-column/all-text/templated.pptx        | Bin 40756 -> 40758 bytes
 .../two-column/text-and-image/deleted-layouts.pptx  | Bin 48392 -> 48389 bytes
 .../two-column/text-and-image/moved-layouts.pptx    | Bin 59086 -> 59084 bytes
 test/pptx/two-column/text-and-image/output.pptx     | Bin 45520 -> 45518 bytes
 test/pptx/two-column/text-and-image/templated.pptx  | Bin 58586 -> 58585 bytes
 137 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index e3d31d099..1680bc7ac 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -348,7 +348,15 @@ instance Default PicProps where
 --------------------------------------------------
 
 inlinesToParElems :: [Inline] -> Pres [ParaElem]
-inlinesToParElems ils = concatMapM inlineToParElems ils
+inlinesToParElems = concatMapM inlineToParElems . consolidateStrs
+ where
+  -- we combine Str + Space combinations, because this makes
+  -- the resulting ooxml much more compact, with fewer independent
+  -- text run elements
+  consolidateStrs [] = []
+  consolidateStrs (Str t : Space : ils) = consolidateStrs (Str (t <> " ") : ils)
+  consolidateStrs (Space : Str t : ils) = consolidateStrs (Str (" " <> t) : ils)
+  consolidateStrs (il : ils) = il : consolidateStrs ils
 
 inlineToParElems :: Inline -> Pres [ParaElem]
 inlineToParElems (Str s) = do
diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx
index 05d4104b7..41f13db87 100644
Binary files a/test/pptx/background-image/deleted-layouts.pptx and b/test/pptx/background-image/deleted-layouts.pptx differ
diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx
index 73b69e1d6..ca7a8a9d5 100644
Binary files a/test/pptx/background-image/moved-layouts.pptx and b/test/pptx/background-image/moved-layouts.pptx differ
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
index 9738eefb8..f3c2c7606 100644
Binary files a/test/pptx/background-image/output.pptx and b/test/pptx/background-image/output.pptx differ
diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx
index 52d304957..442fe3bdd 100644
Binary files a/test/pptx/background-image/templated.pptx and b/test/pptx/background-image/templated.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
index 5038f2aaf..3dcc1d444 100644
Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
index 90353a560..c63d94774 100644
Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
index 799c0f14a..9377013a0 100644
Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx
index 5e3afb5f8..ed65b8f32 100644
Binary files a/test/pptx/blanks/just-speaker-notes/templated.pptx and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
index 7716e1cbf..650da51db 100644
Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
index 3dc6c817e..45cf168a9 100644
Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
index 1df3f9574..57c6e3b6e 100644
Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx
index 1cf58a1bb..8cc5d053a 100644
Binary files a/test/pptx/blanks/nbsp-in-body/templated.pptx and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
index 7716e1cbf..8b1d0a37b 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
index 3dc6c817e..45cf168a9 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
index e528091d7..57c6e3b6e 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx
index 1f2d91399..8cc5d053a 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/templated.pptx and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ
diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
index b49cd4896..04e6dadd1 100644
Binary files a/test/pptx/code-custom/deleted-layouts.pptx and b/test/pptx/code-custom/deleted-layouts.pptx differ
diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
index c6806f37f..caacdab47 100644
Binary files a/test/pptx/code-custom/moved-layouts.pptx and b/test/pptx/code-custom/moved-layouts.pptx differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index a72bebbe2..f5aa05b41 100644
Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx
index 2bdb526fa..160f85bdf 100644
Binary files a/test/pptx/code-custom/templated.pptx and b/test/pptx/code-custom/templated.pptx differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
index df7814599..bbfabede2 100644
Binary files a/test/pptx/code/deleted-layouts.pptx and b/test/pptx/code/deleted-layouts.pptx differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
index 71e8560bd..7950abbad 100644
Binary files a/test/pptx/code/moved-layouts.pptx and b/test/pptx/code/moved-layouts.pptx differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index 4b70df2c7..ce08a9c64 100644
Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx
index 1285a9273..2a37db25a 100644
Binary files a/test/pptx/code/templated.pptx and b/test/pptx/code/templated.pptx differ
diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx
index 27f9d9ac7..03ee6c408 100644
Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx
index a658045ef..bb5f046fd 100644
Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
index 560c7d41a..345833b8b 100644
Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ
diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx
index 2fb38880d..3dcc6274f 100644
Binary files a/test/pptx/comparison/both-columns/templated.pptx and b/test/pptx/comparison/both-columns/templated.pptx differ
diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx
index 267c7cb69..0ad383194 100644
Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx
index b7023026c..30bf2450b 100644
Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
index 06d632ee7..464a07d88 100644
Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ
diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx
index af84388c4..771b16cda 100644
Binary files a/test/pptx/comparison/extra-image/templated.pptx and b/test/pptx/comparison/extra-image/templated.pptx differ
diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx
index 27f9d9ac7..03ee6c408 100644
Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx
index a658045ef..2541e97d3 100644
Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
index 560c7d41a..345833b8b 100644
Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ
diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx
index 2fb38880d..8d78e715a 100644
Binary files a/test/pptx/comparison/extra-text/templated.pptx and b/test/pptx/comparison/extra-text/templated.pptx differ
diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx
index be30d8368..d2fab6c94 100644
Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx
index c4879b7d5..16d59be78 100644
Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
index 099cf6729..5f5d12d2f 100644
Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ
diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx
index 31ac01f18..520021af3 100644
Binary files a/test/pptx/comparison/non-text-first/templated.pptx and b/test/pptx/comparison/non-text-first/templated.pptx differ
diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx
index 27620f05f..5a31c333a 100644
Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx
index fc64d3af5..cce84cc9f 100644
Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and b/test/pptx/comparison/one-column/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
index 854a968af..cc690844f 100644
Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ
diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx
index 9e671af1d..309a25d6e 100644
Binary files a/test/pptx/comparison/one-column/templated.pptx and b/test/pptx/comparison/one-column/templated.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
index 3cd09a916..1a94474ea 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
index 8e76bc94c..32d76ca3d 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
index 5c680e878..aea085efc 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx
index bdde384a4..07becc7f8 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/templated.pptx and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
index 376880b41..4e834f056 100644
Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx
index 9e33d3163..44a689c30 100644
Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and b/test/pptx/content-with-caption/image-text/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
index c88030b94..e1595c428 100644
Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx
index a22e9ae3e..58264a92d 100644
Binary files a/test/pptx/content-with-caption/image-text/templated.pptx and b/test/pptx/content-with-caption/image-text/templated.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
index 2dcb8b78e..e548a7798 100644
Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx
index 7d187a168..ca0e74a18 100644
Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
index 751121cf2..3fdf9ea07 100644
Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx
index 4f0aaaa7a..bd96bd723 100644
Binary files a/test/pptx/content-with-caption/text-image/templated.pptx and b/test/pptx/content-with-caption/text-image/templated.pptx differ
diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
index 79517481a..f8903bbd4 100644
Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
index 51608c2e9..59674d5dd 100644
Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and b/test/pptx/document-properties-short-desc/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
index 02c241b89..2c1ef0faa 100644
Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ
diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
index 82ccc072c..3e004942c 100644
Binary files a/test/pptx/document-properties-short-desc/templated.pptx and b/test/pptx/document-properties-short-desc/templated.pptx differ
diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
index 12f6570cf..229cfc5a7 100644
Binary files a/test/pptx/document-properties/deleted-layouts.pptx and b/test/pptx/document-properties/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
index 9a9d4ac3e..18d35eb26 100644
Binary files a/test/pptx/document-properties/moved-layouts.pptx and b/test/pptx/document-properties/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
index cfd3261bc..51f7a5116 100644
Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ
diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx
index 3d52d22df..6e37cd4a1 100644
Binary files a/test/pptx/document-properties/templated.pptx and b/test/pptx/document-properties/templated.pptx differ
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
index db8814418..8a2595016 100644
Binary files a/test/pptx/footer/basic/output.pptx and b/test/pptx/footer/basic/output.pptx differ
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
index 85854a744..b6857e8cf 100644
Binary files a/test/pptx/footer/fixed-date/output.pptx and b/test/pptx/footer/fixed-date/output.pptx differ
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
index c5bc3d047..1e3bfc5aa 100644
Binary files a/test/pptx/footer/higher-slide-number/output.pptx and b/test/pptx/footer/higher-slide-number/output.pptx differ
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
index d1475bf1f..a36a80406 100644
Binary files a/test/pptx/footer/no-title-slide/output.pptx and b/test/pptx/footer/no-title-slide/output.pptx differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
index 9f0f41c37..5da21f29c 100644
Binary files a/test/pptx/images/deleted-layouts.pptx and b/test/pptx/images/deleted-layouts.pptx differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
index f26ac9e8f..a394237ca 100644
Binary files a/test/pptx/images/moved-layouts.pptx and b/test/pptx/images/moved-layouts.pptx differ
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
index 993209a45..0c4a774b1 100644
Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ
diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx
index 06b337538..9bb4567cf 100644
Binary files a/test/pptx/images/templated.pptx and b/test/pptx/images/templated.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
index 5a74826a4..180ac47b7 100644
Binary files a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
index f20dd2906..1b6fc81b2 100644
Binary files a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
index d4f76f1e7..2cfffc0e9 100644
Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
index f5ee2ff5f..7d9292f5c 100644
Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
index 16bd85ffd..6d68aafef 100644
Binary files a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
index 054fe918e..5bb33a6b4 100644
Binary files a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
index 1b326461d..4afae23d9 100644
Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
index dee6e9b06..62b0ab802 100644
Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
index 1670eada1..d8fd26264 100644
Binary files a/test/pptx/lists/deleted-layouts.pptx and b/test/pptx/lists/deleted-layouts.pptx differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
index f7590c5f9..30319c6b8 100644
Binary files a/test/pptx/lists/moved-layouts.pptx and b/test/pptx/lists/moved-layouts.pptx differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index 95510e92e..7a7c9488b 100644
Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 7af437bfe..9cece3499 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx 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
index 334fdea9c..5f672b9d8 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx 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
index 3faabfd93..159a8bb0f 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index 96b9907cc..f1c8c8f46 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
index 9f23f1d9f..7baaf5791 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/templated.pptx and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ
diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
index 0492ee2ec..cd0372c89 100644
Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
index f3e56652c..dc94f201b 100644
Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and b/test/pptx/slide-breaks-toc/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index b3063b15e..c9df30e6b 100644
Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
index bcb2f8276..36ae13623 100644
Binary files a/test/pptx/slide-breaks-toc/templated.pptx and b/test/pptx/slide-breaks-toc/templated.pptx differ
diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
index 827c7dfda..b6cd32a04 100644
Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and b/test/pptx/slide-breaks/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
index 241605754..48c50a709 100644
Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and b/test/pptx/slide-breaks/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
index 55c09a80e..30c3c1a8e 100644
Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ
diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx
index f60f7da06..84581a358 100644
Binary files a/test/pptx/slide-breaks/templated.pptx and b/test/pptx/slide-breaks/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
index 7bc7cfeee..8903ff6fa 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
index 602df1c77..65491db8c 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index f725760dc..bdada1cad 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
index b203ff671..e1c85d948 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/templated.pptx and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
index 7bc7cfeee..8903ff6fa 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
index 602df1c77..65491db8c 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
index f725760dc..bdada1cad 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx
index b203ff671..e1c85d948 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/templated.pptx and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
index 9010ba04a..30bd36e5d 100644
Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
index ca53605b7..b05079ef2 100644
Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index 607115858..41e3148cb 100644
Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx
index 3be3ed0af..9cdc0ef9f 100644
Binary files a/test/pptx/speaker-notes-after-metadata/templated.pptx and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
index 2c2a0936b..54de85128 100644
Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
index a9c8bfa0a..4e4a854e5 100644
Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index ff403aa1c..96b136ef9 100644
Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx
index 15435c45a..abdc71ebc 100644
Binary files a/test/pptx/speaker-notes-afterheader/templated.pptx and b/test/pptx/speaker-notes-afterheader/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
index f6abb0b27..99e499f4d 100644
Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
index 6a770fc75..49f7360c7 100644
Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 7e56147f1..3a426d29a 100644
Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
index 3184ff74e..8e26e7581 100644
Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ
diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
index 5429b88e0..a8014c666 100644
Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
index 13e34698d..be5c383c3 100644
Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and b/test/pptx/speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
index 74041a40d..0fe2b7783 100644
Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ
diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx
index 80a3e3dea..70e1a2c88 100644
Binary files a/test/pptx/speaker-notes/templated.pptx and b/test/pptx/speaker-notes/templated.pptx differ
diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
index 7bfe9868f..8692da129 100644
Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
index 0100365ec..7e1a68a0d 100644
Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and b/test/pptx/start-numbering-at/moved-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index 3ba9a236a..95a0c8ef4 100644
Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index 8a144d601..b4302f6d5 100644
Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
index 163d4ca5e..ebad0c49b 100644
Binary files a/test/pptx/tables/deleted-layouts.pptx and b/test/pptx/tables/deleted-layouts.pptx differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
index 1b0e606da..2ad4646a6 100644
Binary files a/test/pptx/tables/moved-layouts.pptx and b/test/pptx/tables/moved-layouts.pptx differ
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
index 1c89d8032..81f7a21c1 100644
Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ
diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx
index 5755bfe9d..538bec0fb 100644
Binary files a/test/pptx/tables/templated.pptx and b/test/pptx/tables/templated.pptx differ
diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx
index 1d7bd87d3..58400da56 100644
Binary files a/test/pptx/two-column/all-text/deleted-layouts.pptx and b/test/pptx/two-column/all-text/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx
index 71760268c..7e94ede93 100644
Binary files a/test/pptx/two-column/all-text/moved-layouts.pptx and b/test/pptx/two-column/all-text/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx
index 396dc2a74..f5d871c53 100644
Binary files a/test/pptx/two-column/all-text/output.pptx and b/test/pptx/two-column/all-text/output.pptx differ
diff --git a/test/pptx/two-column/all-text/templated.pptx b/test/pptx/two-column/all-text/templated.pptx
index 8901695b1..d5f563006 100644
Binary files a/test/pptx/two-column/all-text/templated.pptx and b/test/pptx/two-column/all-text/templated.pptx differ
diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx
index 297fd6bad..43ced4431 100644
Binary files a/test/pptx/two-column/text-and-image/deleted-layouts.pptx and b/test/pptx/two-column/text-and-image/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx
index c9a6e577e..231723f10 100644
Binary files a/test/pptx/two-column/text-and-image/moved-layouts.pptx and b/test/pptx/two-column/text-and-image/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
index bfd532ed9..bb6af0d74 100644
Binary files a/test/pptx/two-column/text-and-image/output.pptx and b/test/pptx/two-column/text-and-image/output.pptx differ
diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx
index 23e6b283f..4014b0bf1 100644
Binary files a/test/pptx/two-column/text-and-image/templated.pptx and b/test/pptx/two-column/text-and-image/templated.pptx differ
-- 
cgit v1.2.3


From 82d587493d97536a64110902f647d953b5f28dd4 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 4 Oct 2021 11:50:32 -0700
Subject: Revert "Powerpoint writer: consolidate text run nodes."

This reverts commit 62f83aa48633af477913bde6f615fe9f8793901a.

This was already being done, it seems.
I misidentified the problem; it is really with `Str ""` nodes.
---
 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs  |  10 +---------
 test/pptx/background-image/deleted-layouts.pptx     | Bin 56266 -> 56282 bytes
 test/pptx/background-image/moved-layouts.pptx       | Bin 66972 -> 66987 bytes
 test/pptx/background-image/output.pptx              | Bin 53393 -> 53408 bytes
 test/pptx/background-image/templated.pptx           | Bin 66472 -> 66487 bytes
 .../blanks/just-speaker-notes/deleted-layouts.pptx  | Bin 35171 -> 35178 bytes
 .../blanks/just-speaker-notes/moved-layouts.pptx    | Bin 45863 -> 45870 bytes
 test/pptx/blanks/just-speaker-notes/output.pptx     | Bin 32291 -> 32297 bytes
 test/pptx/blanks/just-speaker-notes/templated.pptx  | Bin 45358 -> 45365 bytes
 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx  | Bin 32090 -> 32092 bytes
 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx    | Bin 42778 -> 42780 bytes
 test/pptx/blanks/nbsp-in-body/output.pptx           | Bin 29210 -> 29211 bytes
 test/pptx/blanks/nbsp-in-body/templated.pptx        | Bin 42278 -> 42280 bytes
 .../blanks/nbsp-in-heading/deleted-layouts.pptx     | Bin 32090 -> 32092 bytes
 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 42778 -> 42780 bytes
 test/pptx/blanks/nbsp-in-heading/output.pptx        | Bin 29210 -> 29211 bytes
 test/pptx/blanks/nbsp-in-heading/templated.pptx     | Bin 42278 -> 42280 bytes
 test/pptx/code-custom/deleted-layouts.pptx          | Bin 32711 -> 32717 bytes
 test/pptx/code-custom/moved-layouts.pptx            | Bin 43398 -> 43405 bytes
 test/pptx/code-custom/output.pptx                   | Bin 29831 -> 29836 bytes
 test/pptx/code-custom/templated.pptx                | Bin 42897 -> 42905 bytes
 test/pptx/code/deleted-layouts.pptx                 | Bin 32709 -> 32716 bytes
 test/pptx/code/moved-layouts.pptx                   | Bin 43398 -> 43405 bytes
 test/pptx/code/output.pptx                          | Bin 29829 -> 29835 bytes
 test/pptx/code/templated.pptx                       | Bin 42897 -> 42905 bytes
 .../comparison/both-columns/deleted-layouts.pptx    | Bin 47449 -> 47453 bytes
 .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 58169 -> 58172 bytes
 test/pptx/comparison/both-columns/output.pptx       | Bin 44578 -> 44581 bytes
 test/pptx/comparison/both-columns/templated.pptx    | Bin 57671 -> 57674 bytes
 .../comparison/extra-image/deleted-layouts.pptx     | Bin 47481 -> 47482 bytes
 test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 58196 -> 58200 bytes
 test/pptx/comparison/extra-image/output.pptx        | Bin 44610 -> 44610 bytes
 test/pptx/comparison/extra-image/templated.pptx     | Bin 57699 -> 57702 bytes
 .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 47449 -> 47453 bytes
 test/pptx/comparison/extra-text/moved-layouts.pptx  | Bin 58168 -> 58172 bytes
 test/pptx/comparison/extra-text/output.pptx         | Bin 44578 -> 44581 bytes
 test/pptx/comparison/extra-text/templated.pptx      | Bin 57671 -> 57674 bytes
 .../comparison/non-text-first/deleted-layouts.pptx  | Bin 47370 -> 47366 bytes
 .../comparison/non-text-first/moved-layouts.pptx    | Bin 58063 -> 58065 bytes
 test/pptx/comparison/non-text-first/output.pptx     | Bin 44499 -> 44494 bytes
 test/pptx/comparison/non-text-first/templated.pptx  | Bin 57566 -> 57567 bytes
 .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 30785 -> 30785 bytes
 test/pptx/comparison/one-column/moved-layouts.pptx  | Bin 41506 -> 41506 bytes
 test/pptx/comparison/one-column/output.pptx         | Bin 27907 -> 27906 bytes
 test/pptx/comparison/one-column/templated.pptx      | Bin 41006 -> 41006 bytes
 .../heading-text-image/deleted-layouts.pptx         | Bin 47199 -> 47198 bytes
 .../heading-text-image/moved-layouts.pptx           | Bin 57896 -> 57896 bytes
 .../heading-text-image/output.pptx                  | Bin 44328 -> 44326 bytes
 .../heading-text-image/templated.pptx               | Bin 57399 -> 57398 bytes
 .../image-text/deleted-layouts.pptx                 | Bin 47896 -> 47896 bytes
 .../image-text/moved-layouts.pptx                   | Bin 58584 -> 58584 bytes
 .../content-with-caption/image-text/output.pptx     | Bin 45023 -> 45022 bytes
 .../content-with-caption/image-text/templated.pptx  | Bin 58084 -> 58084 bytes
 .../text-image/deleted-layouts.pptx                 | Bin 47136 -> 47137 bytes
 .../text-image/moved-layouts.pptx                   | Bin 57836 -> 57836 bytes
 .../content-with-caption/text-image/output.pptx     | Bin 44265 -> 44265 bytes
 .../content-with-caption/text-image/templated.pptx  | Bin 57338 -> 57338 bytes
 .../deleted-layouts.pptx                            | Bin 31489 -> 31490 bytes
 .../moved-layouts.pptx                              | Bin 42177 -> 42178 bytes
 .../pptx/document-properties-short-desc/output.pptx | Bin 28620 -> 28619 bytes
 .../document-properties-short-desc/templated.pptx   | Bin 41677 -> 41678 bytes
 test/pptx/document-properties/deleted-layouts.pptx  | Bin 31896 -> 31894 bytes
 test/pptx/document-properties/moved-layouts.pptx    | Bin 42583 -> 42582 bytes
 test/pptx/document-properties/output.pptx           | Bin 29026 -> 29025 bytes
 test/pptx/document-properties/templated.pptx        | Bin 42083 -> 42082 bytes
 test/pptx/footer/basic/output.pptx                  | Bin 52757 -> 52775 bytes
 test/pptx/footer/fixed-date/output.pptx             | Bin 51376 -> 51397 bytes
 test/pptx/footer/higher-slide-number/output.pptx    | Bin 52771 -> 52790 bytes
 test/pptx/footer/no-title-slide/output.pptx         | Bin 52343 -> 52362 bytes
 test/pptx/images/deleted-layouts.pptx               | Bin 49120 -> 49121 bytes
 test/pptx/images/moved-layouts.pptx                 | Bin 59808 -> 59809 bytes
 test/pptx/images/output.pptx                        | Bin 46243 -> 46244 bytes
 test/pptx/images/templated.pptx                     | Bin 59308 -> 59308 bytes
 .../with-flag/deleted-layouts.pptx                  | Bin 80140 -> 80172 bytes
 .../incremental-lists/with-flag/moved-layouts.pptx  | Bin 90883 -> 90917 bytes
 test/pptx/incremental-lists/with-flag/output.pptx   | Bin 77267 -> 77298 bytes
 .../pptx/incremental-lists/with-flag/templated.pptx | Bin 90380 -> 90414 bytes
 .../without-flag/deleted-layouts.pptx               | Bin 78375 -> 78405 bytes
 .../without-flag/moved-layouts.pptx                 | Bin 89115 -> 89148 bytes
 .../pptx/incremental-lists/without-flag/output.pptx | Bin 75504 -> 75533 bytes
 .../incremental-lists/without-flag/templated.pptx   | Bin 88612 -> 88645 bytes
 test/pptx/lists/deleted-layouts.pptx                | Bin 31545 -> 31545 bytes
 test/pptx/lists/moved-layouts.pptx                  | Bin 42233 -> 42233 bytes
 test/pptx/lists/output.pptx                         | Bin 28668 -> 28667 bytes
 test/pptx/lists/templated.pptx                      | Bin 41734 -> 41733 bytes
 .../slide-breaks-slide-level-1/deleted-layouts.pptx | Bin 32238 -> 32238 bytes
 .../slide-breaks-slide-level-1/moved-layouts.pptx   | Bin 42926 -> 42926 bytes
 test/pptx/slide-breaks-slide-level-1/output.pptx    | Bin 29358 -> 29357 bytes
 test/pptx/slide-breaks-slide-level-1/templated.pptx | Bin 42427 -> 42426 bytes
 test/pptx/slide-breaks-toc/deleted-layouts.pptx     | Bin 34013 -> 34012 bytes
 test/pptx/slide-breaks-toc/moved-layouts.pptx       | Bin 44702 -> 44701 bytes
 test/pptx/slide-breaks-toc/output.pptx              | Bin 31135 -> 31133 bytes
 test/pptx/slide-breaks-toc/templated.pptx           | Bin 44203 -> 44201 bytes
 test/pptx/slide-breaks/deleted-layouts.pptx         | Bin 33063 -> 33062 bytes
 test/pptx/slide-breaks/moved-layouts.pptx           | Bin 43752 -> 43751 bytes
 test/pptx/slide-breaks/output.pptx                  | Bin 30185 -> 30183 bytes
 test/pptx/slide-breaks/templated.pptx               | Bin 43252 -> 43250 bytes
 .../h1-with-image/deleted-layouts.pptx              | Bin 47119 -> 47118 bytes
 .../slide-level-0/h1-with-image/moved-layouts.pptx  | Bin 57805 -> 57804 bytes
 test/pptx/slide-level-0/h1-with-image/output.pptx   | Bin 44247 -> 44245 bytes
 .../pptx/slide-level-0/h1-with-image/templated.pptx | Bin 57306 -> 57306 bytes
 .../h2-with-image/deleted-layouts.pptx              | Bin 47119 -> 47118 bytes
 .../slide-level-0/h2-with-image/moved-layouts.pptx  | Bin 57805 -> 57804 bytes
 test/pptx/slide-level-0/h2-with-image/output.pptx   | Bin 44247 -> 44245 bytes
 .../pptx/slide-level-0/h2-with-image/templated.pptx | Bin 57306 -> 57306 bytes
 .../deleted-layouts.pptx                            | Bin 34500 -> 34504 bytes
 .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45189 -> 45193 bytes
 test/pptx/speaker-notes-after-metadata/output.pptx  | Bin 31632 -> 31634 bytes
 .../speaker-notes-after-metadata/templated.pptx     | Bin 44685 -> 44690 bytes
 .../speaker-notes-afterheader/deleted-layouts.pptx  | Bin 33524 -> 33532 bytes
 .../speaker-notes-afterheader/moved-layouts.pptx    | Bin 44212 -> 44220 bytes
 test/pptx/speaker-notes-afterheader/output.pptx     | Bin 30646 -> 30653 bytes
 test/pptx/speaker-notes-afterheader/templated.pptx  | Bin 43710 -> 43719 bytes
 .../speaker-notes-afterseps/deleted-layouts.pptx    | Bin 54414 -> 54429 bytes
 .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65104 -> 65119 bytes
 test/pptx/speaker-notes-afterseps/output.pptx       | Bin 51534 -> 51548 bytes
 test/pptx/speaker-notes-afterseps/templated.pptx    | Bin 64598 -> 64614 bytes
 test/pptx/speaker-notes/deleted-layouts.pptx        | Bin 38227 -> 38236 bytes
 test/pptx/speaker-notes/moved-layouts.pptx          | Bin 48920 -> 48929 bytes
 test/pptx/speaker-notes/output.pptx                 | Bin 35350 -> 35358 bytes
 test/pptx/speaker-notes/templated.pptx              | Bin 48413 -> 48423 bytes
 test/pptx/start-numbering-at/deleted-layouts.pptx   | Bin 31517 -> 31521 bytes
 test/pptx/start-numbering-at/moved-layouts.pptx     | Bin 42205 -> 42209 bytes
 test/pptx/start-numbering-at/output.pptx            | Bin 28640 -> 28643 bytes
 test/pptx/start-numbering-at/templated.pptx         | Bin 41706 -> 41709 bytes
 test/pptx/tables/deleted-layouts.pptx               | Bin 32059 -> 32065 bytes
 test/pptx/tables/moved-layouts.pptx                 | Bin 42747 -> 42753 bytes
 test/pptx/tables/output.pptx                        | Bin 29179 -> 29184 bytes
 test/pptx/tables/templated.pptx                     | Bin 42248 -> 42253 bytes
 test/pptx/two-column/all-text/deleted-layouts.pptx  | Bin 30569 -> 30568 bytes
 test/pptx/two-column/all-text/moved-layouts.pptx    | Bin 41257 -> 41256 bytes
 test/pptx/two-column/all-text/output.pptx           | Bin 27691 -> 27689 bytes
 test/pptx/two-column/all-text/templated.pptx        | Bin 40758 -> 40756 bytes
 .../two-column/text-and-image/deleted-layouts.pptx  | Bin 48389 -> 48392 bytes
 .../two-column/text-and-image/moved-layouts.pptx    | Bin 59084 -> 59086 bytes
 test/pptx/two-column/text-and-image/output.pptx     | Bin 45518 -> 45520 bytes
 test/pptx/two-column/text-and-image/templated.pptx  | Bin 58585 -> 58586 bytes
 137 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index 1680bc7ac..e3d31d099 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -348,15 +348,7 @@ instance Default PicProps where
 --------------------------------------------------
 
 inlinesToParElems :: [Inline] -> Pres [ParaElem]
-inlinesToParElems = concatMapM inlineToParElems . consolidateStrs
- where
-  -- we combine Str + Space combinations, because this makes
-  -- the resulting ooxml much more compact, with fewer independent
-  -- text run elements
-  consolidateStrs [] = []
-  consolidateStrs (Str t : Space : ils) = consolidateStrs (Str (t <> " ") : ils)
-  consolidateStrs (Space : Str t : ils) = consolidateStrs (Str (" " <> t) : ils)
-  consolidateStrs (il : ils) = il : consolidateStrs ils
+inlinesToParElems ils = concatMapM inlineToParElems ils
 
 inlineToParElems :: Inline -> Pres [ParaElem]
 inlineToParElems (Str s) = do
diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx
index 41f13db87..05d4104b7 100644
Binary files a/test/pptx/background-image/deleted-layouts.pptx and b/test/pptx/background-image/deleted-layouts.pptx differ
diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx
index ca7a8a9d5..73b69e1d6 100644
Binary files a/test/pptx/background-image/moved-layouts.pptx and b/test/pptx/background-image/moved-layouts.pptx differ
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
index f3c2c7606..9738eefb8 100644
Binary files a/test/pptx/background-image/output.pptx and b/test/pptx/background-image/output.pptx differ
diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx
index 442fe3bdd..52d304957 100644
Binary files a/test/pptx/background-image/templated.pptx and b/test/pptx/background-image/templated.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
index 3dcc1d444..5038f2aaf 100644
Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
index c63d94774..90353a560 100644
Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
index 9377013a0..799c0f14a 100644
Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx
index ed65b8f32..5e3afb5f8 100644
Binary files a/test/pptx/blanks/just-speaker-notes/templated.pptx and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
index 650da51db..7716e1cbf 100644
Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
index 45cf168a9..3dc6c817e 100644
Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
index 57c6e3b6e..1df3f9574 100644
Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx
index 8cc5d053a..1cf58a1bb 100644
Binary files a/test/pptx/blanks/nbsp-in-body/templated.pptx and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
index 8b1d0a37b..7716e1cbf 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
index 45cf168a9..3dc6c817e 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
index 57c6e3b6e..e528091d7 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx
index 8cc5d053a..1f2d91399 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/templated.pptx and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ
diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
index 04e6dadd1..b49cd4896 100644
Binary files a/test/pptx/code-custom/deleted-layouts.pptx and b/test/pptx/code-custom/deleted-layouts.pptx differ
diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
index caacdab47..c6806f37f 100644
Binary files a/test/pptx/code-custom/moved-layouts.pptx and b/test/pptx/code-custom/moved-layouts.pptx differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index f5aa05b41..a72bebbe2 100644
Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx
index 160f85bdf..2bdb526fa 100644
Binary files a/test/pptx/code-custom/templated.pptx and b/test/pptx/code-custom/templated.pptx differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
index bbfabede2..df7814599 100644
Binary files a/test/pptx/code/deleted-layouts.pptx and b/test/pptx/code/deleted-layouts.pptx differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
index 7950abbad..71e8560bd 100644
Binary files a/test/pptx/code/moved-layouts.pptx and b/test/pptx/code/moved-layouts.pptx differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index ce08a9c64..4b70df2c7 100644
Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx
index 2a37db25a..1285a9273 100644
Binary files a/test/pptx/code/templated.pptx and b/test/pptx/code/templated.pptx differ
diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx
index 03ee6c408..27f9d9ac7 100644
Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx
index bb5f046fd..a658045ef 100644
Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
index 345833b8b..560c7d41a 100644
Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ
diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx
index 3dcc6274f..2fb38880d 100644
Binary files a/test/pptx/comparison/both-columns/templated.pptx and b/test/pptx/comparison/both-columns/templated.pptx differ
diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx
index 0ad383194..267c7cb69 100644
Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx
index 30bf2450b..b7023026c 100644
Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
index 464a07d88..06d632ee7 100644
Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ
diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx
index 771b16cda..af84388c4 100644
Binary files a/test/pptx/comparison/extra-image/templated.pptx and b/test/pptx/comparison/extra-image/templated.pptx differ
diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx
index 03ee6c408..27f9d9ac7 100644
Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx
index 2541e97d3..a658045ef 100644
Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
index 345833b8b..560c7d41a 100644
Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ
diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx
index 8d78e715a..2fb38880d 100644
Binary files a/test/pptx/comparison/extra-text/templated.pptx and b/test/pptx/comparison/extra-text/templated.pptx differ
diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx
index d2fab6c94..be30d8368 100644
Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx
index 16d59be78..c4879b7d5 100644
Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
index 5f5d12d2f..099cf6729 100644
Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ
diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx
index 520021af3..31ac01f18 100644
Binary files a/test/pptx/comparison/non-text-first/templated.pptx and b/test/pptx/comparison/non-text-first/templated.pptx differ
diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx
index 5a31c333a..27620f05f 100644
Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx
index cce84cc9f..fc64d3af5 100644
Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and b/test/pptx/comparison/one-column/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
index cc690844f..854a968af 100644
Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ
diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx
index 309a25d6e..9e671af1d 100644
Binary files a/test/pptx/comparison/one-column/templated.pptx and b/test/pptx/comparison/one-column/templated.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
index 1a94474ea..3cd09a916 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
index 32d76ca3d..8e76bc94c 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
index aea085efc..5c680e878 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx
index 07becc7f8..bdde384a4 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/templated.pptx and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
index 4e834f056..376880b41 100644
Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx
index 44a689c30..9e33d3163 100644
Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and b/test/pptx/content-with-caption/image-text/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
index e1595c428..c88030b94 100644
Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx
index 58264a92d..a22e9ae3e 100644
Binary files a/test/pptx/content-with-caption/image-text/templated.pptx and b/test/pptx/content-with-caption/image-text/templated.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
index e548a7798..2dcb8b78e 100644
Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx
index ca0e74a18..7d187a168 100644
Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
index 3fdf9ea07..751121cf2 100644
Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx
index bd96bd723..4f0aaaa7a 100644
Binary files a/test/pptx/content-with-caption/text-image/templated.pptx and b/test/pptx/content-with-caption/text-image/templated.pptx differ
diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
index f8903bbd4..79517481a 100644
Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
index 59674d5dd..51608c2e9 100644
Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and b/test/pptx/document-properties-short-desc/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
index 2c1ef0faa..02c241b89 100644
Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ
diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
index 3e004942c..82ccc072c 100644
Binary files a/test/pptx/document-properties-short-desc/templated.pptx and b/test/pptx/document-properties-short-desc/templated.pptx differ
diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
index 229cfc5a7..12f6570cf 100644
Binary files a/test/pptx/document-properties/deleted-layouts.pptx and b/test/pptx/document-properties/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
index 18d35eb26..9a9d4ac3e 100644
Binary files a/test/pptx/document-properties/moved-layouts.pptx and b/test/pptx/document-properties/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
index 51f7a5116..cfd3261bc 100644
Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ
diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx
index 6e37cd4a1..3d52d22df 100644
Binary files a/test/pptx/document-properties/templated.pptx and b/test/pptx/document-properties/templated.pptx differ
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
index 8a2595016..db8814418 100644
Binary files a/test/pptx/footer/basic/output.pptx and b/test/pptx/footer/basic/output.pptx differ
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
index b6857e8cf..85854a744 100644
Binary files a/test/pptx/footer/fixed-date/output.pptx and b/test/pptx/footer/fixed-date/output.pptx differ
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
index 1e3bfc5aa..c5bc3d047 100644
Binary files a/test/pptx/footer/higher-slide-number/output.pptx and b/test/pptx/footer/higher-slide-number/output.pptx differ
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
index a36a80406..d1475bf1f 100644
Binary files a/test/pptx/footer/no-title-slide/output.pptx and b/test/pptx/footer/no-title-slide/output.pptx differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
index 5da21f29c..9f0f41c37 100644
Binary files a/test/pptx/images/deleted-layouts.pptx and b/test/pptx/images/deleted-layouts.pptx differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
index a394237ca..f26ac9e8f 100644
Binary files a/test/pptx/images/moved-layouts.pptx and b/test/pptx/images/moved-layouts.pptx differ
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
index 0c4a774b1..993209a45 100644
Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ
diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx
index 9bb4567cf..06b337538 100644
Binary files a/test/pptx/images/templated.pptx and b/test/pptx/images/templated.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
index 180ac47b7..5a74826a4 100644
Binary files a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
index 1b6fc81b2..f20dd2906 100644
Binary files a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
index 2cfffc0e9..d4f76f1e7 100644
Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
index 7d9292f5c..f5ee2ff5f 100644
Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
index 6d68aafef..16bd85ffd 100644
Binary files a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
index 5bb33a6b4..054fe918e 100644
Binary files a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
index 4afae23d9..1b326461d 100644
Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
index 62b0ab802..dee6e9b06 100644
Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
index d8fd26264..1670eada1 100644
Binary files a/test/pptx/lists/deleted-layouts.pptx and b/test/pptx/lists/deleted-layouts.pptx differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
index 30319c6b8..f7590c5f9 100644
Binary files a/test/pptx/lists/moved-layouts.pptx and b/test/pptx/lists/moved-layouts.pptx differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index 7a7c9488b..95510e92e 100644
Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 9cece3499..7af437bfe 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx 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
index 5f672b9d8..334fdea9c 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx 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
index 159a8bb0f..3faabfd93 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index f1c8c8f46..96b9907cc 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
index 7baaf5791..9f23f1d9f 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/templated.pptx and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ
diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
index cd0372c89..0492ee2ec 100644
Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
index dc94f201b..f3e56652c 100644
Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and b/test/pptx/slide-breaks-toc/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index c9df30e6b..b3063b15e 100644
Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
index 36ae13623..bcb2f8276 100644
Binary files a/test/pptx/slide-breaks-toc/templated.pptx and b/test/pptx/slide-breaks-toc/templated.pptx differ
diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
index b6cd32a04..827c7dfda 100644
Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and b/test/pptx/slide-breaks/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
index 48c50a709..241605754 100644
Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and b/test/pptx/slide-breaks/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
index 30c3c1a8e..55c09a80e 100644
Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ
diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx
index 84581a358..f60f7da06 100644
Binary files a/test/pptx/slide-breaks/templated.pptx and b/test/pptx/slide-breaks/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
index 8903ff6fa..7bc7cfeee 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
index 65491db8c..602df1c77 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index bdada1cad..f725760dc 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
index e1c85d948..b203ff671 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/templated.pptx and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
index 8903ff6fa..7bc7cfeee 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
index 65491db8c..602df1c77 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
index bdada1cad..f725760dc 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx
index e1c85d948..b203ff671 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/templated.pptx and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
index 30bd36e5d..9010ba04a 100644
Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
index b05079ef2..ca53605b7 100644
Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index 41e3148cb..607115858 100644
Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx
index 9cdc0ef9f..3be3ed0af 100644
Binary files a/test/pptx/speaker-notes-after-metadata/templated.pptx and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
index 54de85128..2c2a0936b 100644
Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
index 4e4a854e5..a9c8bfa0a 100644
Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index 96b136ef9..ff403aa1c 100644
Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx
index abdc71ebc..15435c45a 100644
Binary files a/test/pptx/speaker-notes-afterheader/templated.pptx and b/test/pptx/speaker-notes-afterheader/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
index 99e499f4d..f6abb0b27 100644
Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
index 49f7360c7..6a770fc75 100644
Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 3a426d29a..7e56147f1 100644
Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
index 8e26e7581..3184ff74e 100644
Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ
diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
index a8014c666..5429b88e0 100644
Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
index be5c383c3..13e34698d 100644
Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and b/test/pptx/speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
index 0fe2b7783..74041a40d 100644
Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ
diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx
index 70e1a2c88..80a3e3dea 100644
Binary files a/test/pptx/speaker-notes/templated.pptx and b/test/pptx/speaker-notes/templated.pptx differ
diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
index 8692da129..7bfe9868f 100644
Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
index 7e1a68a0d..0100365ec 100644
Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and b/test/pptx/start-numbering-at/moved-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index 95a0c8ef4..3ba9a236a 100644
Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index b4302f6d5..8a144d601 100644
Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
index ebad0c49b..163d4ca5e 100644
Binary files a/test/pptx/tables/deleted-layouts.pptx and b/test/pptx/tables/deleted-layouts.pptx differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
index 2ad4646a6..1b0e606da 100644
Binary files a/test/pptx/tables/moved-layouts.pptx and b/test/pptx/tables/moved-layouts.pptx differ
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
index 81f7a21c1..1c89d8032 100644
Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ
diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx
index 538bec0fb..5755bfe9d 100644
Binary files a/test/pptx/tables/templated.pptx and b/test/pptx/tables/templated.pptx differ
diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx
index 58400da56..1d7bd87d3 100644
Binary files a/test/pptx/two-column/all-text/deleted-layouts.pptx and b/test/pptx/two-column/all-text/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx
index 7e94ede93..71760268c 100644
Binary files a/test/pptx/two-column/all-text/moved-layouts.pptx and b/test/pptx/two-column/all-text/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx
index f5d871c53..396dc2a74 100644
Binary files a/test/pptx/two-column/all-text/output.pptx and b/test/pptx/two-column/all-text/output.pptx differ
diff --git a/test/pptx/two-column/all-text/templated.pptx b/test/pptx/two-column/all-text/templated.pptx
index d5f563006..8901695b1 100644
Binary files a/test/pptx/two-column/all-text/templated.pptx and b/test/pptx/two-column/all-text/templated.pptx differ
diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx
index 43ced4431..297fd6bad 100644
Binary files a/test/pptx/two-column/text-and-image/deleted-layouts.pptx and b/test/pptx/two-column/text-and-image/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx
index 231723f10..c9a6e577e 100644
Binary files a/test/pptx/two-column/text-and-image/moved-layouts.pptx and b/test/pptx/two-column/text-and-image/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
index bb6af0d74..bfd532ed9 100644
Binary files a/test/pptx/two-column/text-and-image/output.pptx and b/test/pptx/two-column/text-and-image/output.pptx differ
diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx
index 4014b0bf1..23e6b283f 100644
Binary files a/test/pptx/two-column/text-and-image/templated.pptx and b/test/pptx/two-column/text-and-image/templated.pptx differ
-- 
cgit v1.2.3


From b8d460eeabe97756d49e4bc5f00c6bb084b69aa5 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 4 Oct 2021 12:18:18 -0700
Subject: Powerpoint writer: consolidate text runs when possible.

This slims down the output files by avoiding unnecessary
text run elements.

Updated golden tests.
---
 src/Text/Pandoc/Writers/Powerpoint/Output.hs        |  11 ++++++++---
 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs  |   2 +-
 test/pptx/background-image/deleted-layouts.pptx     | Bin 56282 -> 56230 bytes
 test/pptx/background-image/moved-layouts.pptx       | Bin 66987 -> 66932 bytes
 test/pptx/background-image/output.pptx              | Bin 53408 -> 53358 bytes
 test/pptx/background-image/templated.pptx           | Bin 66487 -> 66433 bytes
 .../blanks/just-speaker-notes/deleted-layouts.pptx  | Bin 35178 -> 35147 bytes
 .../blanks/just-speaker-notes/moved-layouts.pptx    | Bin 45870 -> 45837 bytes
 test/pptx/blanks/just-speaker-notes/output.pptx     | Bin 32297 -> 32267 bytes
 test/pptx/blanks/just-speaker-notes/templated.pptx  | Bin 45365 -> 45333 bytes
 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx  | Bin 32092 -> 32085 bytes
 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx    | Bin 42780 -> 42772 bytes
 test/pptx/blanks/nbsp-in-body/output.pptx           | Bin 29211 -> 29205 bytes
 test/pptx/blanks/nbsp-in-body/templated.pptx        | Bin 42280 -> 42273 bytes
 .../blanks/nbsp-in-heading/deleted-layouts.pptx     | Bin 32092 -> 32085 bytes
 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 42780 -> 42772 bytes
 test/pptx/blanks/nbsp-in-heading/output.pptx        | Bin 29211 -> 29205 bytes
 test/pptx/blanks/nbsp-in-heading/templated.pptx     | Bin 42280 -> 42273 bytes
 test/pptx/code-custom/deleted-layouts.pptx          | Bin 32717 -> 32697 bytes
 test/pptx/code-custom/moved-layouts.pptx            | Bin 43405 -> 43385 bytes
 test/pptx/code-custom/output.pptx                   | Bin 29836 -> 29817 bytes
 test/pptx/code-custom/templated.pptx                | Bin 42905 -> 42884 bytes
 test/pptx/code/deleted-layouts.pptx                 | Bin 32716 -> 32695 bytes
 test/pptx/code/moved-layouts.pptx                   | Bin 43405 -> 43383 bytes
 test/pptx/code/output.pptx                          | Bin 29835 -> 29815 bytes
 test/pptx/code/templated.pptx                       | Bin 42905 -> 42882 bytes
 .../comparison/both-columns/deleted-layouts.pptx    | Bin 47453 -> 47441 bytes
 .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 58172 -> 58159 bytes
 test/pptx/comparison/both-columns/output.pptx       | Bin 44581 -> 44570 bytes
 test/pptx/comparison/both-columns/templated.pptx    | Bin 57674 -> 57662 bytes
 .../comparison/extra-image/deleted-layouts.pptx     | Bin 47482 -> 47470 bytes
 test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 58200 -> 58185 bytes
 test/pptx/comparison/extra-image/output.pptx        | Bin 44610 -> 44599 bytes
 test/pptx/comparison/extra-image/templated.pptx     | Bin 57702 -> 57688 bytes
 .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 47453 -> 47441 bytes
 test/pptx/comparison/extra-text/moved-layouts.pptx  | Bin 58172 -> 58159 bytes
 test/pptx/comparison/extra-text/output.pptx         | Bin 44581 -> 44570 bytes
 test/pptx/comparison/extra-text/templated.pptx      | Bin 57674 -> 57662 bytes
 .../comparison/non-text-first/deleted-layouts.pptx  | Bin 47366 -> 47355 bytes
 .../comparison/non-text-first/moved-layouts.pptx    | Bin 58065 -> 58050 bytes
 test/pptx/comparison/non-text-first/output.pptx     | Bin 44494 -> 44484 bytes
 test/pptx/comparison/non-text-first/templated.pptx  | Bin 57567 -> 57553 bytes
 .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 30785 -> 30780 bytes
 test/pptx/comparison/one-column/moved-layouts.pptx  | Bin 41506 -> 41499 bytes
 test/pptx/comparison/one-column/output.pptx         | Bin 27906 -> 27902 bytes
 test/pptx/comparison/one-column/templated.pptx      | Bin 41006 -> 41000 bytes
 .../heading-text-image/deleted-layouts.pptx         | Bin 47198 -> 47189 bytes
 .../heading-text-image/moved-layouts.pptx           | Bin 57896 -> 57887 bytes
 .../heading-text-image/output.pptx                  | Bin 44326 -> 44318 bytes
 .../heading-text-image/templated.pptx               | Bin 57398 -> 57390 bytes
 .../image-text/deleted-layouts.pptx                 | Bin 47896 -> 47891 bytes
 .../image-text/moved-layouts.pptx                   | Bin 58584 -> 58578 bytes
 .../content-with-caption/image-text/output.pptx     | Bin 45022 -> 45019 bytes
 .../content-with-caption/image-text/templated.pptx  | Bin 58084 -> 58079 bytes
 .../text-image/deleted-layouts.pptx                 | Bin 47137 -> 47129 bytes
 .../text-image/moved-layouts.pptx                   | Bin 57836 -> 57827 bytes
 .../content-with-caption/text-image/output.pptx     | Bin 44265 -> 44258 bytes
 .../content-with-caption/text-image/templated.pptx  | Bin 57338 -> 57330 bytes
 .../deleted-layouts.pptx                            | Bin 31490 -> 31483 bytes
 .../moved-layouts.pptx                              | Bin 42178 -> 42171 bytes
 .../pptx/document-properties-short-desc/output.pptx | Bin 28619 -> 28613 bytes
 .../document-properties-short-desc/templated.pptx   | Bin 41678 -> 41671 bytes
 test/pptx/document-properties/deleted-layouts.pptx  | Bin 31894 -> 31886 bytes
 test/pptx/document-properties/moved-layouts.pptx    | Bin 42582 -> 42573 bytes
 test/pptx/document-properties/output.pptx           | Bin 29025 -> 29015 bytes
 test/pptx/document-properties/templated.pptx        | Bin 42082 -> 42073 bytes
 test/pptx/footer/basic/output.pptx                  | Bin 52775 -> 52727 bytes
 test/pptx/footer/fixed-date/output.pptx             | Bin 51397 -> 51354 bytes
 test/pptx/footer/higher-slide-number/output.pptx    | Bin 52790 -> 52740 bytes
 test/pptx/footer/no-title-slide/output.pptx         | Bin 52362 -> 52314 bytes
 test/pptx/images/deleted-layouts.pptx               | Bin 49121 -> 49113 bytes
 test/pptx/images/moved-layouts.pptx                 | Bin 59809 -> 59801 bytes
 test/pptx/images/output.pptx                        | Bin 46244 -> 46235 bytes
 test/pptx/images/templated.pptx                     | Bin 59308 -> 59299 bytes
 .../with-flag/deleted-layouts.pptx                  | Bin 80172 -> 80042 bytes
 .../incremental-lists/with-flag/moved-layouts.pptx  | Bin 90917 -> 90782 bytes
 test/pptx/incremental-lists/with-flag/output.pptx   | Bin 77298 -> 77169 bytes
 .../pptx/incremental-lists/with-flag/templated.pptx | Bin 90414 -> 90280 bytes
 .../without-flag/deleted-layouts.pptx               | Bin 78405 -> 78282 bytes
 .../without-flag/moved-layouts.pptx                 | Bin 89148 -> 89020 bytes
 .../pptx/incremental-lists/without-flag/output.pptx | Bin 75533 -> 75411 bytes
 .../incremental-lists/without-flag/templated.pptx   | Bin 88645 -> 88518 bytes
 test/pptx/lists/deleted-layouts.pptx                | Bin 31545 -> 31540 bytes
 test/pptx/lists/moved-layouts.pptx                  | Bin 42233 -> 42230 bytes
 test/pptx/lists/output.pptx                         | Bin 28667 -> 28664 bytes
 test/pptx/lists/templated.pptx                      | Bin 41733 -> 41729 bytes
 .../slide-breaks-slide-level-1/deleted-layouts.pptx | Bin 32238 -> 32233 bytes
 .../slide-breaks-slide-level-1/moved-layouts.pptx   | Bin 42926 -> 42923 bytes
 test/pptx/slide-breaks-slide-level-1/output.pptx    | Bin 29357 -> 29354 bytes
 test/pptx/slide-breaks-slide-level-1/templated.pptx | Bin 42426 -> 42422 bytes
 test/pptx/slide-breaks-toc/deleted-layouts.pptx     | Bin 34012 -> 34006 bytes
 test/pptx/slide-breaks-toc/moved-layouts.pptx       | Bin 44701 -> 44696 bytes
 test/pptx/slide-breaks-toc/output.pptx              | Bin 31133 -> 31129 bytes
 test/pptx/slide-breaks-toc/templated.pptx           | Bin 44201 -> 44195 bytes
 test/pptx/slide-breaks/deleted-layouts.pptx         | Bin 33062 -> 33056 bytes
 test/pptx/slide-breaks/moved-layouts.pptx           | Bin 43751 -> 43746 bytes
 test/pptx/slide-breaks/output.pptx                  | Bin 30183 -> 30179 bytes
 test/pptx/slide-breaks/templated.pptx               | Bin 43250 -> 43244 bytes
 .../h1-with-image/deleted-layouts.pptx              | Bin 47118 -> 47114 bytes
 .../slide-level-0/h1-with-image/moved-layouts.pptx  | Bin 57804 -> 57800 bytes
 test/pptx/slide-level-0/h1-with-image/output.pptx   | Bin 44245 -> 44242 bytes
 .../pptx/slide-level-0/h1-with-image/templated.pptx | Bin 57306 -> 57302 bytes
 .../h2-with-image/deleted-layouts.pptx              | Bin 47118 -> 47114 bytes
 .../slide-level-0/h2-with-image/moved-layouts.pptx  | Bin 57804 -> 57800 bytes
 test/pptx/slide-level-0/h2-with-image/output.pptx   | Bin 44245 -> 44242 bytes
 .../pptx/slide-level-0/h2-with-image/templated.pptx | Bin 57306 -> 57302 bytes
 .../deleted-layouts.pptx                            | Bin 34504 -> 34486 bytes
 .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45193 -> 45176 bytes
 test/pptx/speaker-notes-after-metadata/output.pptx  | Bin 31634 -> 31617 bytes
 .../speaker-notes-after-metadata/templated.pptx     | Bin 44690 -> 44673 bytes
 .../speaker-notes-afterheader/deleted-layouts.pptx  | Bin 33532 -> 33507 bytes
 .../speaker-notes-afterheader/moved-layouts.pptx    | Bin 44220 -> 44195 bytes
 test/pptx/speaker-notes-afterheader/output.pptx     | Bin 30653 -> 30629 bytes
 test/pptx/speaker-notes-afterheader/templated.pptx  | Bin 43719 -> 43693 bytes
 .../speaker-notes-afterseps/deleted-layouts.pptx    | Bin 54429 -> 54374 bytes
 .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65119 -> 65064 bytes
 test/pptx/speaker-notes-afterseps/output.pptx       | Bin 51548 -> 51494 bytes
 test/pptx/speaker-notes-afterseps/templated.pptx    | Bin 64614 -> 64558 bytes
 test/pptx/speaker-notes/deleted-layouts.pptx        | Bin 38236 -> 38206 bytes
 test/pptx/speaker-notes/moved-layouts.pptx          | Bin 48929 -> 48899 bytes
 test/pptx/speaker-notes/output.pptx                 | Bin 35358 -> 35329 bytes
 test/pptx/speaker-notes/templated.pptx              | Bin 48423 -> 48392 bytes
 test/pptx/start-numbering-at/deleted-layouts.pptx   | Bin 31521 -> 31502 bytes
 test/pptx/start-numbering-at/moved-layouts.pptx     | Bin 42209 -> 42192 bytes
 test/pptx/start-numbering-at/output.pptx            | Bin 28643 -> 28626 bytes
 test/pptx/start-numbering-at/templated.pptx         | Bin 41709 -> 41691 bytes
 test/pptx/tables/deleted-layouts.pptx               | Bin 32065 -> 32040 bytes
 test/pptx/tables/moved-layouts.pptx                 | Bin 42753 -> 42729 bytes
 test/pptx/tables/output.pptx                        | Bin 29184 -> 29160 bytes
 test/pptx/tables/templated.pptx                     | Bin 42253 -> 42228 bytes
 test/pptx/two-column/all-text/deleted-layouts.pptx  | Bin 30568 -> 30567 bytes
 test/pptx/two-column/all-text/moved-layouts.pptx    | Bin 41256 -> 41255 bytes
 test/pptx/two-column/all-text/output.pptx           | Bin 27689 -> 27689 bytes
 test/pptx/two-column/all-text/templated.pptx        | Bin 40756 -> 40754 bytes
 .../two-column/text-and-image/deleted-layouts.pptx  | Bin 48392 -> 48381 bytes
 .../two-column/text-and-image/moved-layouts.pptx    | Bin 59086 -> 59075 bytes
 test/pptx/two-column/text-and-image/output.pptx     | Bin 45520 -> 45510 bytes
 test/pptx/two-column/text-and-image/templated.pptx  | Bin 58586 -> 58574 bytes
 138 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
index f4700e8c1..42ce780fa 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -1088,6 +1088,12 @@ makePicElements layout picProps mInfo titleText alt = do
             return [picShape, cap]
     else return [picShape]
 
+consolidateRuns :: [ParaElem] -> [ParaElem]
+consolidateRuns [] = []
+consolidateRuns (Run pr1 s1 : Run pr2 s2 : xs)
+  | pr1 == pr2 = consolidateRuns (Run pr1 (s1 <> s2) : xs)
+consolidateRuns (x:xs) = x : consolidateRuns xs
+
 
 paraElemToElements :: PandocMonad m => ParaElem -> P m [Content]
 paraElemToElements Break = return [Elem $ mknode "a:br" [] ()]
@@ -1223,9 +1229,8 @@ paragraphToElement par = do
                  [mknode "a:buAutoNum" (autoNumAttrs attrs') ()]
                Nothing -> [mknode "a:buNone" [] ()]
             )
-  paras <- mapM paraElemToElements (paraElems par)
-  return $ mknode "a:p" [] $
-    [Elem $ mknode "a:pPr" attrs props] <> concat paras
+  paras <- mconcat <$> mapM paraElemToElements (consolidateRuns (paraElems par))
+  return $ mknode "a:p" [] $ [Elem $ mknode "a:pPr" attrs props] <> paras
 
 shapeToElement :: PandocMonad m => Element -> Shape -> P m (Maybe ShapeId, Element)
 shapeToElement layout (TextBox paras)
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index e3d31d099..99b016a63 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -348,7 +348,7 @@ instance Default PicProps where
 --------------------------------------------------
 
 inlinesToParElems :: [Inline] -> Pres [ParaElem]
-inlinesToParElems ils = concatMapM inlineToParElems ils
+inlinesToParElems = concatMapM inlineToParElems
 
 inlineToParElems :: Inline -> Pres [ParaElem]
 inlineToParElems (Str s) = do
diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx
index 05d4104b7..e46a58ad7 100644
Binary files a/test/pptx/background-image/deleted-layouts.pptx and b/test/pptx/background-image/deleted-layouts.pptx differ
diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx
index 73b69e1d6..98fe33095 100644
Binary files a/test/pptx/background-image/moved-layouts.pptx and b/test/pptx/background-image/moved-layouts.pptx differ
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
index 9738eefb8..abe82ebc2 100644
Binary files a/test/pptx/background-image/output.pptx and b/test/pptx/background-image/output.pptx differ
diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx
index 52d304957..0f2879022 100644
Binary files a/test/pptx/background-image/templated.pptx and b/test/pptx/background-image/templated.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
index 5038f2aaf..f729c3ce6 100644
Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
index 90353a560..dfae6a645 100644
Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
index 799c0f14a..0c4ed20fa 100644
Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx
index 5e3afb5f8..f9eca6f8c 100644
Binary files a/test/pptx/blanks/just-speaker-notes/templated.pptx and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
index 7716e1cbf..dcd88cb24 100644
Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
index 3dc6c817e..0a69853fa 100644
Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
index 1df3f9574..6265c842f 100644
Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx
index 1cf58a1bb..758502dd0 100644
Binary files a/test/pptx/blanks/nbsp-in-body/templated.pptx and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
index 7716e1cbf..dcd88cb24 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
index 3dc6c817e..0a69853fa 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
index e528091d7..6265c842f 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx
index 1f2d91399..758502dd0 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/templated.pptx and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ
diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
index b49cd4896..f8b1c789e 100644
Binary files a/test/pptx/code-custom/deleted-layouts.pptx and b/test/pptx/code-custom/deleted-layouts.pptx differ
diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
index c6806f37f..810b46dd1 100644
Binary files a/test/pptx/code-custom/moved-layouts.pptx and b/test/pptx/code-custom/moved-layouts.pptx differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index a72bebbe2..ded8f1125 100644
Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx
index 2bdb526fa..8bb0df1ff 100644
Binary files a/test/pptx/code-custom/templated.pptx and b/test/pptx/code-custom/templated.pptx differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
index df7814599..3127e20e5 100644
Binary files a/test/pptx/code/deleted-layouts.pptx and b/test/pptx/code/deleted-layouts.pptx differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
index 71e8560bd..7a2e3b7ac 100644
Binary files a/test/pptx/code/moved-layouts.pptx and b/test/pptx/code/moved-layouts.pptx differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index 4b70df2c7..e700bc268 100644
Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx
index 1285a9273..44f34cd64 100644
Binary files a/test/pptx/code/templated.pptx and b/test/pptx/code/templated.pptx differ
diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx
index 27f9d9ac7..6d80e275f 100644
Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx
index a658045ef..2840e0535 100644
Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
index 560c7d41a..47f807754 100644
Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ
diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx
index 2fb38880d..945bc6dc4 100644
Binary files a/test/pptx/comparison/both-columns/templated.pptx and b/test/pptx/comparison/both-columns/templated.pptx differ
diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx
index 267c7cb69..771ad409a 100644
Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx
index b7023026c..2418e98c1 100644
Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
index 06d632ee7..f700e09a8 100644
Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ
diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx
index af84388c4..2e48ffe87 100644
Binary files a/test/pptx/comparison/extra-image/templated.pptx and b/test/pptx/comparison/extra-image/templated.pptx differ
diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx
index 27f9d9ac7..c87b3f3ee 100644
Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx
index a658045ef..2840e0535 100644
Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
index 560c7d41a..47f807754 100644
Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ
diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx
index 2fb38880d..debb62d52 100644
Binary files a/test/pptx/comparison/extra-text/templated.pptx and b/test/pptx/comparison/extra-text/templated.pptx differ
diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx
index be30d8368..95b2e3a3c 100644
Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx
index c4879b7d5..5a60028d4 100644
Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
index 099cf6729..c8a2bd0e3 100644
Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ
diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx
index 31ac01f18..a19b469b1 100644
Binary files a/test/pptx/comparison/non-text-first/templated.pptx and b/test/pptx/comparison/non-text-first/templated.pptx differ
diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx
index 27620f05f..6a705c735 100644
Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx
index fc64d3af5..f456151a5 100644
Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and b/test/pptx/comparison/one-column/moved-layouts.pptx differ
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
index 854a968af..e70dd2326 100644
Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ
diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx
index 9e671af1d..fa5c2dc87 100644
Binary files a/test/pptx/comparison/one-column/templated.pptx and b/test/pptx/comparison/one-column/templated.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
index 3cd09a916..d01a8f9d8 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
index 8e76bc94c..69cb830a9 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
index 5c680e878..0677879aa 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx
index bdde384a4..059d4f460 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/templated.pptx and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
index 376880b41..e9aebd579 100644
Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx
index 9e33d3163..c27f1e1cf 100644
Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and b/test/pptx/content-with-caption/image-text/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
index c88030b94..f461b6ed3 100644
Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx
index a22e9ae3e..a9c6aa43d 100644
Binary files a/test/pptx/content-with-caption/image-text/templated.pptx and b/test/pptx/content-with-caption/image-text/templated.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
index 2dcb8b78e..f15e674c7 100644
Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx
index 7d187a168..39566cd7f 100644
Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/text-image/moved-layouts.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
index 751121cf2..be376c1ed 100644
Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx
index 4f0aaaa7a..185314bf4 100644
Binary files a/test/pptx/content-with-caption/text-image/templated.pptx and b/test/pptx/content-with-caption/text-image/templated.pptx differ
diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
index 79517481a..a6da0c338 100644
Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
index 51608c2e9..4cff1d486 100644
Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and b/test/pptx/document-properties-short-desc/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
index 02c241b89..737ca7e8d 100644
Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ
diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
index 82ccc072c..4feccdac7 100644
Binary files a/test/pptx/document-properties-short-desc/templated.pptx and b/test/pptx/document-properties-short-desc/templated.pptx differ
diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
index 12f6570cf..a2a58af34 100644
Binary files a/test/pptx/document-properties/deleted-layouts.pptx and b/test/pptx/document-properties/deleted-layouts.pptx differ
diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
index 9a9d4ac3e..e24d904a2 100644
Binary files a/test/pptx/document-properties/moved-layouts.pptx and b/test/pptx/document-properties/moved-layouts.pptx differ
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
index cfd3261bc..ef05c01b5 100644
Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ
diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx
index 3d52d22df..df6acb70c 100644
Binary files a/test/pptx/document-properties/templated.pptx and b/test/pptx/document-properties/templated.pptx differ
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
index db8814418..2af46108c 100644
Binary files a/test/pptx/footer/basic/output.pptx and b/test/pptx/footer/basic/output.pptx differ
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
index 85854a744..678ecdb87 100644
Binary files a/test/pptx/footer/fixed-date/output.pptx and b/test/pptx/footer/fixed-date/output.pptx differ
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
index c5bc3d047..651491107 100644
Binary files a/test/pptx/footer/higher-slide-number/output.pptx and b/test/pptx/footer/higher-slide-number/output.pptx differ
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
index d1475bf1f..c470cbb94 100644
Binary files a/test/pptx/footer/no-title-slide/output.pptx and b/test/pptx/footer/no-title-slide/output.pptx differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
index 9f0f41c37..3c3ed787f 100644
Binary files a/test/pptx/images/deleted-layouts.pptx and b/test/pptx/images/deleted-layouts.pptx differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
index f26ac9e8f..b22f3652a 100644
Binary files a/test/pptx/images/moved-layouts.pptx and b/test/pptx/images/moved-layouts.pptx differ
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
index 993209a45..9b04881f3 100644
Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ
diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx
index 06b337538..cad0b2f04 100644
Binary files a/test/pptx/images/templated.pptx and b/test/pptx/images/templated.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
index 5a74826a4..3e92d4dab 100644
Binary files a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
index f20dd2906..050842865 100644
Binary files a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
index d4f76f1e7..1ca1dbf17 100644
Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
index f5ee2ff5f..4ddf6bb75 100644
Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
index 16bd85ffd..4816c0b39 100644
Binary files a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx and b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
index 054fe918e..4f27db07b 100644
Binary files a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx and b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
index 1b326461d..6f7261ba3 100644
Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
index dee6e9b06..ca5c9fdab 100644
Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
index 1670eada1..d064b7fd5 100644
Binary files a/test/pptx/lists/deleted-layouts.pptx and b/test/pptx/lists/deleted-layouts.pptx differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
index f7590c5f9..8a9c9ec59 100644
Binary files a/test/pptx/lists/moved-layouts.pptx and b/test/pptx/lists/moved-layouts.pptx differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index 95510e92e..94a424f42 100644
Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 7af437bfe..52097489f 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx 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
index 334fdea9c..b6b004cd6 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx 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
index 3faabfd93..229e4c32a 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index 96b9907cc..cb65ab335 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
index 9f23f1d9f..ca2e844cc 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/templated.pptx and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ
diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
index 0492ee2ec..e3b3b2807 100644
Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
index f3e56652c..ecc942803 100644
Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and b/test/pptx/slide-breaks-toc/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index b3063b15e..788cdf148 100644
Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
index bcb2f8276..d11744079 100644
Binary files a/test/pptx/slide-breaks-toc/templated.pptx and b/test/pptx/slide-breaks-toc/templated.pptx differ
diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
index 827c7dfda..ada3453b0 100644
Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and b/test/pptx/slide-breaks/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
index 241605754..0fe10f443 100644
Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and b/test/pptx/slide-breaks/moved-layouts.pptx differ
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
index 55c09a80e..7c2c7db5e 100644
Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ
diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx
index f60f7da06..5bf186f4e 100644
Binary files a/test/pptx/slide-breaks/templated.pptx and b/test/pptx/slide-breaks/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
index 7bc7cfeee..478dde788 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
index 602df1c77..63b411888 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index f725760dc..70fc6aee2 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
index b203ff671..7a023480f 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/templated.pptx and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
index 7bc7cfeee..478dde788 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
index 602df1c77..63b411888 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
index f725760dc..70fc6aee2 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx
index b203ff671..7a023480f 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/templated.pptx and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
index 9010ba04a..07e21ef02 100644
Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
index ca53605b7..d6673aac0 100644
Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index 607115858..f68d6f0ef 100644
Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx
index 3be3ed0af..fd95c935e 100644
Binary files a/test/pptx/speaker-notes-after-metadata/templated.pptx and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
index 2c2a0936b..0ccdd72b7 100644
Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
index a9c8bfa0a..81f0a56cb 100644
Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index ff403aa1c..9df78756b 100644
Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx
index 15435c45a..b85f22961 100644
Binary files a/test/pptx/speaker-notes-afterheader/templated.pptx and b/test/pptx/speaker-notes-afterheader/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
index f6abb0b27..33dedf2c3 100644
Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
index 6a770fc75..28bcf3887 100644
Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 7e56147f1..99110d3ca 100644
Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
index 3184ff74e..daf8e2175 100644
Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ
diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
index 5429b88e0..5f407086a 100644
Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
index 13e34698d..83d5ed0af 100644
Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and b/test/pptx/speaker-notes/moved-layouts.pptx differ
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
index 74041a40d..6ae003d7a 100644
Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ
diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx
index 80a3e3dea..f35bf5d88 100644
Binary files a/test/pptx/speaker-notes/templated.pptx and b/test/pptx/speaker-notes/templated.pptx differ
diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
index 7bfe9868f..d99fedfa6 100644
Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
index 0100365ec..98db3ec74 100644
Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and b/test/pptx/start-numbering-at/moved-layouts.pptx differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index 3ba9a236a..bc74ec599 100644
Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index 8a144d601..4f191a06e 100644
Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
index 163d4ca5e..7ad714058 100644
Binary files a/test/pptx/tables/deleted-layouts.pptx and b/test/pptx/tables/deleted-layouts.pptx differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
index 1b0e606da..9628717d7 100644
Binary files a/test/pptx/tables/moved-layouts.pptx and b/test/pptx/tables/moved-layouts.pptx differ
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
index 1c89d8032..4398e35be 100644
Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ
diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx
index 5755bfe9d..7259e15dd 100644
Binary files a/test/pptx/tables/templated.pptx and b/test/pptx/tables/templated.pptx differ
diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx
index 1d7bd87d3..a321128b5 100644
Binary files a/test/pptx/two-column/all-text/deleted-layouts.pptx and b/test/pptx/two-column/all-text/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx
index 71760268c..90b1d9254 100644
Binary files a/test/pptx/two-column/all-text/moved-layouts.pptx and b/test/pptx/two-column/all-text/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx
index 396dc2a74..45f651ceb 100644
Binary files a/test/pptx/two-column/all-text/output.pptx and b/test/pptx/two-column/all-text/output.pptx differ
diff --git a/test/pptx/two-column/all-text/templated.pptx b/test/pptx/two-column/all-text/templated.pptx
index 8901695b1..01a3cdb0c 100644
Binary files a/test/pptx/two-column/all-text/templated.pptx and b/test/pptx/two-column/all-text/templated.pptx differ
diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx
index 297fd6bad..46274ffac 100644
Binary files a/test/pptx/two-column/text-and-image/deleted-layouts.pptx and b/test/pptx/two-column/text-and-image/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx
index c9a6e577e..c25331e23 100644
Binary files a/test/pptx/two-column/text-and-image/moved-layouts.pptx and b/test/pptx/two-column/text-and-image/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
index bfd532ed9..aab0b3b59 100644
Binary files a/test/pptx/two-column/text-and-image/output.pptx and b/test/pptx/two-column/text-and-image/output.pptx differ
diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx
index 23e6b283f..5cae9b43b 100644
Binary files a/test/pptx/two-column/text-and-image/templated.pptx and b/test/pptx/two-column/text-and-image/templated.pptx differ
-- 
cgit v1.2.3


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

When I added the tests for moved layouts and deleted layouts, I added
them to all tests. However, this doesn’t really give a lot more info
than having single tests, and the extra tests take up time and disk
space.

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

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index b2df80e5f..84bdd7476 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -7,7 +7,6 @@ import System.FilePath
 import Text.DocTemplates (ToContext(toVal), Context(..))
 import qualified Data.Map as M
 import Data.Text (pack)
-import Data.List (unzip4)
 
 -- templating is important enough, and can break enough things, that
 -- we want to run all our tests with both default formatting and a
@@ -17,11 +16,9 @@ modifyPptxName :: FilePath -> String -> FilePath
 modifyPptxName fp suffix =
   addExtension (takeDirectory fp ++ suffix) "pptx"
 
-pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree)
+pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree)
 pptxTests name opts native pptx =
   let referenceDoc = "pptx/reference-depth.pptx"
-      movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx"
-      deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx"
   in
     ( ooxmlTest
       writePowerpoint
@@ -35,28 +32,14 @@ pptxTests name opts native pptx =
       opts{writerReferenceDoc=Just referenceDoc}
       native
       (modifyPptxName pptx "/templated")
-    , ooxmlTest
-      writePowerpoint
-      name
-      opts{writerReferenceDoc=Just movedLayoutsReferenceDoc}
-      native
-      (modifyPptxName pptx "/moved-layouts")
-    , ooxmlTest
-      writePowerpoint
-      name
-      opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc}
-      native
-      (modifyPptxName pptx "/deleted-layouts")
     )
 
-groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree]
+groupPptxTests :: [(TestTree, TestTree)] -> [TestTree]
 groupPptxTests pairs =
-  let (noRefs, refs, movedLayouts, deletedLayouts) = unzip4 pairs
+  let (noRefs, refs) = unzip pairs
   in
     [ testGroup "Default slide formatting" noRefs
     , testGroup "With `--reference-doc` pptx file" refs
-    , testGroup "With layouts in reference doc moved" movedLayouts
-    , testGroup "With layouts in reference doc deleted" deletedLayouts
     ]
 
 
@@ -272,5 +255,17 @@ tests = let
       def { writerReferenceDoc = Just "pptx/footer/higher-slide-number/reference.pptx"}
       "pptx/footer/input.native"
       "pptx/footer/higher-slide-number/output.pptx"
+    , ooxmlTest
+      writePowerpoint
+      "Layouts can be moved around in reference doc"
+      def {writerReferenceDoc = Just "pptx/reference-moved-layouts.pptx"}
+      "pptx/layouts/input.native"
+      "pptx/layouts/moved.pptx"
+    , ooxmlTest
+      writePowerpoint
+      "Layouts can be missing from the reference doc"
+      def {writerReferenceDoc = Just "pptx/reference-deleted-layouts.pptx"}
+      "pptx/layouts/input.native"
+      "pptx/layouts/deleted.pptx"
     ]
   in regularTests <> referenceSpecificTests
diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx
deleted file mode 100644
index e46a58ad7..000000000
Binary files a/test/pptx/background-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx
deleted file mode 100644
index 98fe33095..000000000
Binary files a/test/pptx/background-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
deleted file mode 100644
index f729c3ce6..000000000
Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx
deleted file mode 100644
index dfae6a645..000000000
Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx
deleted file mode 100644
index dcd88cb24..000000000
Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx
deleted file mode 100644
index 0a69853fa..000000000
Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx
deleted file mode 100644
index dcd88cb24..000000000
Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx
deleted file mode 100644
index 0a69853fa..000000000
Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
deleted file mode 100644
index f8b1c789e..000000000
Binary files a/test/pptx/code-custom/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
deleted file mode 100644
index 810b46dd1..000000000
Binary files a/test/pptx/code-custom/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx
deleted file mode 100644
index 3127e20e5..000000000
Binary files a/test/pptx/code/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx
deleted file mode 100644
index 7a2e3b7ac..000000000
Binary files a/test/pptx/code/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx
deleted file mode 100644
index 6d80e275f..000000000
Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx
deleted file mode 100644
index 2840e0535..000000000
Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx
deleted file mode 100644
index 771ad409a..000000000
Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx
deleted file mode 100644
index 2418e98c1..000000000
Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx
deleted file mode 100644
index c87b3f3ee..000000000
Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx
deleted file mode 100644
index 2840e0535..000000000
Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx
deleted file mode 100644
index 95b2e3a3c..000000000
Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx
deleted file mode 100644
index 5a60028d4..000000000
Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx
deleted file mode 100644
index 6a705c735..000000000
Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx
deleted file mode 100644
index f456151a5..000000000
Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx
deleted file mode 100644
index d01a8f9d8..000000000
Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx
deleted file mode 100644
index 69cb830a9..000000000
Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx
deleted file mode 100644
index e9aebd579..000000000
Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx
deleted file mode 100644
index c27f1e1cf..000000000
Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx
deleted file mode 100644
index f15e674c7..000000000
Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx
deleted file mode 100644
index 39566cd7f..000000000
Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
deleted file mode 100644
index a6da0c338..000000000
Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
deleted file mode 100644
index 4cff1d486..000000000
Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
deleted file mode 100644
index a2a58af34..000000000
Binary files a/test/pptx/document-properties/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
deleted file mode 100644
index e24d904a2..000000000
Binary files a/test/pptx/document-properties/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx
deleted file mode 100644
index 3e613e038..000000000
Binary files a/test/pptx/endnotes-toc/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes-toc/moved-layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx
deleted file mode 100644
index e64cd9c77..000000000
Binary files a/test/pptx/endnotes-toc/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx
deleted file mode 100644
index 1d7ccb928..000000000
Binary files a/test/pptx/endnotes/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx
deleted file mode 100644
index 0f071207c..000000000
Binary files a/test/pptx/endnotes/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
deleted file mode 100644
index 3c3ed787f..000000000
Binary files a/test/pptx/images/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx
deleted file mode 100644
index b22f3652a..000000000
Binary files a/test/pptx/images/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx
deleted file mode 100644
index 3e92d4dab..000000000
Binary files a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx
deleted file mode 100644
index 050842865..000000000
Binary files a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx
deleted file mode 100644
index 4816c0b39..000000000
Binary files a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx
deleted file mode 100644
index 4f27db07b..000000000
Binary files a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx
deleted file mode 100644
index ac9fa4725..000000000
Binary files a/test/pptx/inline-formatting/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/inline-formatting/moved-layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx
deleted file mode 100644
index 49a2409d1..000000000
Binary files a/test/pptx/inline-formatting/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/layouts/deleted.pptx b/test/pptx/layouts/deleted.pptx
new file mode 100644
index 000000000..f7116b2f4
Binary files /dev/null and b/test/pptx/layouts/deleted.pptx differ
diff --git a/test/pptx/layouts/input.native b/test/pptx/layouts/input.native
new file mode 100644
index 000000000..0cee2d14e
--- /dev/null
+++ b/test/pptx/layouts/input.native
@@ -0,0 +1,23 @@
+Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "Testing",Space,Str "Layouts"])]})
+[Header 2 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "title",Space,Str "and",Space,Str "content",Space,Str "slide"]
+,Header 2 ("slide-2",[],[]) [Str "Slide",Space,Str "2"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This"]]
+ ,Div ("",["column"],[])
+  [Para [Str "\8230is",Space,Str "a",Space,Str "two-column",Space,Str "slide"]]]
+,Header 2 ("slide-3",[],[]) [Str "Slide",Space,Str "3"]
+,Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Content",Space,Str "with",Space,Str "Caption",Space,Str "slide"]
+,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]
+,Header 2 ("slide-4",[],[]) [Str "Slide",Space,Str "4"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Comparison",Space,Str "slide:"]
+  ,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "other",Space,Str "text"]]]
+,Header 1 ("section-header",[],[]) [Str "Section",Space,Str "header"]
+,Header 2 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "blank",Space,Str "slide"]]]
diff --git a/test/pptx/layouts/moved.pptx b/test/pptx/layouts/moved.pptx
new file mode 100644
index 000000000..e41465a86
Binary files /dev/null and b/test/pptx/layouts/moved.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
deleted file mode 100644
index d064b7fd5..000000000
Binary files a/test/pptx/lists/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx
deleted file mode 100644
index 8a9c9ec59..000000000
Binary files a/test/pptx/lists/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx
deleted file mode 100644
index a7bd12281..000000000
Binary files a/test/pptx/raw-ooxml/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/raw-ooxml/moved-layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx
deleted file mode 100644
index 614682671..000000000
Binary files a/test/pptx/raw-ooxml/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx
deleted file mode 100644
index 488abc02a..000000000
Binary files a/test/pptx/remove-empty-slides/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx
deleted file mode 100644
index 1e1cf1e44..000000000
Binary files a/test/pptx/remove-empty-slides/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
deleted file mode 100644
index b6b004cd6..000000000
Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
deleted file mode 100644
index 229e4c32a..000000000
Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
deleted file mode 100644
index e3b3b2807..000000000
Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
deleted file mode 100644
index ecc942803..000000000
Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
deleted file mode 100644
index ada3453b0..000000000
Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
deleted file mode 100644
index 0fe10f443..000000000
Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
deleted file mode 100644
index c315a7a7a..000000000
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
deleted file mode 100644
index 81b49936d..000000000
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
deleted file mode 100644
index 478dde788..000000000
Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
deleted file mode 100644
index 63b411888..000000000
Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
deleted file mode 100644
index 9d58c2c52..000000000
Binary files a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
deleted file mode 100644
index 62424de73..000000000
Binary files a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
deleted file mode 100644
index 478dde788..000000000
Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
deleted file mode 100644
index 63b411888..000000000
Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
deleted file mode 100644
index 07e21ef02..000000000
Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
deleted file mode 100644
index d6673aac0..000000000
Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
deleted file mode 100644
index 0ccdd72b7..000000000
Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
deleted file mode 100644
index 81f0a56cb..000000000
Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
deleted file mode 100644
index 33dedf2c3..000000000
Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
deleted file mode 100644
index 28bcf3887..000000000
Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
deleted file mode 100644
index 5f407086a..000000000
Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
deleted file mode 100644
index 83d5ed0af..000000000
Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
deleted file mode 100644
index d99fedfa6..000000000
Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
deleted file mode 100644
index 98db3ec74..000000000
Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
deleted file mode 100644
index 7ad714058..000000000
Binary files a/test/pptx/tables/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx
deleted file mode 100644
index 9628717d7..000000000
Binary files a/test/pptx/tables/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx
deleted file mode 100644
index a321128b5..000000000
Binary files a/test/pptx/two-column/all-text/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx
deleted file mode 100644
index 90b1d9254..000000000
Binary files a/test/pptx/two-column/all-text/moved-layouts.pptx and /dev/null differ
diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx
deleted file mode 100644
index 46274ffac..000000000
Binary files a/test/pptx/two-column/text-and-image/deleted-layouts.pptx and /dev/null differ
diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx
deleted file mode 100644
index c25331e23..000000000
Binary files a/test/pptx/two-column/text-and-image/moved-layouts.pptx and /dev/null differ
-- 
cgit v1.2.3


From 8af15ab345bb0790cc3442722673d9da9f23a79c Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Fri, 17 Sep 2021 16:05:06 +0100
Subject: pptx: Fix list level numbering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In PowerPoint, the content of a top-level list is at the same level as
the content of a top-level paragraph – the only difference is that a
list style has been applied.

At the moment, the pptx writer increments the paragraph level on each
list, turning what should be top-level lists into second-level lists.

This commit changes that logic, only incrementing the paragraph level on
continuation paragraphs of lists.

- Fixes https://github.com/jgm/pandoc/issues/4828
- Fixes https://github.com/jgm/pandoc/issues/4663
---
 pandoc.cabal                                       |   2 ++
 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs |  31 +++++++++++----------
 test/Tests/Writers/Powerpoint.hs                   |   4 +++
 test/pptx/code-custom/output.pptx                  | Bin 29817 -> 29807 bytes
 test/pptx/code-custom/templated.pptx               | Bin 42884 -> 42877 bytes
 test/pptx/code/output.pptx                         | Bin 29815 -> 29806 bytes
 test/pptx/code/templated.pptx                      | Bin 42882 -> 42876 bytes
 test/pptx/incremental-lists/with-flag/output.pptx  | Bin 77169 -> 77136 bytes
 .../incremental-lists/with-flag/templated.pptx     | Bin 90280 -> 90251 bytes
 .../incremental-lists/without-flag/output.pptx     | Bin 75411 -> 75386 bytes
 .../incremental-lists/without-flag/templated.pptx  | Bin 88518 -> 88495 bytes
 test/pptx/list-level/input.native                  |  20 +++++++++++++
 test/pptx/list-level/output.pptx                   | Bin 0 -> 28635 bytes
 test/pptx/list-level/templated.pptx                | Bin 0 -> 41701 bytes
 test/pptx/lists/output.pptx                        | Bin 28664 -> 28657 bytes
 test/pptx/lists/templated.pptx                     | Bin 41729 -> 41724 bytes
 test/pptx/pauses/without-incremental/output.pptx   | Bin 0 -> 50083 bytes
 .../pptx/pauses/without-incremental/templated.pptx | Bin 0 -> 63157 bytes
 test/pptx/slide-breaks-toc/output.pptx             | Bin 31129 -> 31123 bytes
 test/pptx/slide-breaks-toc/templated.pptx          | Bin 44195 -> 44191 bytes
 test/pptx/speaker-notes-afterseps/output.pptx      | Bin 51494 -> 51486 bytes
 test/pptx/speaker-notes-afterseps/templated.pptx   | Bin 64558 -> 64552 bytes
 test/pptx/start-numbering-at/output.pptx           | Bin 28626 -> 28620 bytes
 test/pptx/start-numbering-at/templated.pptx        | Bin 41691 -> 41686 bytes
 24 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 test/pptx/list-level/input.native
 create mode 100644 test/pptx/list-level/output.pptx
 create mode 100644 test/pptx/list-level/templated.pptx
 create mode 100644 test/pptx/pauses/without-incremental/output.pptx
 create mode 100644 test/pptx/pauses/without-incremental/templated.pptx

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/pandoc.cabal b/pandoc.cabal
index 615feaccb..ac6cb8121 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -429,6 +429,8 @@ extra-source-files:
                  test/pptx/inline-formatting/*.pptx
                  test/pptx/lists/input.native
                  test/pptx/lists/*.pptx
+                 test/pptx/list-level/input.native
+                 test/pptx/list-level/*.pptx
                  test/pptx/raw-ooxml/input.native
                  test/pptx/raw-ooxml/*.pptx
                  test/pptx/remove-empty-slides/input.native
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index fe34d24dc..2f94dcc17 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -500,27 +500,23 @@ blockToParagraphs (Header _ (ident, _, _) ils) = do
 blockToParagraphs (BulletList blksLst) = do
   pProps <- asks envParaProps
   incremental <- listShouldBeIncremental
-  let lvl = pPropLevel pProps
   local (\env -> env{ envInList = True
-                    , envParaProps = pProps{ pPropLevel = lvl + 1
-                                           , pPropBullet = Just Bullet
+                    , envParaProps = pProps{ pPropBullet = Just Bullet
                                            , pPropMarginLeft = Nothing
                                            , pPropIndent = Nothing
                                            , pPropIncremental = incremental
                                            }}) $
-    concatMapM multiParBullet blksLst
+    concatMapM multiParList blksLst
 blockToParagraphs (OrderedList listAttr blksLst) = do
   pProps <- asks envParaProps
   incremental <- listShouldBeIncremental
-  let lvl = pPropLevel pProps
   local (\env -> env{ envInList = True
-                    , envParaProps = pProps{ pPropLevel = lvl + 1
-                                           , pPropBullet = Just (AutoNumbering listAttr)
+                    , envParaProps = pProps{ pPropBullet = Just (AutoNumbering listAttr)
                                            , pPropMarginLeft = Nothing
                                            , pPropIndent = Nothing
                                            , pPropIncremental = incremental
                                            }}) $
-    concatMapM multiParBullet blksLst
+    concatMapM multiParList blksLst
 blockToParagraphs (DefinitionList entries) = do
   incremental <- listShouldBeIncremental
   let go :: ([Inline], [[Block]]) -> Pres [Paragraph]
@@ -545,14 +541,21 @@ blockToParagraphs blk = do
   addLogMessage $ BlockNotRendered blk
   return []
 
--- Make sure the bullet env gets turned off after the first para.
-multiParBullet :: [Block] -> Pres [Paragraph]
-multiParBullet [] = return []
-multiParBullet (b:bs) = do
+-- | Make sure the bullet env gets turned off after the first paragraph, and
+-- indent any continuation paragraphs.
+multiParList :: [Block] -> Pres [Paragraph]
+multiParList [] = return []
+multiParList (b:bs) = do
   pProps <- asks envParaProps
   p <- blockToParagraphs b
-  ps <- local (\env -> env{envParaProps = pProps{pPropBullet = Nothing}}) $
-    concatMapM blockToParagraphs bs
+  let level = pPropLevel pProps
+  ps <- local (\env -> env
+                { envParaProps = pProps
+                  { pPropBullet = Nothing
+                  , pPropLevel = level + 1
+                  }
+                })
+        $ concatMapM blockToParagraphs bs
   return $ p ++ ps
 
 cellToParagraphs :: Alignment -> SimpleCell -> Pres [Paragraph]
diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index 84bdd7476..f3663efbb 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -66,6 +66,10 @@ tests = let
                      def
                      "pptx/start-numbering-at/input.native"
                      "pptx/start-numbering-at/output.pptx"
+                   , pptxTests "List continuation paragraph indentation"
+                     def
+                     "pptx/list-level/input.native"
+                     "pptx/list-level/output.pptx"
                    , pptxTests "tables"
                      def
                      "pptx/tables/input.native"
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index ded8f1125..6c7a1a9ab 100644
Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx
index 8bb0df1ff..116865c1f 100644
Binary files a/test/pptx/code-custom/templated.pptx and b/test/pptx/code-custom/templated.pptx differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index e700bc268..8fd00ff74 100644
Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx
index 44f34cd64..0d7db048f 100644
Binary files a/test/pptx/code/templated.pptx and b/test/pptx/code/templated.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
index 1ca1dbf17..82f5f926f 100644
Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
index 4ddf6bb75..e8482b25f 100644
Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
index 6f7261ba3..62e66e1fe 100644
Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
index ca5c9fdab..ac7be9564 100644
Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
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/list-level/output.pptx b/test/pptx/list-level/output.pptx
new file mode 100644
index 000000000..5e3506958
Binary files /dev/null and b/test/pptx/list-level/output.pptx differ
diff --git a/test/pptx/list-level/templated.pptx b/test/pptx/list-level/templated.pptx
new file mode 100644
index 000000000..8853a3082
Binary files /dev/null and b/test/pptx/list-level/templated.pptx differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index 94a424f42..e23f47218 100644
Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 52097489f..290b5b519 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx differ
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
Binary files /dev/null and b/test/pptx/pauses/without-incremental/output.pptx differ
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
Binary files /dev/null and b/test/pptx/pauses/without-incremental/templated.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index 788cdf148..f2660ef93 100644
Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
index d11744079..0a2bdb857 100644
Binary files a/test/pptx/slide-breaks-toc/templated.pptx and b/test/pptx/slide-breaks-toc/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 99110d3ca..b54ba4465 100644
Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
index daf8e2175..3b272ab1b 100644
Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index bc74ec599..ecfc6901a 100644
Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index 4f191a06e..f3f46ef30 100644
Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ
-- 
cgit v1.2.3


From 8de261ba4e1e03f9dd5f78297d7299e9d78bbcfd Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Thu, 23 Sep 2021 16:01:38 +0100
Subject: pptx: Line up continuation paragraphs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit changes the `marL` and `indent` values used for plain
paragraphs and numbered lists, and changes the spacing defined in the
reference doc master for bulleted lists.

For paragraphs, there is now a left-indent taken from the `otherStyle`
in the master. For numbered lists, the number is positioned where the
text would be if this were a plain paragraph, and the text is indented
to the next level. This means that continuation paragraphs line up
nicely with numbered lists.

It also /mostly/ matches the observed PowerPoint behaviour when
inserting paragraphs and numbered lists: the only difference is that
PowerPoint was using a different margin value for the first level
numbered lists – I’ve changed this to match the other levels, as I don’t
think it makes the spacing unappealing and it allows continuation
paragraphs at any level to line up.

With bulleted lists, I’m keeping the observed PowerPoint behaviour of
specifying only a level, letting `marL` and `indent` be automatically
taken from `bodyStyle`. To that end, this commit changes the `bodyStyle`
spacing in the master of the default reference doc, to:

- line up the text of the first paragraph in each bullet with any
  continuation paragraphs
- line up nested bullet markers in any continuation paragraphs with the
  first paragraph, matching lists and plain paragraphs

This does mean the continuation paragraphs still won’t line up for
anyone using their own reference doc where they haven’t matched the
`otherStyle` and `bodyStyle` indent levels, but I think people in that
situation will be able to troubleshoot.
---
 data/pptx/ppt/slideMasters/slideMaster1.xml        |   2 +-
 src/Text/Pandoc/Writers/Powerpoint/Output.hs       | 100 +++++++++++++++++++--
 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs |   3 +-
 test/pptx/background-image/output.pptx             | Bin 53358 -> 53318 bytes
 test/pptx/blanks/just-speaker-notes/output.pptx    | Bin 32267 -> 32227 bytes
 test/pptx/blanks/nbsp-in-body/output.pptx          | Bin 29205 -> 29165 bytes
 test/pptx/blanks/nbsp-in-heading/output.pptx       | Bin 29205 -> 29165 bytes
 test/pptx/code-custom/output.pptx                  | Bin 29807 -> 29776 bytes
 test/pptx/code/output.pptx                         | Bin 29806 -> 29773 bytes
 test/pptx/comparison/both-columns/output.pptx      | Bin 44570 -> 44530 bytes
 test/pptx/comparison/extra-image/output.pptx       | Bin 44599 -> 44559 bytes
 test/pptx/comparison/extra-text/output.pptx        | Bin 44570 -> 44530 bytes
 test/pptx/comparison/non-text-first/output.pptx    | Bin 44484 -> 44444 bytes
 test/pptx/comparison/one-column/output.pptx        | Bin 27902 -> 27862 bytes
 .../heading-text-image/output.pptx                 | Bin 44318 -> 44278 bytes
 .../content-with-caption/image-text/output.pptx    | Bin 45019 -> 44979 bytes
 .../content-with-caption/text-image/output.pptx    | Bin 44258 -> 44218 bytes
 .../document-properties-short-desc/output.pptx     | Bin 28613 -> 28573 bytes
 test/pptx/document-properties/output.pptx          | Bin 29015 -> 28976 bytes
 test/pptx/endnotes-toc/output.pptx                 | Bin 29399 -> 29363 bytes
 test/pptx/endnotes/output.pptx                     | Bin 28580 -> 28544 bytes
 test/pptx/images/output.pptx                       | Bin 46235 -> 46195 bytes
 test/pptx/incremental-lists/with-flag/output.pptx  | Bin 77136 -> 77125 bytes
 .../incremental-lists/with-flag/templated.pptx     | Bin 90251 -> 90277 bytes
 .../incremental-lists/without-flag/output.pptx     | Bin 75386 -> 75374 bytes
 .../incremental-lists/without-flag/templated.pptx  | Bin 88495 -> 88522 bytes
 test/pptx/inline-formatting/output.pptx            | Bin 27772 -> 27736 bytes
 test/pptx/list-level/output.pptx                   | Bin 28635 -> 28632 bytes
 test/pptx/list-level/templated.pptx                | Bin 41701 -> 41735 bytes
 test/pptx/lists/output.pptx                        | Bin 28657 -> 28639 bytes
 test/pptx/lists/templated.pptx                     | Bin 41724 -> 41742 bytes
 test/pptx/raw-ooxml/output.pptx                    | Bin 28560 -> 28524 bytes
 test/pptx/remove-empty-slides/output.pptx          | Bin 44994 -> 44958 bytes
 test/pptx/slide-breaks-slide-level-1/output.pptx   | Bin 29354 -> 29314 bytes
 test/pptx/slide-breaks-toc/output.pptx             | Bin 31123 -> 31087 bytes
 test/pptx/slide-breaks/output.pptx                 | Bin 30179 -> 30139 bytes
 .../slide-level-0/h1-h2-with-table/output.pptx     | Bin 27907 -> 27871 bytes
 test/pptx/slide-level-0/h1-with-image/output.pptx  | Bin 44242 -> 44202 bytes
 test/pptx/slide-level-0/h1-with-table/output.pptx  | Bin 27814 -> 27778 bytes
 test/pptx/slide-level-0/h2-with-image/output.pptx  | Bin 44242 -> 44202 bytes
 test/pptx/speaker-notes-after-metadata/output.pptx | Bin 31617 -> 31577 bytes
 test/pptx/speaker-notes-afterheader/output.pptx    | Bin 30629 -> 30589 bytes
 test/pptx/speaker-notes-afterseps/output.pptx      | Bin 51486 -> 51450 bytes
 test/pptx/speaker-notes/output.pptx                | Bin 35329 -> 35289 bytes
 test/pptx/start-numbering-at/output.pptx           | Bin 28620 -> 28605 bytes
 test/pptx/start-numbering-at/templated.pptx        | Bin 41686 -> 41707 bytes
 test/pptx/tables/output.pptx                       | Bin 29160 -> 29122 bytes
 test/pptx/two-column/all-text/output.pptx          | Bin 27689 -> 27649 bytes
 test/pptx/two-column/text-and-image/output.pptx    | Bin 45510 -> 45470 bytes
 49 files changed, 94 insertions(+), 11 deletions(-)

(limited to 'test/pptx/incremental-lists/with-flag')

diff --git a/data/pptx/ppt/slideMasters/slideMaster1.xml b/data/pptx/ppt/slideMasters/slideMaster1.xml
index 69f0af019..2e0425358 100644
--- a/data/pptx/ppt/slideMasters/slideMaster1.xml
+++ b/data/pptx/ppt/slideMasters/slideMaster1.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<p:sldMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title Placeholder 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="274638"/><a:ext cx="8229600" cy="1143000"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"><a:normAutofit/></a:bodyPr><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Text Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="1600200"/><a:ext cx="8229600" cy="4525963"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"><a:normAutofit/></a:bodyPr><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="6356350"/><a:ext cx="2133600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{241EB5C9-1307-BA42-ABA2-0BC069CD8E7F}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:t>4/5/2019</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="3"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="3124200" y="6356350"/><a:ext cx="2895600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="ctr"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="4"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="6553200" y="6356350"/><a:ext cx="2133600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{C5EF2332-01BF-834F-8236-50238282D533}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree><p:extLst><p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}"><p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="3676200875"/></p:ext></p:extLst></p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:sldLayoutIdLst><p:sldLayoutId id="2147483649" r:id="rId1"/><p:sldLayoutId id="2147483650" r:id="rId2"/><p:sldLayoutId id="2147483651" r:id="rId3"/><p:sldLayoutId id="2147483652" r:id="rId4"/><p:sldLayoutId id="2147483653" r:id="rId5"/><p:sldLayoutId id="2147483654" r:id="rId6"/><p:sldLayoutId id="2147483655" r:id="rId7"/><p:sldLayoutId id="2147483656" r:id="rId8"/><p:sldLayoutId id="2147483657" r:id="rId9"/><p:sldLayoutId id="2147483658" r:id="rId10"/><p:sldLayoutId id="2147483659" r:id="rId11"/></p:sldLayoutIdLst><p:txStyles><p:titleStyle><a:lvl1pPr algn="ctr" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="0"/></a:spcBef><a:buNone/><a:defRPr sz="4400" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mj-lt"/><a:ea typeface="+mj-ea"/><a:cs typeface="+mj-cs"/></a:defRPr></a:lvl1pPr></p:titleStyle><p:bodyStyle><a:lvl1pPr marL="342900" indent="-342900" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="3200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="742950" indent="-285750" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="–"/><a:defRPr sz="2800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="1143000" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2400" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1600200" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="–"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="2057400" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="»"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2514600" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2971800" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3429000" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3886200" indent="-228600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:bodyStyle><p:otherStyle><a:defPPr><a:defRPr lang="en-US"/></a:defPPr><a:lvl1pPr marL="0" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:otherStyle></p:txStyles></p:sldMaster>
\ No newline at end of file
+<p:sldMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title Placeholder 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="274638"/><a:ext cx="8229600" cy="1143000"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"><a:normAutofit/></a:bodyPr><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Text Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="1600200"/><a:ext cx="8229600" cy="4525963"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"><a:normAutofit/></a:bodyPr><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="6356350"/><a:ext cx="2133600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{241EB5C9-1307-BA42-ABA2-0BC069CD8E7F}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:t>4/5/2019</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="3"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="3124200" y="6356350"/><a:ext cx="2895600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="ctr"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="4"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="6553200" y="6356350"/><a:ext cx="2133600" cy="365125"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{C5EF2332-01BF-834F-8236-50238282D533}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree><p:extLst><p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}"><p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="3676200875"/></p:ext></p:extLst></p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:sldLayoutIdLst><p:sldLayoutId id="2147483649" r:id="rId1"/><p:sldLayoutId id="2147483650" r:id="rId2"/><p:sldLayoutId id="2147483651" r:id="rId3"/><p:sldLayoutId id="2147483652" r:id="rId4"/><p:sldLayoutId id="2147483653" r:id="rId5"/><p:sldLayoutId id="2147483654" r:id="rId6"/><p:sldLayoutId id="2147483655" r:id="rId7"/><p:sldLayoutId id="2147483656" r:id="rId8"/><p:sldLayoutId id="2147483657" r:id="rId9"/><p:sldLayoutId id="2147483658" r:id="rId10"/><p:sldLayoutId id="2147483659" r:id="rId11"/></p:sldLayoutIdLst><p:txStyles><p:titleStyle><a:lvl1pPr algn="ctr" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="0"/></a:spcBef><a:buNone/><a:defRPr sz="4400" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mj-lt"/><a:ea typeface="+mj-ea"/><a:cs typeface="+mj-cs"/></a:defRPr></a:lvl1pPr></p:titleStyle><p:bodyStyle><a:lvl1pPr marL="457200" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="3200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="914400" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="–"/><a:defRPr sz="2800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="1371600" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2400" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1828800" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="–"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="2286000" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="»"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2743200" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="3200400" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3657600" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="4114800" indent="-457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:spcBef><a:spcPct val="20000"/></a:spcBef><a:buFont typeface="Arial"/><a:buChar char="•"/><a:defRPr sz="2000" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:bodyStyle><p:otherStyle><a:defPPr><a:defRPr lang="en-US"/></a:defPPr><a:lvl1pPr marL="0" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" algn="l" defTabSz="457200" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:otherStyle></p:txStyles></p:sldMaster>
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
index 487dcad2e..e799297de 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -126,6 +126,7 @@ data WriterEnv = WriterEnv { envRefArchive :: Archive
                            , envSpeakerNotesIdMap :: M.Map Int Int
                            , envInSpeakerNotes :: Bool
                            , envSlideLayouts :: Maybe SlideLayouts
+                           , envOtherStyleIndents :: Maybe Indents
                            }
                  deriving (Show)
 
@@ -145,6 +146,7 @@ instance Default WriterEnv where
                   , envSpeakerNotesIdMap = mempty
                   , envInSpeakerNotes = False
                   , envSlideLayouts = Nothing
+                  , envOtherStyleIndents = Nothing
                   }
 
 type SlideLayouts = SlideLayoutsOf SlideLayout
@@ -183,6 +185,39 @@ data Placeholder = Placeholder
   , index :: Int
   } deriving (Show, Eq)
 
+-- | Paragraph indentation info.
+data Indents = Indents
+  { level1 :: Maybe LevelIndents
+  , level2 :: Maybe LevelIndents
+  , level3 :: Maybe LevelIndents
+  , level4 :: Maybe LevelIndents
+  , level5 :: Maybe LevelIndents
+  , level6 :: Maybe LevelIndents
+  , level7 :: Maybe LevelIndents
+  , level8 :: Maybe LevelIndents
+  , level9 :: Maybe LevelIndents
+  } deriving (Show, Eq)
+
+levelIndent :: Indents -> Int -> Maybe LevelIndents
+levelIndent is index = getter is
+  where
+    getter = case index of
+      0 -> level1
+      1 -> level2
+      2 -> level3
+      3 -> level4
+      4 -> level5
+      5 -> level6
+      6 -> level7
+      7 -> level8
+      8 -> level9
+      _ -> const Nothing
+
+data LevelIndents = LevelIndents
+  { marL :: EMU
+  , indent :: EMU
+  } deriving (Show, Eq)
+
 data MediaInfo = MediaInfo { mInfoFilePath :: FilePath
                            , mInfoLocalId  :: Int
                            , mInfoGlobalId :: Int
@@ -580,6 +615,33 @@ presentationToArchive opts meta pres = do
                              , slInReferenceDoc = True
                              }
 
+  master <- getMaster' refArchive distArchive
+
+  let otherStyleIndents = do
+        let ns = elemToNameSpaces master
+        txStyles <- findChild (elemName ns "p" "txStyles") master
+        otherStyle <- findChild (elemName ns "p" "otherStyle") txStyles
+        let makeLevelIndents name = do
+              e <- findChild (elemName ns "a" name) otherStyle
+              pure LevelIndents
+                { indent = fromMaybe (-342900)
+                    (findAttr (QName "indent" Nothing Nothing) e
+                    >>= readTextAsInteger)
+                , marL = fromMaybe 347663
+                    (findAttr (QName "marL" Nothing Nothing) e
+                     >>= readTextAsInteger)
+                }
+        pure Indents
+          { level1 = makeLevelIndents "lvl1pPr"
+          , level2 = makeLevelIndents "lvl2pPr"
+          , level3 = makeLevelIndents "lvl3pPr"
+          , level4 = makeLevelIndents "lvl4pPr"
+          , level5 = makeLevelIndents "lvl5pPr"
+          , level6 = makeLevelIndents "lvl6pPr"
+          , level7 = makeLevelIndents "lvl7pPr"
+          , level8 = makeLevelIndents "lvl8pPr"
+          , level9 = makeLevelIndents "lvl9pPr"
+          }
 
   utctime <- P.getTimestamp
 
@@ -605,6 +667,7 @@ presentationToArchive opts meta pres = do
                 , envSlideIdMap = makeSlideIdMap pres
                 , envSpeakerNotesIdMap = makeSpeakerNotesMap pres
                 , envSlideLayouts = Just layouts
+                , envOtherStyleIndents = otherStyleIndents
                 }
 
   let st = def { stMediaGlobalIds = initialGlobalIds refArchive distArchive
@@ -910,6 +973,10 @@ getMaster :: PandocMonad m => P m Element
 getMaster = do
   refArchive <- asks envRefArchive
   distArchive <- asks envDistArchive
+  getMaster' refArchive distArchive
+
+getMaster' :: PandocMonad m => Archive -> Archive -> m Element
+getMaster' refArchive distArchive =
   parseXml refArchive distArchive "ppt/slideMasters/slideMaster1.xml"
 
 getMasterRels :: PandocMonad m => P m Element
@@ -1196,15 +1263,32 @@ surroundWithMathAlternate element =
 
 paragraphToElement :: PandocMonad m => Paragraph -> P m Element
 paragraphToElement par = do
+  indents <- asks envOtherStyleIndents
   let
-    attrs = [("lvl", tshow $ pPropLevel $ paraProps par)] <>
-            (case pPropMarginLeft (paraProps par) of
-               Just px -> [("marL", tshow $ pixelsToEmu px)]
-               Nothing -> []
-            ) <>
-            (case pPropIndent (paraProps par) of
-               Just px -> [("indent", tshow $ pixelsToEmu px)]
-               Nothing -> []
+    lvl = pPropLevel (paraProps par)
+    attrs = [("lvl", tshow lvl)] <>
+            (case (pPropIndent (paraProps par), pPropMarginLeft (paraProps par)) of
+               (Just px1, Just px2) -> [ ("indent", tshow $ pixelsToEmu px1)
+                                       , ("marL", tshow $ pixelsToEmu px2)
+                                       ]
+               (Just px1, Nothing) -> [("indent", tshow $ pixelsToEmu px1)]
+               (Nothing, Just px2) -> [("marL", tshow $ pixelsToEmu px2)]
+               (Nothing, Nothing) -> fromMaybe [] $ do
+                 indents' <- indents
+                 thisLevel <- levelIndent indents' lvl
+                 nextLevel <- levelIndent indents' (lvl + 1)
+                 let (m, i) =
+                       case pPropBullet (paraProps par) of
+                         Nothing ->
+                           (Just (marL thisLevel), Just 0)
+                         Just (AutoNumbering _) ->
+                           ( Just (marL nextLevel)
+                           , Just (marL thisLevel - marL nextLevel)
+                           )
+                         Just Bullet -> (Nothing, Nothing)
+                 pure ( toList ((,) "indent" . tshow <$> i)
+                      <> toList ((,) "marL" . tshow <$> m)
+                      )
             ) <>
             (case pPropAlign (paraProps par) of
                Just AlgnLeft -> [("algn", "l")]
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index 2f94dcc17..fd6b83120 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -541,8 +541,7 @@ blockToParagraphs blk = do
   addLogMessage $ BlockNotRendered blk
   return []
 
--- | Make sure the bullet env gets turned off after the first paragraph, and
--- indent any continuation paragraphs.
+-- | Make sure the bullet env gets turned off after the first para.
 multiParList :: [Block] -> Pres [Paragraph]
 multiParList [] = return []
 multiParList (b:bs) = do
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
index abe82ebc2..1e678e0a4 100644
Binary files a/test/pptx/background-image/output.pptx and b/test/pptx/background-image/output.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
index 0c4ed20fa..9a36ccf1f 100644
Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
index 6265c842f..08c764feb 100644
Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
index 6265c842f..08c764feb 100644
Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index 6c7a1a9ab..1e5085e9c 100644
Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index 8fd00ff74..a3f31dfdc 100644
Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
index 47f807754..efb67f2e7 100644
Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
index f700e09a8..e26e5b49c 100644
Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
index 47f807754..efb67f2e7 100644
Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
index c8a2bd0e3..f36c53ddb 100644
Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
index e70dd2326..8d9031ac8 100644
Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
index 0677879aa..6802b7361 100644
Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
index f461b6ed3..0bd64e340 100644
Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
index be376c1ed..a0d8806c0 100644
Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ
diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
index 737ca7e8d..418d158ca 100644
Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
index ef05c01b5..55ca48b5d 100644
Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ
diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx
index bb431f511..a6cc2db24 100644
Binary files a/test/pptx/endnotes-toc/output.pptx and b/test/pptx/endnotes-toc/output.pptx differ
diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx
index e4e661804..ea29cbcf8 100644
Binary files a/test/pptx/endnotes/output.pptx and b/test/pptx/endnotes/output.pptx differ
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
index 9b04881f3..098547e87 100644
Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
index 82f5f926f..230d29253 100644
Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
index e8482b25f..263d9c355 100644
Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
index 62e66e1fe..450cd16ea 100644
Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
index ac7be9564..e7ab48aa0 100644
Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx
index f1a4a0a36..7744b7d2e 100644
Binary files a/test/pptx/inline-formatting/output.pptx and b/test/pptx/inline-formatting/output.pptx differ
diff --git a/test/pptx/list-level/output.pptx b/test/pptx/list-level/output.pptx
index 5e3506958..02c609b40 100644
Binary files a/test/pptx/list-level/output.pptx and b/test/pptx/list-level/output.pptx differ
diff --git a/test/pptx/list-level/templated.pptx b/test/pptx/list-level/templated.pptx
index 8853a3082..a7b23ccf9 100644
Binary files a/test/pptx/list-level/templated.pptx and b/test/pptx/list-level/templated.pptx differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index e23f47218..857a3e28c 100644
Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 290b5b519..5510a7123 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx differ
diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx
index 841495315..1813bbd28 100644
Binary files a/test/pptx/raw-ooxml/output.pptx and b/test/pptx/raw-ooxml/output.pptx differ
diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx
index e2871a882..d0d5e824c 100644
Binary files a/test/pptx/remove-empty-slides/output.pptx and b/test/pptx/remove-empty-slides/output.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index cb65ab335..d443bc04e 100644
Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index f2660ef93..e24b45e12 100644
Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
index 7c2c7db5e..a5208ecf8 100644
Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ
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
index 3f815d830..bd772d44e 100644
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index 70fc6aee2..1102f549c 100644
Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx
index d30fd88c3..c0bc6b162 100644
Binary files a/test/pptx/slide-level-0/h1-with-table/output.pptx and b/test/pptx/slide-level-0/h1-with-table/output.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
index 70fc6aee2..1102f549c 100644
Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index f68d6f0ef..4e5635e0c 100644
Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index 9df78756b..f59b29f6a 100644
Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index b54ba4465..aad79e3dc 100644
Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
index 6ae003d7a..7b44c50c2 100644
Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index ecfc6901a..e08d300e5 100644
Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index f3f46ef30..30a097eb8 100644
Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
index 4398e35be..407062ca3 100644
Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ
diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx
index 45f651ceb..8a1dce949 100644
Binary files a/test/pptx/two-column/all-text/output.pptx and b/test/pptx/two-column/all-text/output.pptx differ
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
index aab0b3b59..e45bf3d58 100644
Binary files a/test/pptx/two-column/text-and-image/output.pptx and b/test/pptx/two-column/text-and-image/output.pptx differ
-- 
cgit v1.2.3