From 0abb858a999542df3337e942e76ca4f82a979490 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal <jrosenthal@jhu.edu> Date: Mon, 1 Apr 2019 17:01:07 -0400 Subject: [PATCH] PowerPoint writer: Remove handoutsMasterList from template presentation.xml We don't build it at the moment, so it was causing corruption. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index db16d5ada..da7106325 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1619,16 +1619,18 @@ presentationToPresentationElement pres@(Presentation _ slds) = do -- if there's a notesMasterIdLst in the presentation.xml file, -- we want to remove it. We then want to put our own, if - -- necessary, after the slideMasterIdLst element. + -- necessary, after the slideMasterIdLst element. We also remove + -- handouts master, since we don't want it. - removeNotesMaster' :: Content -> [Content] - removeNotesMaster' (Elem e) = case elName e of + removeUnwantedMaster' :: Content -> [Content] + removeUnwantedMaster' (Elem e) = case elName e of (QName "notesMasterIdLst" _ _) -> [] + (QName "handoutMasterIdLst" _ _) -> [] _ -> [Elem e] - removeNotesMaster' ct = [ct] + removeUnwantedMaster' ct = [ct] - removeNotesMaster :: [Content] -> [Content] - removeNotesMaster = concatMap removeNotesMaster' + removeUnwantedMaster :: [Content] -> [Content] + removeUnwantedMaster = concatMap removeUnwantedMaster' insertNotesMaster' :: Content -> [Content] insertNotesMaster' (Elem e) = case elName e of @@ -1642,7 +1644,7 @@ presentationToPresentationElement pres@(Presentation _ slds) = do else id newContent = insertNotesMaster $ - removeNotesMaster $ + removeUnwantedMaster $ map modifySldIdLst $ elContent element