From 891ea3112b04409532ac7b7741bb63d0a7ce77d4 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Thu, 4 Apr 2019 10:36:58 -0400 Subject: PowerPoint writer: Always open up in slide view When editing a template/reference-doc, the user might be in Master view, but when producing a slide show, it is assumed that slide view will be desired. This removes the "lastView" attr from the viewProps.xml slide so that the presentation will always open up in slide view. Note this requires creating a new "ppt/viewProps.xml" instead of just moving over the old one from the viewProps file. Since this produces a slightly different order of xml files in the content manifest, the golden files will have to be rebuilt. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 34 +++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'src/Text/Pandoc/Writers/Powerpoint/Output.hs') diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index da7106325..a45c09bd4 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -166,7 +166,6 @@ alwaysInheritedPatterns = , "ppt/theme/theme1.xml" , "ppt/theme/_rels/theme1.xml.rels" , "ppt/presProps.xml" - , "ppt/viewProps.xml" , "ppt/tableStyles.xml" , "ppt/media/image*" ] @@ -213,7 +212,6 @@ requiredFiles = [ "docProps/app.xml" , "ppt/slideMasters/slideMaster1.xml" , "ppt/slideMasters/_rels/slideMaster1.xml.rels" , "ppt/theme/theme1.xml" - , "ppt/viewProps.xml" , "ppt/tableStyles.xml" ] @@ -231,6 +229,8 @@ presentationToArchiveP p@(Presentation docProps slides) = do ) newArch' <- foldM copyFileToArchive emptyArchive filePaths + -- we make a modified ppt/viewProps.xml out of the presentation viewProps + viewPropsEntry <- makeViewPropsEntry -- we make a docProps/core.xml entry out of the presentation docprops docPropsEntry <- docPropsToEntry docProps -- we make a docProps/custom.xml entry out of the custom properties @@ -258,7 +258,7 @@ presentationToArchiveP p@(Presentation docProps slides) = do spkNotesRelEntries ++ mediaEntries ++ [contentTypesEntry, docPropsEntry, docCustomPropsEntry, relsEntry, - presEntry, presRelsEntry] + presEntry, presRelsEntry, viewPropsEntry] makeSlideIdMap :: Presentation -> M.Map SlideId Int makeSlideIdMap (Presentation _ slides) = @@ -1701,6 +1701,23 @@ docCustomPropsToEntry :: PandocMonad m => DocProps -> P m Entry docCustomPropsToEntry docProps = docCustomPropsElement docProps >>= elemToEntry "docProps/custom.xml" +-- We read from the template, but we remove the lastView, so it always +-- opens on slide view. Templates will sometimes be open in master +-- view for editing. +viewPropsElement :: PandocMonad m => P m Element +viewPropsElement = do + refArchive <- asks envRefArchive + distArchive <- asks envDistArchive + viewPrElement <- parseXml refArchive distArchive "ppt/viewProps.xml" + -- remove "lastView" if it exists: + let notLastView :: Text.XML.Light.Attr -> Bool + notLastView attr = (qName $ attrKey attr) /= "lastView" + return $ + viewPrElement {elAttribs = filter notLastView (elAttribs viewPrElement)} + +makeViewPropsEntry :: PandocMonad m => P m Entry +makeViewPropsEntry = viewPropsElement >>= elemToEntry "ppt/viewProps.xml" + defaultContentTypeToElem :: DefaultContentType -> Element defaultContentTypeToElem dct = mknode "Default" @@ -1787,9 +1804,11 @@ presentationToContentTypes p@(Presentation _ slides) = do (mapMaybe mediaFileContentType $ mediaFps) inheritedOverrides = mapMaybe pathToOverride filePaths - docPropsOverride = mapMaybe pathToOverride ["docProps/core.xml"] - docCustomPropsOverride = mapMaybe pathToOverride ["docProps/custom.xml"] - presOverride = mapMaybe pathToOverride ["ppt/presentation.xml"] + createdOverrides = mapMaybe pathToOverride [ "docProps/core.xml" + , "docProps/custom.xml" + , "ppt/presentation.xml" + , "ppt/viewProps.xml" + ] relativePaths <- mapM slideToFilePath slides let slideOverrides = mapMaybe (\fp -> pathToOverride $ "ppt/slides/" ++ fp) @@ -1797,8 +1816,7 @@ presentationToContentTypes p@(Presentation _ slides) = do speakerNotesOverrides <- (mapMaybe pathToOverride) <$> getSpeakerNotesFilePaths return $ ContentTypes (defaults ++ mediaDefaults) - (inheritedOverrides ++ docPropsOverride ++ docCustomPropsOverride ++ - presOverride ++ slideOverrides ++ speakerNotesOverrides) + (inheritedOverrides ++ createdOverrides ++ slideOverrides ++ speakerNotesOverrides) presML :: String presML = "application/vnd.openxmlformats-officedocument.presentationml" -- cgit v1.2.3