git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Change reference to notesSlide to endNotesSlide

This will prevent confusion when speakers notes are implemented.

commitfcbec16e573e6f6bcab2775f48a3ad0a2e1a540f authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 17 Jan 2018, 08:22 (9 years ago) parent0482eda
1 file changed+11−11
src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+11−11
src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+11−11
@@ -580,8 +580,8 @@ forceFontSize px x = do
580580
581581-- We leave these as blocks because we will want to include them in
582582-- the TOC.
583−makeNotesSlideBlocks :: Pres [Block]
584−makeNotesSlideBlocks = do
583+makeEndNotesSlideBlocks :: Pres [Block]
584+makeEndNotesSlideBlocks = do
585585 noteIds <- gets stNoteIds
586586 slideLevel <- asks envSlideLevel
587587 meta <- asks envMetadata
@@ -730,25 +730,25 @@ blocksToPresentation blks = do
730730 bodyslides <- mapM
731731 (\(bs, n) -> local (\st -> st{envCurSlideId = n}) (blocksToSlide bs))
732732 (zip blksLst [bodyStartNum..])
733− let noteStartNum = bodyStartNum + length bodyslides
734− notesSlideBlocks <- makeNotesSlideBlocks
733+ let endNoteStartNum = bodyStartNum + length bodyslides
734+ endNotesSlideBlocks <- makeEndNotesSlideBlocks
735735 -- now we come back and make the real toc...
736736 tocSlides <- if writerTableOfContents opts
737− then do toc <- makeTOCSlide $ blks ++ notesSlideBlocks
737+ then do toc <- makeTOCSlide $ blks ++ endNotesSlideBlocks
738738 return [toc]
739739 else return []
740740 -- ... and the notes slide. We test to see if the blocks are empty,
741741 -- because we don't want to make an empty slide.
742− notesSlides <- if null notesSlideBlocks
742+ endNotesSlides <- if null endNotesSlideBlocks
743743 then return []
744− else do notesSlide <- local
745− (\env -> env { envCurSlideId = noteStartNum
744+ else do endNotesSlide <- local
745+ (\env -> env { envCurSlideId = endNoteStartNum
746746 , envInNoteSlide = True
747747 })
748− (blocksToSlide $ notesSlideBlocks)
749− return [notesSlide]
748+ (blocksToSlide $ endNotesSlideBlocks)
749+ return [endNotesSlide]
750750
751− let slides = metadataslides ++ tocSlides ++ bodyslides ++ notesSlides
751+ let slides = metadataslides ++ tocSlides ++ bodyslides ++ endNotesSlides
752752 slides' <- mapM (applyToSlide replaceAnchor) slides
753753 return $ Presentation slides'
754754