From 8e5a79f264dd1ebe80e048397b6281e318d25e82 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Fri, 20 Aug 2021 14:40:09 +0100 Subject: pptx: Make first heading title if slide level is 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the pptx writer adds a slide break before any table, “columns” div, or paragraph starting with an image, unless the only thing before it on the same slide is a heading at the slide level. In that case, the item and heading are kept on the same slide, and the heading is used as the slide title (inserted into the layout’s “title” placeholder). However, if the slide level is set to 0 (as was recently enabled) this makes it impossible to have a slide with a title which contains any of those items in its body. This commit changes this behaviour: now if the slide level is 0, then items will be kept with a heading of any level, if the heading’s the only thing before the item on the same slide. --- test/pptx/slide-level-0-h1-h2-with-table.native | 14 ++++++++++++++ test/pptx/slide-level-0-h1-h2-with-table.pptx | Bin 0 -> 26985 bytes .../slide-level-0-h1-h2-with-table_deleted_layouts.pptx | Bin 0 -> 29828 bytes .../slide-level-0-h1-h2-with-table_moved_layouts.pptx | Bin 0 -> 40552 bytes test/pptx/slide-level-0-h1-h2-with-table_templated.pptx | Bin 0 -> 40052 bytes test/pptx/slide-level-0-h1-with-image.native | 2 ++ test/pptx/slide-level-0-h1-with-image.pptx | Bin 0 -> 42596 bytes .../slide-level-0-h1-with-image_deleted_layouts.pptx | Bin 0 -> 45433 bytes .../pptx/slide-level-0-h1-with-image_moved_layouts.pptx | Bin 0 -> 56156 bytes test/pptx/slide-level-0-h1-with-image_templated.pptx | Bin 0 -> 55657 bytes test/pptx/slide-level-0-h1-with-table.native | 13 +++++++++++++ test/pptx/slide-level-0-h1-with-table.pptx | Bin 0 -> 26166 bytes .../slide-level-0-h1-with-table_deleted_layouts.pptx | Bin 0 -> 29008 bytes .../pptx/slide-level-0-h1-with-table_moved_layouts.pptx | Bin 0 -> 39731 bytes test/pptx/slide-level-0-h1-with-table_templated.pptx | Bin 0 -> 39232 bytes test/pptx/slide-level-0-h2-with-image.native | 2 ++ test/pptx/slide-level-0-h2-with-image.pptx | Bin 0 -> 42596 bytes .../slide-level-0-h2-with-image_deleted_layouts.pptx | Bin 0 -> 45433 bytes .../pptx/slide-level-0-h2-with-image_moved_layouts.pptx | Bin 0 -> 56156 bytes test/pptx/slide-level-0-h2-with-image_templated.pptx | Bin 0 -> 55657 bytes 20 files changed, 31 insertions(+) create mode 100644 test/pptx/slide-level-0-h1-h2-with-table.native create mode 100644 test/pptx/slide-level-0-h1-h2-with-table.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_templated.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image.native create mode 100644 test/pptx/slide-level-0-h1-with-image.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_templated.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table.native create mode 100644 test/pptx/slide-level-0-h1-with-table.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_templated.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image.native create mode 100644 test/pptx/slide-level-0-h2-with-image.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_templated.pptx (limited to 'test/pptx') diff --git a/test/pptx/slide-level-0-h1-h2-with-table.native b/test/pptx/slide-level-0-h1-h2-with-table.native new file mode 100644 index 000000000..c6e65ecf5 --- /dev/null +++ b/test/pptx/slide-level-0-h1-h2-with-table.native @@ -0,0 +1,14 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Header 2 ("there",[],[]) [Str "There"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0-h1-h2-with-table.pptx b/test/pptx/slide-level-0-h1-h2-with-table.pptx new file mode 100644 index 000000000..197a6833f Binary files /dev/null and b/test/pptx/slide-level-0-h1-h2-with-table.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 new file mode 100644 index 000000000..5e776e05c Binary files /dev/null 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 new file mode 100644 index 000000000..35204de1b Binary files /dev/null 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_templated.pptx b/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx new file mode 100644 index 000000000..5c659952e Binary files /dev/null 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.native b/test/pptx/slide-level-0-h1-with-image.native new file mode 100644 index 000000000..0f5033b54 --- /dev/null +++ b/test/pptx/slide-level-0-h1-with-image.native @@ -0,0 +1,2 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h1-with-image.pptx b/test/pptx/slide-level-0-h1-with-image.pptx new file mode 100644 index 000000000..2f3a53f5c Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-image.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 new file mode 100644 index 000000000..16c61d1be Binary files /dev/null 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 new file mode 100644 index 000000000..395036069 Binary files /dev/null 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_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 diff --git a/test/pptx/slide-level-0-h1-with-table.native b/test/pptx/slide-level-0-h1-with-table.native new file mode 100644 index 000000000..b961e900d --- /dev/null +++ b/test/pptx/slide-level-0-h1-with-table.native @@ -0,0 +1,13 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0-h1-with-table.pptx b/test/pptx/slide-level-0-h1-with-table.pptx new file mode 100644 index 000000000..44dbbf90c Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table.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 new file mode 100644 index 000000000..0eb7c0b08 Binary files /dev/null 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 new file mode 100644 index 000000000..197499bc3 Binary files /dev/null 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_templated.pptx b/test/pptx/slide-level-0-h1-with-table_templated.pptx new file mode 100644 index 000000000..87b45dda2 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table_templated.pptx differ diff --git a/test/pptx/slide-level-0-h2-with-image.native b/test/pptx/slide-level-0-h2-with-image.native new file mode 100644 index 000000000..5def0cb92 --- /dev/null +++ b/test/pptx/slide-level-0-h2-with-image.native @@ -0,0 +1,2 @@ +[Header 2 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h2-with-image.pptx b/test/pptx/slide-level-0-h2-with-image.pptx new file mode 100644 index 000000000..948659d6a Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image.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 new file mode 100644 index 000000000..afc096ce6 Binary files /dev/null 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 new file mode 100644 index 000000000..395036069 Binary files /dev/null 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_templated.pptx b/test/pptx/slide-level-0-h2-with-image_templated.pptx new file mode 100644 index 000000000..d306375e9 Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image_templated.pptx differ -- cgit v1.2.3