From 62f83aa48633af477913bde6f615fe9f8793901a Mon Sep 17 00:00:00 2001 From: John MacFarlane 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(-) 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