git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Appease compiler
commit576ed3f41625c0b245ecbfdc47bf6d1878785365 authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 3 Jan 2018, 11:00 (9 years ago) parentdcc6e6b
1 file changed+11−8
src/Text/Pandoc/Writers/Powerpoint.hs+11−8
src/Text/Pandoc/Writers/Powerpoint.hs+11−8
@@ -192,11 +192,11 @@ data Slide = MetadataSlide { metadataSlideTitle :: [ParaElem]
192192 , metadataSlideAuthors :: [[ParaElem]]
193193 , metadataSlideDate :: [ParaElem]
194194 }
195− | TitleSlide { slideHeader :: [ParaElem]}
196− | ContentSlide { slideHeader :: [ParaElem]
195+ | TitleSlide { titleSlideHeader :: [ParaElem]}
196+ | ContentSlide { contentSlideHeader :: [ParaElem]
197197 , contentSlideContent :: [Shape]
198198 }
199− | TwoColumnSlide { slideHeader :: [ParaElem]
199+ | TwoColumnSlide { twoColumnSlideHeader :: [ParaElem]
200200 , twoColumnSlideLeft :: [Shape]
201201 , twoColumnSlideRight :: [Shape]
202202 }
@@ -573,13 +573,16 @@ blocksToSlide' :: PandocMonad m => Int -> [Block] -> P m Slide
573573blocksToSlide' lvl ((Header n _ ils) : blks)
574574 | n < lvl = do
575575 hdr <- inlinesToParElems ils
576− return $ TitleSlide {slideHeader = hdr}
576+ return $ TitleSlide {titleSlideHeader = hdr}
577577 | n == lvl = do
578578 hdr <- inlinesToParElems ils
579579 -- Now get the slide without the header, and then add the header
580580 -- in.
581581 slide <- blocksToSlide' lvl blks
582− return $ slide {slideHeader = hdr}
582+ return $ case slide of
583+ ContentSlide _ _ -> slide {contentSlideHeader = hdr}
584+ TwoColumnSlide _ _ _ -> slide {twoColumnSlideHeader = hdr}
585+ _ -> slide
583586blocksToSlide' _ (blk : blks)
584587 | Div (_, classes, _) divBlks <- blk
585588 , "columns" `elem` classes
@@ -591,7 +594,7 @@ blocksToSlide' _ (blk : blks)
591594 (mapM (P.report . BlockNotRendered) remaining >> return ())
592595 shapesL <- blocksToShapes blksL
593596 shapesR <- blocksToShapes blksR
594− return $ TwoColumnSlide { slideHeader = []
597+ return $ TwoColumnSlide { twoColumnSlideHeader = []
595598 , twoColumnSlideLeft = shapesL
596599 , twoColumnSlideRight = shapesR
597600 }
@@ -600,10 +603,10 @@ blocksToSlide' _ (blk : blks) = do
600603 shapes <- if inNoteSlide
601604 then forceFontSize noteSize $ blocksToShapes (blk : blks)
602605 else blocksToShapes (blk : blks)
603− return $ ContentSlide { slideHeader = []
606+ return $ ContentSlide { contentSlideHeader = []
604607 , contentSlideContent = shapes
605608 }
606−blocksToSlide' _ [] = return $ ContentSlide { slideHeader = []
609+blocksToSlide' _ [] = return $ ContentSlide { contentSlideHeader = []
607610 , contentSlideContent = []
608611 }
609612