diff options
Diffstat (limited to 'src/Text/Pandoc/Writers/Powerpoint')
-rw-r--r-- | src/Text/Pandoc/Writers/Powerpoint/Output.hs | 10 | ||||
-rw-r--r-- | src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 344a5564a..856dbfcd0 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -249,7 +249,7 @@ presentationToArchiveP p@(Presentation docProps slides) = do filePaths <- patternsToFilePaths $ inheritedPatterns p -- make sure all required files are available: - let missingFiles = filter (\fp -> not (fp `elem` filePaths)) requiredFiles + let missingFiles = filter (`notElem` filePaths) requiredFiles unless (null missingFiles) (throwError $ PandocSomeError $ @@ -1539,15 +1539,15 @@ slideToSlideRelEntry slide = do element <- slideToSlideRelElement slide elemToEntry ("ppt/slides/_rels/" <> idNumToFilePath idNum <> ".rels") element -linkRelElement :: PandocMonad m => Int -> LinkTarget -> P m Element -linkRelElement rIdNum (InternalTarget targetId) = do +linkRelElement :: PandocMonad m => (Int, LinkTarget) -> P m Element +linkRelElement (rIdNum, InternalTarget targetId) = do targetIdNum <- getSlideIdNum targetId return $ mknode "Relationship" [ ("Id", "rId" <> show rIdNum) , ("Type", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide") , ("Target", "slide" <> show targetIdNum <> ".xml") ] () -linkRelElement rIdNum (ExternalTarget (url, _)) = do +linkRelElement (rIdNum, ExternalTarget (url, _)) = do return $ mknode "Relationship" [ ("Id", "rId" <> show rIdNum) , ("Type", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") @@ -1556,7 +1556,7 @@ linkRelElement rIdNum (ExternalTarget (url, _)) = do ] () linkRelElements :: PandocMonad m => M.Map Int LinkTarget -> P m [Element] -linkRelElements mp = mapM (\(n, lnk) -> linkRelElement n lnk) (M.toList mp) +linkRelElements mp = mapM linkRelElement (M.toList mp) mediaRelElement :: MediaInfo -> Element mediaRelElement mInfo = diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 75ce0dd4e..d36c92fa3 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -712,8 +712,8 @@ blocksToSlide blks = do slideLevel <- asks envSlideLevel blocksToSlide' slideLevel blks' spkNotes -makeNoteEntry :: Int -> [Block] -> [Block] -makeNoteEntry n blks = +makeNoteEntry :: (Int, [Block]) -> [Block] +makeNoteEntry (n, blks) = let enum = Str (tshow n <> ".") in case blks of @@ -742,7 +742,7 @@ makeEndNotesSlideBlocks = do ls -> ls ident = Shared.uniqueIdent exts title anchorSet hdr = Header slideLevel (ident, [], []) title - blks = concatMap (\(n, bs) -> makeNoteEntry n bs) $ + blks = concatMap makeNoteEntry $ M.toList noteIds in return $ hdr : blks |