aboutsummaryrefslogtreecommitdiff
path: root/test/pptx
diff options
context:
space:
mode:
authorEmily Bourke <undergroundquizscene@protonmail.com>2021-09-23 16:01:38 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2021-10-17 17:24:30 -0700
commit8de261ba4e1e03f9dd5f78297d7299e9d78bbcfd (patch)
tree68e3b4f955eb32da99d94a7bad0cb2af862ac955 /test/pptx
parent8981872bcab239145518c7ca0567fb9031d1c422 (diff)
downloadpandoc-8de261ba4e1e03f9dd5f78297d7299e9d78bbcfd.tar.gz
pptx: Line up continuation paragraphs
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.
Diffstat (limited to 'test/pptx')
-rw-r--r--test/pptx/background-image/output.pptxbin53358 -> 53318 bytes
-rw-r--r--test/pptx/blanks/just-speaker-notes/output.pptxbin32267 -> 32227 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-body/output.pptxbin29205 -> 29165 bytes
-rw-r--r--test/pptx/blanks/nbsp-in-heading/output.pptxbin29205 -> 29165 bytes
-rw-r--r--test/pptx/code-custom/output.pptxbin29807 -> 29776 bytes
-rw-r--r--test/pptx/code/output.pptxbin29806 -> 29773 bytes
-rw-r--r--test/pptx/comparison/both-columns/output.pptxbin44570 -> 44530 bytes
-rw-r--r--test/pptx/comparison/extra-image/output.pptxbin44599 -> 44559 bytes
-rw-r--r--test/pptx/comparison/extra-text/output.pptxbin44570 -> 44530 bytes
-rw-r--r--test/pptx/comparison/non-text-first/output.pptxbin44484 -> 44444 bytes
-rw-r--r--test/pptx/comparison/one-column/output.pptxbin27902 -> 27862 bytes
-rw-r--r--test/pptx/content-with-caption/heading-text-image/output.pptxbin44318 -> 44278 bytes
-rw-r--r--test/pptx/content-with-caption/image-text/output.pptxbin45019 -> 44979 bytes
-rw-r--r--test/pptx/content-with-caption/text-image/output.pptxbin44258 -> 44218 bytes
-rw-r--r--test/pptx/document-properties-short-desc/output.pptxbin28613 -> 28573 bytes
-rw-r--r--test/pptx/document-properties/output.pptxbin29015 -> 28976 bytes
-rw-r--r--test/pptx/endnotes-toc/output.pptxbin29399 -> 29363 bytes
-rw-r--r--test/pptx/endnotes/output.pptxbin28580 -> 28544 bytes
-rw-r--r--test/pptx/images/output.pptxbin46235 -> 46195 bytes
-rw-r--r--test/pptx/incremental-lists/with-flag/output.pptxbin77136 -> 77125 bytes
-rw-r--r--test/pptx/incremental-lists/with-flag/templated.pptxbin90251 -> 90277 bytes
-rw-r--r--test/pptx/incremental-lists/without-flag/output.pptxbin75386 -> 75374 bytes
-rw-r--r--test/pptx/incremental-lists/without-flag/templated.pptxbin88495 -> 88522 bytes
-rw-r--r--test/pptx/inline-formatting/output.pptxbin27772 -> 27736 bytes
-rw-r--r--test/pptx/list-level/output.pptxbin28635 -> 28632 bytes
-rw-r--r--test/pptx/list-level/templated.pptxbin41701 -> 41735 bytes
-rw-r--r--test/pptx/lists/output.pptxbin28657 -> 28639 bytes
-rw-r--r--test/pptx/lists/templated.pptxbin41724 -> 41742 bytes
-rw-r--r--test/pptx/raw-ooxml/output.pptxbin28560 -> 28524 bytes
-rw-r--r--test/pptx/remove-empty-slides/output.pptxbin44994 -> 44958 bytes
-rw-r--r--test/pptx/slide-breaks-slide-level-1/output.pptxbin29354 -> 29314 bytes
-rw-r--r--test/pptx/slide-breaks-toc/output.pptxbin31123 -> 31087 bytes
-rw-r--r--test/pptx/slide-breaks/output.pptxbin30179 -> 30139 bytes
-rw-r--r--test/pptx/slide-level-0/h1-h2-with-table/output.pptxbin27907 -> 27871 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-image/output.pptxbin44242 -> 44202 bytes
-rw-r--r--test/pptx/slide-level-0/h1-with-table/output.pptxbin27814 -> 27778 bytes
-rw-r--r--test/pptx/slide-level-0/h2-with-image/output.pptxbin44242 -> 44202 bytes
-rw-r--r--test/pptx/speaker-notes-after-metadata/output.pptxbin31617 -> 31577 bytes
-rw-r--r--test/pptx/speaker-notes-afterheader/output.pptxbin30629 -> 30589 bytes
-rw-r--r--test/pptx/speaker-notes-afterseps/output.pptxbin51486 -> 51450 bytes
-rw-r--r--test/pptx/speaker-notes/output.pptxbin35329 -> 35289 bytes
-rw-r--r--test/pptx/start-numbering-at/output.pptxbin28620 -> 28605 bytes
-rw-r--r--test/pptx/start-numbering-at/templated.pptxbin41686 -> 41707 bytes
-rw-r--r--test/pptx/tables/output.pptxbin29160 -> 29122 bytes
-rw-r--r--test/pptx/two-column/all-text/output.pptxbin27689 -> 27649 bytes
-rw-r--r--test/pptx/two-column/text-and-image/output.pptxbin45510 -> 45470 bytes
46 files changed, 0 insertions, 0 deletions
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
index abe82ebc2..1e678e0a4 100644
--- a/test/pptx/background-image/output.pptx
+++ b/test/pptx/background-image/output.pptx
Binary files 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
--- a/test/pptx/blanks/just-speaker-notes/output.pptx
+++ b/test/pptx/blanks/just-speaker-notes/output.pptx
Binary files 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
--- a/test/pptx/blanks/nbsp-in-body/output.pptx
+++ b/test/pptx/blanks/nbsp-in-body/output.pptx
Binary files 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
--- a/test/pptx/blanks/nbsp-in-heading/output.pptx
+++ b/test/pptx/blanks/nbsp-in-heading/output.pptx
Binary files differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
index 6c7a1a9ab..1e5085e9c 100644
--- a/test/pptx/code-custom/output.pptx
+++ b/test/pptx/code-custom/output.pptx
Binary files differ
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
index 8fd00ff74..a3f31dfdc 100644
--- a/test/pptx/code/output.pptx
+++ b/test/pptx/code/output.pptx
Binary files differ
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
index 47f807754..efb67f2e7 100644
--- a/test/pptx/comparison/both-columns/output.pptx
+++ b/test/pptx/comparison/both-columns/output.pptx
Binary files differ
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
index f700e09a8..e26e5b49c 100644
--- a/test/pptx/comparison/extra-image/output.pptx
+++ b/test/pptx/comparison/extra-image/output.pptx
Binary files differ
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
index 47f807754..efb67f2e7 100644
--- a/test/pptx/comparison/extra-text/output.pptx
+++ b/test/pptx/comparison/extra-text/output.pptx
Binary files 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
--- a/test/pptx/comparison/non-text-first/output.pptx
+++ b/test/pptx/comparison/non-text-first/output.pptx
Binary files differ
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
index e70dd2326..8d9031ac8 100644
--- a/test/pptx/comparison/one-column/output.pptx
+++ b/test/pptx/comparison/one-column/output.pptx
Binary files 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
--- a/test/pptx/content-with-caption/heading-text-image/output.pptx
+++ b/test/pptx/content-with-caption/heading-text-image/output.pptx
Binary files 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
--- a/test/pptx/content-with-caption/image-text/output.pptx
+++ b/test/pptx/content-with-caption/image-text/output.pptx
Binary files 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
--- a/test/pptx/content-with-caption/text-image/output.pptx
+++ b/test/pptx/content-with-caption/text-image/output.pptx
Binary files 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
--- a/test/pptx/document-properties-short-desc/output.pptx
+++ b/test/pptx/document-properties-short-desc/output.pptx
Binary files differ
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
index ef05c01b5..55ca48b5d 100644
--- a/test/pptx/document-properties/output.pptx
+++ b/test/pptx/document-properties/output.pptx
Binary files differ
diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx
index bb431f511..a6cc2db24 100644
--- a/test/pptx/endnotes-toc/output.pptx
+++ b/test/pptx/endnotes-toc/output.pptx
Binary files differ
diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx
index e4e661804..ea29cbcf8 100644
--- a/test/pptx/endnotes/output.pptx
+++ b/test/pptx/endnotes/output.pptx
Binary files differ
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
index 9b04881f3..098547e87 100644
--- a/test/pptx/images/output.pptx
+++ b/test/pptx/images/output.pptx
Binary files 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
--- a/test/pptx/incremental-lists/with-flag/output.pptx
+++ b/test/pptx/incremental-lists/with-flag/output.pptx
Binary files 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
--- a/test/pptx/incremental-lists/with-flag/templated.pptx
+++ b/test/pptx/incremental-lists/with-flag/templated.pptx
Binary files 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
--- a/test/pptx/incremental-lists/without-flag/output.pptx
+++ b/test/pptx/incremental-lists/without-flag/output.pptx
Binary files 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
--- a/test/pptx/incremental-lists/without-flag/templated.pptx
+++ b/test/pptx/incremental-lists/without-flag/templated.pptx
Binary files differ
diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx
index f1a4a0a36..7744b7d2e 100644
--- a/test/pptx/inline-formatting/output.pptx
+++ b/test/pptx/inline-formatting/output.pptx
Binary files differ
diff --git a/test/pptx/list-level/output.pptx b/test/pptx/list-level/output.pptx
index 5e3506958..02c609b40 100644
--- a/test/pptx/list-level/output.pptx
+++ b/test/pptx/list-level/output.pptx
Binary files differ
diff --git a/test/pptx/list-level/templated.pptx b/test/pptx/list-level/templated.pptx
index 8853a3082..a7b23ccf9 100644
--- a/test/pptx/list-level/templated.pptx
+++ b/test/pptx/list-level/templated.pptx
Binary files differ
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
index e23f47218..857a3e28c 100644
--- a/test/pptx/lists/output.pptx
+++ b/test/pptx/lists/output.pptx
Binary files differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
index 290b5b519..5510a7123 100644
--- a/test/pptx/lists/templated.pptx
+++ b/test/pptx/lists/templated.pptx
Binary files differ
diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx
index 841495315..1813bbd28 100644
--- a/test/pptx/raw-ooxml/output.pptx
+++ b/test/pptx/raw-ooxml/output.pptx
Binary files differ
diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx
index e2871a882..d0d5e824c 100644
--- a/test/pptx/remove-empty-slides/output.pptx
+++ b/test/pptx/remove-empty-slides/output.pptx
Binary files 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
--- a/test/pptx/slide-breaks-slide-level-1/output.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/output.pptx
Binary files differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
index f2660ef93..e24b45e12 100644
--- a/test/pptx/slide-breaks-toc/output.pptx
+++ b/test/pptx/slide-breaks-toc/output.pptx
Binary files differ
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
index 7c2c7db5e..a5208ecf8 100644
--- a/test/pptx/slide-breaks/output.pptx
+++ b/test/pptx/slide-breaks/output.pptx
Binary files 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
--- a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
+++ b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
Binary files 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
--- a/test/pptx/slide-level-0/h1-with-image/output.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/output.pptx
Binary files 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
--- a/test/pptx/slide-level-0/h1-with-table/output.pptx
+++ b/test/pptx/slide-level-0/h1-with-table/output.pptx
Binary files 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
--- a/test/pptx/slide-level-0/h2-with-image/output.pptx
+++ b/test/pptx/slide-level-0/h2-with-image/output.pptx
Binary files 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
--- a/test/pptx/speaker-notes-after-metadata/output.pptx
+++ b/test/pptx/speaker-notes-after-metadata/output.pptx
Binary files differ
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index 9df78756b..f59b29f6a 100644
--- a/test/pptx/speaker-notes-afterheader/output.pptx
+++ b/test/pptx/speaker-notes-afterheader/output.pptx
Binary files differ
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index b54ba4465..aad79e3dc 100644
--- a/test/pptx/speaker-notes-afterseps/output.pptx
+++ b/test/pptx/speaker-notes-afterseps/output.pptx
Binary files differ
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
index 6ae003d7a..7b44c50c2 100644
--- a/test/pptx/speaker-notes/output.pptx
+++ b/test/pptx/speaker-notes/output.pptx
Binary files differ
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
index ecfc6901a..e08d300e5 100644
--- a/test/pptx/start-numbering-at/output.pptx
+++ b/test/pptx/start-numbering-at/output.pptx
Binary files differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index f3f46ef30..30a097eb8 100644
--- a/test/pptx/start-numbering-at/templated.pptx
+++ b/test/pptx/start-numbering-at/templated.pptx
Binary files differ
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
index 4398e35be..407062ca3 100644
--- a/test/pptx/tables/output.pptx
+++ b/test/pptx/tables/output.pptx
Binary files 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
--- a/test/pptx/two-column/all-text/output.pptx
+++ b/test/pptx/two-column/all-text/output.pptx
Binary files 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
--- a/test/pptx/two-column/text-and-image/output.pptx
+++ b/test/pptx/two-column/text-and-image/output.pptx
Binary files differ