4ce07c2 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Powerpoint writer: Set notes slide number correctly

4ce07c2Jesse Rosenthal9 years ago

src/Text/Pandoc/Writers/Powerpoint.hs+8−10

@@ -679,20 +679,18 @@ getMetaSlide = do

679

680blocksToPresentation :: PandocMonad m => [Block] -> P m Presentation

681blocksToPresentation blks = do

682− metadataslide <- getMetaSlide

682+ metadataslides <- maybeToList <$> getMetaSlide

683− let bodyStartNum = case metadataslide of

683+ let bodyStartNum = length metadataslides + 1

684− Just _ -> 2

685− Nothing -> 1

686 blksLst <- splitBlocks blks

684 blksLst <- splitBlocks blks

687− slides <- mapM

685+ bodyslides <- mapM

688− (\(bs, n) -> local (\st -> st{envCurSlideId = n}) (blocksToSlide bs))

686+ (\(bs, n) -> local (\st -> st{envCurSlideId = n}) (blocksToSlide bs))

689− (zip blksLst [bodyStartNum..])

687+ (zip blksLst [bodyStartNum..])

690− let noteSlidesNum = length blksLst + 1

688+ let noteStartNum = bodyStartNum + length bodyslides

691− noteSlides <- local (\st -> st {envCurSlideId = noteSlidesNum}) makeNotesSlides

689+ noteSlides <- local (\st -> st {envCurSlideId = noteStartNum}) makeNotesSlides

692 presSize <- asks envPresentationSize

690 presSize <- asks envPresentationSize

693 return $

691 return $

694 Presentation presSize $

692 Presentation presSize $

695− (maybeToList metadataslide) ++ slides ++ noteSlides

693+ metadataslides ++ bodyslides ++ noteSlides

696

694

697--------------------------------------------------------------------

695--------------------------------------------------------------------

698

696