Powerpoint writer: avoid extra blank lines before author.

(In the case where there is no subtitle.) Closes #10619.
jgm · Feb 13, 2025 · f5d41a0 · f5d41a0
1 parent 54039e3
commit f5d41a0
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 1 deletion.
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -1752,7 +1752,9 @@ metadataToElement layout titleElems subtitleElems authorsElems dateElems
   , Just cSld <- findChild (elemName ns "p" "cSld") layout
   , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do
       let combinedAuthorElems = intercalate [Break] authorsElems
-          subtitleAndAuthorElems = intercalate [Break, Break] [subtitleElems, combinedAuthorElems]
+          subtitleAndAuthorElems = intercalate [Break, Break] $
+                                    filter (not . null)
+                                     [subtitleElems, combinedAuthorElems]
       (titleId, titleElement) <- nonBodyTextToElement layout [PHType "ctrTitle"] titleElems
       (subtitleId, subtitleElement) <- nonBodyTextToElement layout [PHType "subTitle"] subtitleAndAuthorElems
       (dateId, dateElement) <- nonBodyTextToElement layout [PHType "dt"] dateElems

diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
diff --git a/test/pptx/layouts/deleted.pptx b/test/pptx/layouts/deleted.pptx
diff --git a/test/pptx/layouts/moved.pptx b/test/pptx/layouts/moved.pptx
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx