git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Appease compiler
576ed3fJesse Rosenthal
src/Text/Pandoc/Writers/Powerpoint.hs+11−8
@@ -192,11 +192,11 @@ data Slide = MetadataSlide { metadataSlideTitle :: [ParaElem]
192 , metadataSlideAuthors :: [[ParaElem]]
192 , metadataSlideAuthors :: [[ParaElem]]
193 , metadataSlideDate :: [ParaElem]
193 , metadataSlideDate :: [ParaElem]
194 }
194 }
195− | TitleSlide { slideHeader :: [ParaElem]}
195+ | TitleSlide { titleSlideHeader :: [ParaElem]}
196− | ContentSlide { slideHeader :: [ParaElem]
196+ | ContentSlide { contentSlideHeader :: [ParaElem]
197 , contentSlideContent :: [Shape]
197 , contentSlideContent :: [Shape]
198 }
198 }
199− | TwoColumnSlide { slideHeader :: [ParaElem]
199+ | TwoColumnSlide { twoColumnSlideHeader :: [ParaElem]
200 , twoColumnSlideLeft :: [Shape]
200 , twoColumnSlideLeft :: [Shape]
201 , twoColumnSlideRight :: [Shape]
201 , twoColumnSlideRight :: [Shape]
202 }
202 }
@@ -573,13 +573,16 @@ blocksToSlide' :: PandocMonad m => Int -> [Block] -> P m Slide
573blocksToSlide' lvl ((Header n _ ils) : blks)
573blocksToSlide' lvl ((Header n _ ils) : blks)
574 | n < lvl = do
574 | n < lvl = do
575 hdr <- inlinesToParElems ils
575 hdr <- inlinesToParElems ils
576− return $ TitleSlide {slideHeader = hdr}
576+ return $ TitleSlide {titleSlideHeader = hdr}
577 | n == lvl = do
577 | n == lvl = do
578 hdr <- inlinesToParElems ils
578 hdr <- inlinesToParElems ils
579 -- Now get the slide without the header, and then add the header
579 -- Now get the slide without the header, and then add the header
580 -- in.
580 -- in.
581 slide <- blocksToSlide' lvl blks
581 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
583blocksToSlide' _ (blk : blks)
586blocksToSlide' _ (blk : blks)
584 | Div (_, classes, _) divBlks <- blk
587 | Div (_, classes, _) divBlks <- blk
585 , "columns" `elem` classes
588 , "columns" `elem` classes
@@ -591,7 +594,7 @@ blocksToSlide' _ (blk : blks)
591 (mapM (P.report . BlockNotRendered) remaining >> return ())
594 (mapM (P.report . BlockNotRendered) remaining >> return ())
592 shapesL <- blocksToShapes blksL
595 shapesL <- blocksToShapes blksL
593 shapesR <- blocksToShapes blksR
596 shapesR <- blocksToShapes blksR
594− return $ TwoColumnSlide { slideHeader = []
597+ return $ TwoColumnSlide { twoColumnSlideHeader = []
595 , twoColumnSlideLeft = shapesL
598 , twoColumnSlideLeft = shapesL
596 , twoColumnSlideRight = shapesR
599 , twoColumnSlideRight = shapesR
597 }
600 }
@@ -600,10 +603,10 @@ blocksToSlide' _ (blk : blks) = do
600 shapes <- if inNoteSlide
603 shapes <- if inNoteSlide
601 then forceFontSize noteSize $ blocksToShapes (blk : blks)
604 then forceFontSize noteSize $ blocksToShapes (blk : blks)
602 else blocksToShapes (blk : blks)
605 else blocksToShapes (blk : blks)
603− return $ ContentSlide { slideHeader = []
606+ return $ ContentSlide { contentSlideHeader = []
604 , contentSlideContent = shapes
607 , contentSlideContent = shapes
605 }
608 }
606−blocksToSlide' _ [] = return $ ContentSlide { slideHeader = []
609+blocksToSlide' _ [] = return $ ContentSlide { contentSlideHeader = []
607 , contentSlideContent = []
610 , contentSlideContent = []
608 }
611 }
609
612