From 8de261ba4e1e03f9dd5f78297d7299e9d78bbcfd Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Thu, 23 Sep 2021 16:01:38 +0100 Subject: pptx: Line up continuation paragraphs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit changes the `marL` and `indent` values used for plain paragraphs and numbered lists, and changes the spacing defined in the reference doc master for bulleted lists. For paragraphs, there is now a left-indent taken from the `otherStyle` in the master. For numbered lists, the number is positioned where the text would be if this were a plain paragraph, and the text is indented to the next level. This means that continuation paragraphs line up nicely with numbered lists. It also /mostly/ matches the observed PowerPoint behaviour when inserting paragraphs and numbered lists: the only difference is that PowerPoint was using a different margin value for the first level numbered lists – I’ve changed this to match the other levels, as I don’t think it makes the spacing unappealing and it allows continuation paragraphs at any level to line up. With bulleted lists, I’m keeping the observed PowerPoint behaviour of specifying only a level, letting `marL` and `indent` be automatically taken from `bodyStyle`. To that end, this commit changes the `bodyStyle` spacing in the master of the default reference doc, to: - line up the text of the first paragraph in each bullet with any continuation paragraphs - line up nested bullet markers in any continuation paragraphs with the first paragraph, matching lists and plain paragraphs This does mean the continuation paragraphs still won’t line up for anyone using their own reference doc where they haven’t matched the `otherStyle` and `bodyStyle` indent levels, but I think people in that situation will be able to troubleshoot. --- test/pptx/background-image/output.pptx | Bin 53358 -> 53318 bytes test/pptx/blanks/just-speaker-notes/output.pptx | Bin 32267 -> 32227 bytes test/pptx/blanks/nbsp-in-body/output.pptx | Bin 29205 -> 29165 bytes test/pptx/blanks/nbsp-in-heading/output.pptx | Bin 29205 -> 29165 bytes test/pptx/code-custom/output.pptx | Bin 29807 -> 29776 bytes test/pptx/code/output.pptx | Bin 29806 -> 29773 bytes test/pptx/comparison/both-columns/output.pptx | Bin 44570 -> 44530 bytes test/pptx/comparison/extra-image/output.pptx | Bin 44599 -> 44559 bytes test/pptx/comparison/extra-text/output.pptx | Bin 44570 -> 44530 bytes test/pptx/comparison/non-text-first/output.pptx | Bin 44484 -> 44444 bytes test/pptx/comparison/one-column/output.pptx | Bin 27902 -> 27862 bytes .../heading-text-image/output.pptx | Bin 44318 -> 44278 bytes .../content-with-caption/image-text/output.pptx | Bin 45019 -> 44979 bytes .../content-with-caption/text-image/output.pptx | Bin 44258 -> 44218 bytes .../pptx/document-properties-short-desc/output.pptx | Bin 28613 -> 28573 bytes test/pptx/document-properties/output.pptx | Bin 29015 -> 28976 bytes test/pptx/endnotes-toc/output.pptx | Bin 29399 -> 29363 bytes test/pptx/endnotes/output.pptx | Bin 28580 -> 28544 bytes test/pptx/images/output.pptx | Bin 46235 -> 46195 bytes test/pptx/incremental-lists/with-flag/output.pptx | Bin 77136 -> 77125 bytes .../pptx/incremental-lists/with-flag/templated.pptx | Bin 90251 -> 90277 bytes .../pptx/incremental-lists/without-flag/output.pptx | Bin 75386 -> 75374 bytes .../incremental-lists/without-flag/templated.pptx | Bin 88495 -> 88522 bytes test/pptx/inline-formatting/output.pptx | Bin 27772 -> 27736 bytes test/pptx/list-level/output.pptx | Bin 28635 -> 28632 bytes test/pptx/list-level/templated.pptx | Bin 41701 -> 41735 bytes test/pptx/lists/output.pptx | Bin 28657 -> 28639 bytes test/pptx/lists/templated.pptx | Bin 41724 -> 41742 bytes test/pptx/raw-ooxml/output.pptx | Bin 28560 -> 28524 bytes test/pptx/remove-empty-slides/output.pptx | Bin 44994 -> 44958 bytes test/pptx/slide-breaks-slide-level-1/output.pptx | Bin 29354 -> 29314 bytes test/pptx/slide-breaks-toc/output.pptx | Bin 31123 -> 31087 bytes test/pptx/slide-breaks/output.pptx | Bin 30179 -> 30139 bytes .../pptx/slide-level-0/h1-h2-with-table/output.pptx | Bin 27907 -> 27871 bytes test/pptx/slide-level-0/h1-with-image/output.pptx | Bin 44242 -> 44202 bytes test/pptx/slide-level-0/h1-with-table/output.pptx | Bin 27814 -> 27778 bytes test/pptx/slide-level-0/h2-with-image/output.pptx | Bin 44242 -> 44202 bytes test/pptx/speaker-notes-after-metadata/output.pptx | Bin 31617 -> 31577 bytes test/pptx/speaker-notes-afterheader/output.pptx | Bin 30629 -> 30589 bytes test/pptx/speaker-notes-afterseps/output.pptx | Bin 51486 -> 51450 bytes test/pptx/speaker-notes/output.pptx | Bin 35329 -> 35289 bytes test/pptx/start-numbering-at/output.pptx | Bin 28620 -> 28605 bytes test/pptx/start-numbering-at/templated.pptx | Bin 41686 -> 41707 bytes test/pptx/tables/output.pptx | Bin 29160 -> 29122 bytes test/pptx/two-column/all-text/output.pptx | Bin 27689 -> 27649 bytes test/pptx/two-column/text-and-image/output.pptx | Bin 45510 -> 45470 bytes 46 files changed, 0 insertions(+), 0 deletions(-) (limited to 'test') diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx index abe82ebc2..1e678e0a4 100644 Binary files a/test/pptx/background-image/output.pptx and b/test/pptx/background-image/output.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx index 0c4ed20fa..9a36ccf1f 100644 Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx index 6265c842f..08c764feb 100644 Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx index 6265c842f..08c764feb 100644 Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx index 6c7a1a9ab..1e5085e9c 100644 Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx index 8fd00ff74..a3f31dfdc 100644 Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx index 47f807754..efb67f2e7 100644 Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx index f700e09a8..e26e5b49c 100644 Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx index 47f807754..efb67f2e7 100644 Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx index c8a2bd0e3..f36c53ddb 100644 Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx index e70dd2326..8d9031ac8 100644 Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx index 0677879aa..6802b7361 100644 Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx index f461b6ed3..0bd64e340 100644 Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx index be376c1ed..a0d8806c0 100644 Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx index 737ca7e8d..418d158ca 100644 Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx index ef05c01b5..55ca48b5d 100644 Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx index bb431f511..a6cc2db24 100644 Binary files a/test/pptx/endnotes-toc/output.pptx and b/test/pptx/endnotes-toc/output.pptx differ diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx index e4e661804..ea29cbcf8 100644 Binary files a/test/pptx/endnotes/output.pptx and b/test/pptx/endnotes/output.pptx differ diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx index 9b04881f3..098547e87 100644 Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx index 82f5f926f..230d29253 100644 Binary files a/test/pptx/incremental-lists/with-flag/output.pptx and b/test/pptx/incremental-lists/with-flag/output.pptx differ diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx index e8482b25f..263d9c355 100644 Binary files a/test/pptx/incremental-lists/with-flag/templated.pptx and b/test/pptx/incremental-lists/with-flag/templated.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx index 62e66e1fe..450cd16ea 100644 Binary files a/test/pptx/incremental-lists/without-flag/output.pptx and b/test/pptx/incremental-lists/without-flag/output.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx index ac7be9564..e7ab48aa0 100644 Binary files a/test/pptx/incremental-lists/without-flag/templated.pptx and b/test/pptx/incremental-lists/without-flag/templated.pptx differ diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx index f1a4a0a36..7744b7d2e 100644 Binary files a/test/pptx/inline-formatting/output.pptx and b/test/pptx/inline-formatting/output.pptx differ diff --git a/test/pptx/list-level/output.pptx b/test/pptx/list-level/output.pptx index 5e3506958..02c609b40 100644 Binary files a/test/pptx/list-level/output.pptx and b/test/pptx/list-level/output.pptx differ diff --git a/test/pptx/list-level/templated.pptx b/test/pptx/list-level/templated.pptx index 8853a3082..a7b23ccf9 100644 Binary files a/test/pptx/list-level/templated.pptx and b/test/pptx/list-level/templated.pptx differ diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx index e23f47218..857a3e28c 100644 Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx index 290b5b519..5510a7123 100644 Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx differ diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx index 841495315..1813bbd28 100644 Binary files a/test/pptx/raw-ooxml/output.pptx and b/test/pptx/raw-ooxml/output.pptx differ diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx index e2871a882..d0d5e824c 100644 Binary files a/test/pptx/remove-empty-slides/output.pptx and b/test/pptx/remove-empty-slides/output.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx index cb65ab335..d443bc04e 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx index f2660ef93..e24b45e12 100644 Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx index 7c2c7db5e..a5208ecf8 100644 Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx index 3f815d830..bd772d44e 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx index 70fc6aee2..1102f549c 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx index d30fd88c3..c0bc6b162 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/output.pptx and b/test/pptx/slide-level-0/h1-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx index 70fc6aee2..1102f549c 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx index f68d6f0ef..4e5635e0c 100644 Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx index 9df78756b..f59b29f6a 100644 Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx index b54ba4465..aad79e3dc 100644 Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx index 6ae003d7a..7b44c50c2 100644 Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx index ecfc6901a..e08d300e5 100644 Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx index f3f46ef30..30a097eb8 100644 Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx index 4398e35be..407062ca3 100644 Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx index 45f651ceb..8a1dce949 100644 Binary files a/test/pptx/two-column/all-text/output.pptx and b/test/pptx/two-column/all-text/output.pptx differ diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx index aab0b3b59..e45bf3d58 100644 Binary files a/test/pptx/two-column/text-and-image/output.pptx and b/test/pptx/two-column/text-and-image/output.pptx differ -- cgit v1.2.3