From 8dbea4909211ef7b2acc677288be7c5f10cbb40e Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Wed, 25 Aug 2021 14:35:19 +0100
Subject: pptx: Restructure tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use dashes consistently rather than underscores
- Make a folder for each set of tests
- List test files explicitly (Cabal doesn’t support ** until version
  2.4)
---
 test/pptx/slide-level-0/h1-with-image/templated.pptx | Bin 0 -> 55657 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/pptx/slide-level-0/h1-with-image/templated.pptx

(limited to 'test/pptx/slide-level-0/h1-with-image/templated.pptx')

diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
new file mode 100644
index 000000000..d306375e9
Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ
-- 
cgit v1.2.3


From 2b98991551a95f9f91fd6b643f52bf6065f5057a Mon Sep 17 00:00:00 2001
From: Emily Bourke <undergroundquizscene@protonmail.com>
Date: Thu, 2 Sep 2021 16:56:40 +0100
Subject: pptx: Include all themes in output archive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Accept test changes: they’re adding the second theme (for all tests
  not containing speaker notes), or changing its position in the
  XML (for the ones containing speaker notes).
---
 src/Text/Pandoc/Writers/Powerpoint/Output.hs        |   6 ++----
 .../blanks/just-speaker-notes/deleted-layouts.pptx  | Bin 35233 -> 35178 bytes
 .../blanks/just-speaker-notes/moved-layouts.pptx    | Bin 45925 -> 45870 bytes
 test/pptx/blanks/just-speaker-notes/output.pptx     | Bin 32356 -> 32297 bytes
 test/pptx/blanks/just-speaker-notes/templated.pptx  | Bin 45421 -> 45365 bytes
 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx  | Bin 30444 -> 32092 bytes
 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx    | Bin 41131 -> 42780 bytes
 test/pptx/blanks/nbsp-in-body/output.pptx           | Bin 27562 -> 29211 bytes
 test/pptx/blanks/nbsp-in-body/templated.pptx        | Bin 40630 -> 42280 bytes
 .../blanks/nbsp-in-heading/deleted-layouts.pptx     | Bin 30444 -> 32092 bytes
 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 41131 -> 42780 bytes
 test/pptx/blanks/nbsp-in-heading/output.pptx        | Bin 27562 -> 29211 bytes
 test/pptx/blanks/nbsp-in-heading/templated.pptx     | Bin 40630 -> 42280 bytes
 test/pptx/code-custom/deleted-layouts.pptx          | Bin 31069 -> 32717 bytes
 test/pptx/code-custom/moved-layouts.pptx            | Bin 41822 -> 43405 bytes
 test/pptx/code-custom/output.pptx                   | Bin 28184 -> 29836 bytes
 test/pptx/code-custom/templated.pptx                | Bin 41337 -> 42905 bytes
 test/pptx/code/deleted-layouts.pptx                 | Bin 31068 -> 32716 bytes
 test/pptx/code/moved-layouts.pptx                   | Bin 41826 -> 43405 bytes
 test/pptx/code/output.pptx                          | Bin 28183 -> 29835 bytes
 test/pptx/code/templated.pptx                       | Bin 41337 -> 42905 bytes
 .../comparison/both-columns/deleted-layouts.pptx    | Bin 45804 -> 47453 bytes
 .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 56524 -> 58172 bytes
 test/pptx/comparison/both-columns/output.pptx       | Bin 42932 -> 44581 bytes
 test/pptx/comparison/both-columns/templated.pptx    | Bin 56025 -> 57674 bytes
 .../comparison/extra-image/deleted-layouts.pptx     | Bin 45833 -> 47482 bytes
 test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 56552 -> 58200 bytes
 test/pptx/comparison/extra-image/output.pptx        | Bin 42961 -> 44610 bytes
 test/pptx/comparison/extra-image/templated.pptx     | Bin 56053 -> 57702 bytes
 .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 45804 -> 47453 bytes
 test/pptx/comparison/extra-text/moved-layouts.pptx  | Bin 56524 -> 58172 bytes
 test/pptx/comparison/extra-text/output.pptx         | Bin 42932 -> 44581 bytes
 test/pptx/comparison/extra-text/templated.pptx      | Bin 56025 -> 57674 bytes
 .../comparison/non-text-first/deleted-layouts.pptx  | Bin 45717 -> 47366 bytes
 .../comparison/non-text-first/moved-layouts.pptx    | Bin 56417 -> 58065 bytes
 test/pptx/comparison/non-text-first/output.pptx     | Bin 42845 -> 44494 bytes
 test/pptx/comparison/non-text-first/templated.pptx  | Bin 55918 -> 57567 bytes
 .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 29136 -> 30785 bytes
 test/pptx/comparison/one-column/moved-layouts.pptx  | Bin 39856 -> 41506 bytes
 test/pptx/comparison/one-column/output.pptx         | Bin 26258 -> 27906 bytes
 test/pptx/comparison/one-column/templated.pptx      | Bin 39357 -> 41006 bytes
 .../heading-text-image/deleted-layouts.pptx         | Bin 45549 -> 47198 bytes
 .../heading-text-image/moved-layouts.pptx           | Bin 56248 -> 57896 bytes
 .../heading-text-image/output.pptx                  | Bin 42677 -> 44326 bytes
 .../heading-text-image/templated.pptx               | Bin 55749 -> 57398 bytes
 .../image-text/deleted-layouts.pptx                 | Bin 46248 -> 47896 bytes
 .../image-text/moved-layouts.pptx                   | Bin 56934 -> 58584 bytes
 .../content-with-caption/image-text/output.pptx     | Bin 43374 -> 45022 bytes
 .../content-with-caption/image-text/templated.pptx  | Bin 56435 -> 58084 bytes
 .../text-image/deleted-layouts.pptx                 | Bin 45488 -> 47137 bytes
 .../text-image/moved-layouts.pptx                   | Bin 56188 -> 57836 bytes
 .../content-with-caption/text-image/output.pptx     | Bin 42616 -> 44265 bytes
 .../content-with-caption/text-image/templated.pptx  | Bin 55689 -> 57338 bytes
 .../deleted-layouts.pptx                            | Bin 29842 -> 31490 bytes
 .../moved-layouts.pptx                              | Bin 40600 -> 42178 bytes
 .../pptx/document-properties-short-desc/output.pptx | Bin 26967 -> 28619 bytes
 .../document-properties-short-desc/templated.pptx   | Bin 40113 -> 41678 bytes
 test/pptx/document-properties/deleted-layouts.pptx  | Bin 30246 -> 31894 bytes
 test/pptx/document-properties/moved-layouts.pptx    | Bin 41004 -> 42582 bytes
 test/pptx/document-properties/output.pptx           | Bin 27375 -> 29025 bytes
 test/pptx/document-properties/templated.pptx        | Bin 40517 -> 42082 bytes
 test/pptx/endnotes-toc/deleted-layouts.pptx         | Bin 30632 -> 32280 bytes
 test/pptx/endnotes-toc/moved-layouts.pptx           | Bin 41384 -> 42967 bytes
 test/pptx/endnotes-toc/output.pptx                  | Bin 27747 -> 29399 bytes
 test/pptx/endnotes-toc/templated.pptx               | Bin 40899 -> 42467 bytes
 test/pptx/endnotes/deleted-layouts.pptx             | Bin 29810 -> 31458 bytes
 test/pptx/endnotes/moved-layouts.pptx               | Bin 40566 -> 42146 bytes
 test/pptx/endnotes/output.pptx                      | Bin 26928 -> 28580 bytes
 test/pptx/endnotes/templated.pptx                   | Bin 40078 -> 41645 bytes
 test/pptx/images/deleted-layouts.pptx               | Bin 47473 -> 49121 bytes
 test/pptx/images/moved-layouts.pptx                 | Bin 58160 -> 59809 bytes
 test/pptx/images/output.pptx                        | Bin 44596 -> 46244 bytes
 test/pptx/images/templated.pptx                     | Bin 57660 -> 59308 bytes
 test/pptx/inline-formatting/deleted-layouts.pptx    | Bin 29002 -> 30651 bytes
 test/pptx/inline-formatting/moved-layouts.pptx      | Bin 39758 -> 41339 bytes
 test/pptx/inline-formatting/output.pptx             | Bin 26121 -> 27772 bytes
 test/pptx/inline-formatting/templated.pptx          | Bin 39272 -> 40839 bytes
 test/pptx/lists/deleted-layouts.pptx                | Bin 29897 -> 31545 bytes
 test/pptx/lists/moved-layouts.pptx                  | Bin 40653 -> 42233 bytes
 test/pptx/lists/output.pptx                         | Bin 27015 -> 28667 bytes
 test/pptx/lists/templated.pptx                      | Bin 40166 -> 41733 bytes
 test/pptx/raw-ooxml/deleted-layouts.pptx            | Bin 29790 -> 31438 bytes
 test/pptx/raw-ooxml/moved-layouts.pptx              | Bin 40546 -> 42126 bytes
 test/pptx/raw-ooxml/output.pptx                     | Bin 26908 -> 28560 bytes
 test/pptx/raw-ooxml/templated.pptx                  | Bin 40059 -> 41626 bytes
 test/pptx/remove-empty-slides/deleted-layouts.pptx  | Bin 46218 -> 47866 bytes
 test/pptx/remove-empty-slides/moved-layouts.pptx    | Bin 56903 -> 58553 bytes
 test/pptx/remove-empty-slides/output.pptx           | Bin 43346 -> 44994 bytes
 test/pptx/remove-empty-slides/templated.pptx        | Bin 56404 -> 58053 bytes
 .../slide-breaks-slide-level-1/deleted-layouts.pptx | Bin 30590 -> 32238 bytes
 .../slide-breaks-slide-level-1/moved-layouts.pptx   | Bin 41343 -> 42926 bytes
 test/pptx/slide-breaks-slide-level-1/output.pptx    | Bin 27705 -> 29357 bytes
 test/pptx/slide-breaks-slide-level-1/templated.pptx | Bin 40858 -> 42426 bytes
 test/pptx/slide-breaks-toc/deleted-layouts.pptx     | Bin 32364 -> 34012 bytes
 test/pptx/slide-breaks-toc/moved-layouts.pptx       | Bin 43118 -> 44701 bytes
 test/pptx/slide-breaks-toc/output.pptx              | Bin 29481 -> 31133 bytes
 test/pptx/slide-breaks-toc/templated.pptx           | Bin 42634 -> 44201 bytes
 test/pptx/slide-breaks/deleted-layouts.pptx         | Bin 31414 -> 33062 bytes
 test/pptx/slide-breaks/moved-layouts.pptx           | Bin 42171 -> 43751 bytes
 test/pptx/slide-breaks/output.pptx                  | Bin 28531 -> 30183 bytes
 test/pptx/slide-breaks/templated.pptx               | Bin 41683 -> 43250 bytes
 .../h1-h2-with-table/deleted-layouts.pptx           | Bin 29137 -> 30786 bytes
 .../h1-h2-with-table/moved-layouts.pptx             | Bin 39829 -> 41479 bytes
 .../pptx/slide-level-0/h1-h2-with-table/output.pptx | Bin 26259 -> 27907 bytes
 .../slide-level-0/h1-h2-with-table/templated.pptx   | Bin 39330 -> 40979 bytes
 .../h1-with-image/deleted-layouts.pptx              | Bin 45469 -> 47118 bytes
 .../slide-level-0/h1-with-image/moved-layouts.pptx  | Bin 56156 -> 57804 bytes
 test/pptx/slide-level-0/h1-with-image/output.pptx   | Bin 42596 -> 44245 bytes
 .../pptx/slide-level-0/h1-with-image/templated.pptx | Bin 55657 -> 57306 bytes
 .../h1-with-table/deleted-layouts.pptx              | Bin 29044 -> 30693 bytes
 .../slide-level-0/h1-with-table/moved-layouts.pptx  | Bin 39731 -> 41381 bytes
 test/pptx/slide-level-0/h1-with-table/output.pptx   | Bin 26166 -> 27814 bytes
 .../pptx/slide-level-0/h1-with-table/templated.pptx | Bin 39232 -> 40881 bytes
 .../h2-with-image/deleted-layouts.pptx              | Bin 45469 -> 47118 bytes
 .../slide-level-0/h2-with-image/moved-layouts.pptx  | Bin 56156 -> 57804 bytes
 test/pptx/slide-level-0/h2-with-image/output.pptx   | Bin 42596 -> 44245 bytes
 .../pptx/slide-level-0/h2-with-image/templated.pptx | Bin 55657 -> 57306 bytes
 .../deleted-layouts.pptx                            | Bin 34561 -> 34504 bytes
 .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45321 -> 45193 bytes
 test/pptx/speaker-notes-after-metadata/output.pptx  | Bin 31688 -> 31634 bytes
 .../speaker-notes-after-metadata/templated.pptx     | Bin 44828 -> 44690 bytes
 .../speaker-notes-afterheader/deleted-layouts.pptx  | Bin 33588 -> 33532 bytes
 .../speaker-notes-afterheader/moved-layouts.pptx    | Bin 44349 -> 44220 bytes
 test/pptx/speaker-notes-afterheader/output.pptx     | Bin 30709 -> 30653 bytes
 test/pptx/speaker-notes-afterheader/templated.pptx  | Bin 43855 -> 43719 bytes
 .../speaker-notes-afterseps/deleted-layouts.pptx    | Bin 54484 -> 54429 bytes
 .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65173 -> 65119 bytes
 test/pptx/speaker-notes-afterseps/output.pptx       | Bin 51609 -> 51548 bytes
 test/pptx/speaker-notes-afterseps/templated.pptx    | Bin 64671 -> 64614 bytes
 test/pptx/speaker-notes/deleted-layouts.pptx        | Bin 38291 -> 38236 bytes
 test/pptx/speaker-notes/moved-layouts.pptx          | Bin 49054 -> 48929 bytes
 test/pptx/speaker-notes/output.pptx                 | Bin 35412 -> 35358 bytes
 test/pptx/speaker-notes/templated.pptx              | Bin 48560 -> 48423 bytes
 test/pptx/start-numbering-at/deleted-layouts.pptx   | Bin 29873 -> 31521 bytes
 test/pptx/start-numbering-at/moved-layouts.pptx     | Bin 40630 -> 42209 bytes
 test/pptx/start-numbering-at/output.pptx            | Bin 26991 -> 28643 bytes
 test/pptx/start-numbering-at/templated.pptx         | Bin 40142 -> 41709 bytes
 test/pptx/tables/deleted-layouts.pptx               | Bin 30417 -> 32065 bytes
 test/pptx/tables/moved-layouts.pptx                 | Bin 41174 -> 42753 bytes
 test/pptx/tables/output.pptx                        | Bin 27532 -> 29184 bytes
 test/pptx/tables/templated.pptx                     | Bin 40686 -> 42253 bytes
 test/pptx/two-column/deleted-layouts.pptx           | Bin 28919 -> 30568 bytes
 test/pptx/two-column/moved-layouts.pptx             | Bin 39676 -> 41256 bytes
 test/pptx/two-column/output.pptx                    | Bin 26038 -> 27689 bytes
 test/pptx/two-column/templated.pptx                 | Bin 39189 -> 40756 bytes
 145 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'test/pptx/slide-level-0/h1-with-image/templated.pptx')

diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
index 0b6ca50c2..43f94b247 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -239,8 +239,8 @@ alwaysInheritedPatterns =
               , "ppt/slideLayouts/_rels/slideLayout*.xml.rels"
               , "ppt/slideMasters/slideMaster1.xml"
               , "ppt/slideMasters/_rels/slideMaster1.xml.rels"
-              , "ppt/theme/theme1.xml"
-              , "ppt/theme/_rels/theme1.xml.rels"
+              , "ppt/theme/theme*.xml"
+              , "ppt/theme/_rels/theme*.xml.rels"
               , "ppt/presProps.xml"
               , "ppt/tableStyles.xml"
               , "ppt/media/image*"
@@ -252,8 +252,6 @@ contingentInheritedPatterns pres = [] <>
   if presHasSpeakerNotes pres
   then map compile [ "ppt/notesMasters/notesMaster*.xml"
                    , "ppt/notesMasters/_rels/notesMaster*.xml.rels"
-                   , "ppt/theme/theme2.xml"
-                   , "ppt/theme/_rels/theme2.xml.rels"
                    ]
   else []
 
diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx
index 100da7c7f..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 d142f045b..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 18f44c4cd..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 8beb704a4..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 98a1586df..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 fca99b672..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 ed5c77e05..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 4104f6230..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 98a1586df..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 fca99b672..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 ed5c77e05..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 4104f6230..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 fdcc7ce1d..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 a14eeb6c8..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 5e9c2c630..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 0e640f373..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 c7f78ac40..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 4d66b1310..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 aab0cc6f5..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 a03109217..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 6a5affdbf..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 88282fabb..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 477072fb4..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 431d22392..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 beed077f7..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 f86f5b043..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 a0eb5e847..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 a434ba29f..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 6a5affdbf..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 88282fabb..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 8de7d23b2..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 431d22392..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 bd7aa69b7..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 a01def95c..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 cb7843fce..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 32db19cbf..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 5fd7cf9b6..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 d5df2b751..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 6914162ff..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 a30a24453..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 b5afcc021..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 05806a767..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 b3e89757b..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 3b0fe64c3..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 e9e0551ac..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 77d706ed3..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 94a2e8b88..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 bef1921a7..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 68d3d7b9b..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 feade1096..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 efa814d65..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 ebd552252..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 a866f3c1f..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 8834f885f..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 de5e68151..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 d39dc0c91..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 1f52481f3..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 c1d2d5282..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 6bcbd1b9c..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 841ae8c42..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/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx
index 60110a64e..3e613e038 100644
Binary files a/test/pptx/endnotes-toc/deleted-layouts.pptx and b/test/pptx/endnotes-toc/deleted-layouts.pptx differ
diff --git a/test/pptx/endnotes-toc/moved-layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx
index d1200bd7d..e64cd9c77 100644
Binary files a/test/pptx/endnotes-toc/moved-layouts.pptx and b/test/pptx/endnotes-toc/moved-layouts.pptx differ
diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx
index a028b346f..bb431f511 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-toc/templated.pptx b/test/pptx/endnotes-toc/templated.pptx
index 38a0c437d..63b066f0d 100644
Binary files a/test/pptx/endnotes-toc/templated.pptx and b/test/pptx/endnotes-toc/templated.pptx differ
diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx
index 0b0bd2f53..1d7ccb928 100644
Binary files a/test/pptx/endnotes/deleted-layouts.pptx and b/test/pptx/endnotes/deleted-layouts.pptx differ
diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx
index 0d4c491b9..0f071207c 100644
Binary files a/test/pptx/endnotes/moved-layouts.pptx and b/test/pptx/endnotes/moved-layouts.pptx differ
diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx
index 9d46036fe..e4e661804 100644
Binary files a/test/pptx/endnotes/output.pptx and b/test/pptx/endnotes/output.pptx differ
diff --git a/test/pptx/endnotes/templated.pptx b/test/pptx/endnotes/templated.pptx
index 863cc29d4..a97a7eed8 100644
Binary files a/test/pptx/endnotes/templated.pptx and b/test/pptx/endnotes/templated.pptx differ
diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx
index 2f8754e90..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 7951a09f6..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 89325e577..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 7c0ed9a17..06b337538 100644
Binary files a/test/pptx/images/templated.pptx and b/test/pptx/images/templated.pptx differ
diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx
index 2fbe21a45..ac9fa4725 100644
Binary files a/test/pptx/inline-formatting/deleted-layouts.pptx and b/test/pptx/inline-formatting/deleted-layouts.pptx differ
diff --git a/test/pptx/inline-formatting/moved-layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx
index 427492130..49a2409d1 100644
Binary files a/test/pptx/inline-formatting/moved-layouts.pptx and b/test/pptx/inline-formatting/moved-layouts.pptx differ
diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx
index 473b9498d..f1a4a0a36 100644
Binary files a/test/pptx/inline-formatting/output.pptx and b/test/pptx/inline-formatting/output.pptx differ
diff --git a/test/pptx/inline-formatting/templated.pptx b/test/pptx/inline-formatting/templated.pptx
index dd778a102..6930b785c 100644
Binary files a/test/pptx/inline-formatting/templated.pptx and b/test/pptx/inline-formatting/templated.pptx differ
diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
index e527d3c5f..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 2947c3211..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 ffc2eb9f7..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 2493e7890..7af437bfe 100644
Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx differ
diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx
index 2da1b7a63..a7bd12281 100644
Binary files a/test/pptx/raw-ooxml/deleted-layouts.pptx and b/test/pptx/raw-ooxml/deleted-layouts.pptx differ
diff --git a/test/pptx/raw-ooxml/moved-layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx
index e58304172..614682671 100644
Binary files a/test/pptx/raw-ooxml/moved-layouts.pptx and b/test/pptx/raw-ooxml/moved-layouts.pptx differ
diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx
index 29164af15..841495315 100644
Binary files a/test/pptx/raw-ooxml/output.pptx and b/test/pptx/raw-ooxml/output.pptx differ
diff --git a/test/pptx/raw-ooxml/templated.pptx b/test/pptx/raw-ooxml/templated.pptx
index 0f20f9826..1dd23da2e 100644
Binary files a/test/pptx/raw-ooxml/templated.pptx and b/test/pptx/raw-ooxml/templated.pptx differ
diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx
index 51981b241..488abc02a 100644
Binary files a/test/pptx/remove-empty-slides/deleted-layouts.pptx and b/test/pptx/remove-empty-slides/deleted-layouts.pptx differ
diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx
index ddca32a52..1e1cf1e44 100644
Binary files a/test/pptx/remove-empty-slides/moved-layouts.pptx and b/test/pptx/remove-empty-slides/moved-layouts.pptx differ
diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx
index 9e8b5eed2..e2871a882 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/remove-empty-slides/templated.pptx b/test/pptx/remove-empty-slides/templated.pptx
index 579467452..c730b2103 100644
Binary files a/test/pptx/remove-empty-slides/templated.pptx and b/test/pptx/remove-empty-slides/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 2c891cd1d..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 8471b1d10..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 449339778..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 e2815159a..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 b63994cce..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 918264bc5..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 9dbfa41a0..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 b83f3f596..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 fbf4054be..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 90b3b94a6..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 e06d9079d..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 71ba99701..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-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
index 217b000b6..c315a7a7a 100644
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx 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
index d8a6c90fe..81b49936d 100644
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.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 512b324bf..3f815d830 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-h2-with-table/templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx
index 5ab88e94c..b270d2d4f 100644
Binary files a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/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 5be799e3b..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 395036069..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 2f3a53f5c..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 d306375e9..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/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
index 127dcea01..9d58c2c52 100644
Binary files a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx 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
index 197499bc3..62424de73 100644
Binary files a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-table/moved-layouts.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 44dbbf90c..d30fd88c3 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/h1-with-table/templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx
index 87b45dda2..eb2a78647 100644
Binary files a/test/pptx/slide-level-0/h1-with-table/templated.pptx and b/test/pptx/slide-level-0/h1-with-table/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 5be799e3b..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 395036069..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 948659d6a..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 d306375e9..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 48f75ae42..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 8f7aee710..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 7fe3d3ae7..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 a9e883ada..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 831d37446..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 7ba1c3a11..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 bcb5dd214..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 010c4cce4..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 de607ae41..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 8eb81bee1..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 4288b84b6..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 96338a2b5..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 558bb7930..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 283170569..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 f0e51e597..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 27df2d994..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 68b4215df..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 e1b2d4de8..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 4320128b3..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 efc56ac7a..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 d533d3c28..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 56608a039..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 e41219844..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 0a8c3e8d9..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/deleted-layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx
index 9622ed2cd..1d7bd87d3 100644
Binary files a/test/pptx/two-column/deleted-layouts.pptx and b/test/pptx/two-column/deleted-layouts.pptx differ
diff --git a/test/pptx/two-column/moved-layouts.pptx b/test/pptx/two-column/moved-layouts.pptx
index a17f96b18..71760268c 100644
Binary files a/test/pptx/two-column/moved-layouts.pptx and b/test/pptx/two-column/moved-layouts.pptx differ
diff --git a/test/pptx/two-column/output.pptx b/test/pptx/two-column/output.pptx
index 270a7eeac..396dc2a74 100644
Binary files a/test/pptx/two-column/output.pptx and b/test/pptx/two-column/output.pptx differ
diff --git a/test/pptx/two-column/templated.pptx b/test/pptx/two-column/templated.pptx
index 6d9470372..8901695b1 100644
Binary files a/test/pptx/two-column/templated.pptx and b/test/pptx/two-column/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/slide-level-0/h1-with-image/templated.pptx')

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/slide-level-0/h1-with-image/templated.pptx')

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/slide-level-0/h1-with-image/templated.pptx')

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