Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Powerpoint writer: Read notes into powerpoint Presentatation type.

Browse source 
We record notes in a map in state while processing.
This commit is contained in:
Jesse Rosenthal 2018-02-17 08:51:43 -05:00
parent 6fa6b6a5f2
commit d9e179d6fd
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
View file

@ -108,7 +108,7 @@ data WriterState = WriterState { stNoteIds :: M.Map Int [Block]
, stAnchorMap :: M.Map String SlideId , stAnchorMap :: M.Map String SlideId
, stSlideIdSet :: S.Set SlideId , stSlideIdSet :: S.Set SlideId
, stLog :: [LogMessage] , stLog :: [LogMessage]
, stSpeakerNotesMap :: M.Map SlideId [[Paragraph]]
} deriving (Show, Eq) } deriving (Show, Eq)
instance Default WriterState where instance Default WriterState where
@ -117,6 +117,7 @@ instance Default WriterState where
-- we reserve this s -- we reserve this s
, stSlideIdSet = reservedSlideIds , stSlideIdSet = reservedSlideIds
, stLog = [] , stLog = []
, stSpeakerNotesMap = mempty
} }
metadataSlideId :: SlideId metadataSlideId :: SlideId
@ -463,7 +464,15 @@ blockToParagraphs (DefinitionList entries) = do
definition <- concatMapM (blockToParagraphs . BlockQuote) blksLst definition <- concatMapM (blockToParagraphs . BlockQuote) blksLst
return $ term ++ definition return $ term ++ definition
concatMapM go entries concatMapM go entries
blockToParagraphs (Div (_, "notes" : [], _) _) = return [] blockToParagraphs (Div (_, "notes" : [], _) blks) = do
sldId <- asks envCurSlideId
spkNotesMap <- gets stSpeakerNotesMap
paras <- concatMapM blockToParagraphs blks
let spkNotesMap' = case M.lookup sldId spkNotesMap of
Just lst -> M.insert sldId (paras : lst) spkNotesMap
Nothing -> M.insert sldId [paras] spkNotesMap
modify $ \st -> st{stSpeakerNotesMap = spkNotesMap'}
return []
blockToParagraphs (Div _ blks) = concatMapM blockToParagraphs blks blockToParagraphs (Div _ blks) = concatMapM blockToParagraphs blks
blockToParagraphs blk = do blockToParagraphs blk = do
addLogMessage $ BlockNotRendered blk addLogMessage $ BlockNotRendered blk
@ -593,6 +602,12 @@ splitBlocks' cur acc (blk : blks) = splitBlocks' (cur ++ [blk]) acc blks
splitBlocks :: [Block] -> Pres [[Block]] splitBlocks :: [Block] -> Pres [[Block]]
splitBlocks = splitBlocks' [] [] splitBlocks = splitBlocks' [] []
getSpeakerNotes :: Pres (Maybe SpeakerNotes)
getSpeakerNotes = do
sldId <- asks envCurSlideId
spkNtsMap <- gets stSpeakerNotesMap
return $ (SpeakerNotes . concat . reverse) <$> (M.lookup sldId spkNtsMap)
blocksToSlide' :: Int -> [Block] -> Pres Slide blocksToSlide' :: Int -> [Block] -> Pres Slide
blocksToSlide' lvl (Header n (ident, _, _) ils : blks) blocksToSlide' lvl (Header n (ident, _, _) ils : blks)
| n < lvl = do | n < lvl = do
@ -664,7 +679,9 @@ blocksToSlide' _ [] = do
blocksToSlide :: [Block] -> Pres Slide blocksToSlide :: [Block] -> Pres Slide
blocksToSlide blks = do blocksToSlide blks = do
slideLevel <- asks envSlideLevel slideLevel <- asks envSlideLevel
blocksToSlide' slideLevel blks sld <- blocksToSlide' slideLevel blks
spkNotes <- getSpeakerNotes
return $ sld{slideSpeakerNotes = spkNotes}
makeNoteEntry :: Int -> [Block] -> [Block] makeNoteEntry :: Int -> [Block] -> [Block]
makeNoteEntry n blks = makeNoteEntry n blks =