cb1ee07 · typeable/pandoc

git.iko.soy/typeable/pandoc

Powerpoint writer: Keep notes with related blocks

Some blocks automatically split slides (imgs, tables, `column` divs). We assume that any speaker notes immediately following these are connected to these elements, and keep them with the related blocks, splitting after them.

commitcb1ee07c9819bafa48a62c518e94cc95281697c1 authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 21 Mar 2018, 09:02 (9 years ago) parent532cfcc

1 file changed+17−8

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+17−8

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+17−8

@@ -575,6 +575,10 @@ isImage Image{} = True

575575isImage (Link _ (Image{} : _) _) = True

576576isImage _ = False

577577

578+isNotesDiv :: Block -> Bool

579+isNotesDiv (Div (_, ["notes"], _) _) = True

580+isNotesDiv _ = False

581+

578582splitBlocks' :: [Block] -> [[Block]] -> [Block] -> Pres [[Block]]

579583splitBlocks' cur acc [] = return $ acc ++ (if null cur then [] else [cur])

580584splitBlocks' cur acc (HorizontalRule : blks) =

@@ -590,26 +594,31 @@ splitBlocks' cur acc (h@(Header n _ _) : blks) = do

590594splitBlocks' cur acc (Plain ils : blks) = splitBlocks' cur acc (Para ils : blks)

591595splitBlocks' cur acc (Para (il:ils) : blks) | isImage il = do

592596 slideLevel <- asks envSlideLevel

597+ let (nts, blks') = if null ils

598+ then span isNotesDiv blks

599+ else ([], blks)

593600 case cur of

594601 [Header n _ _] | n == slideLevel ->

595602 splitBlocks' []

596− (acc ++ [cur ++ [Para [il]]])

597− (if null ils then blks else Para ils : blks)

603+ (acc ++ [cur ++ [Para [il]] ++ nts])

604+ (if null ils then blks' else Para ils : blks')

598605 _ -> splitBlocks' []

599− (acc ++ (if null cur then [] else [cur]) ++ [[Para [il]]])

600− (if null ils then blks else Para ils : blks)

606+ (acc ++ (if null cur then [] else [cur]) ++ [[Para [il]] ++ nts])

607+ (if null ils then blks' else Para ils : blks')

601608splitBlocks' cur acc (tbl@Table{} : blks) = do

602609 slideLevel <- asks envSlideLevel

610+ let (nts, blks') = span isNotesDiv blks

603611 case cur of

604612 [Header n _ _] | n == slideLevel ->

605− splitBlocks' [] (acc ++ [cur ++ [tbl]]) blks

606− _ -> splitBlocks' [] (acc ++ (if null cur then [] else [cur]) ++ [[tbl]]) blks

613+ splitBlocks' [] (acc ++ [cur ++ [tbl] ++ nts]) blks'

614+ _ -> splitBlocks' [] (acc ++ (if null cur then [] else [cur]) ++ [[tbl] ++ nts]) blks'

607615splitBlocks' cur acc (d@(Div (_, classes, _) _): blks) | "columns" `elem` classes = do

608616 slideLevel <- asks envSlideLevel

617+ let (nts, blks') = span isNotesDiv blks

609618 case cur of

610619 [Header n _ _] | n == slideLevel ->

611− splitBlocks' [] (acc ++ [cur ++ [d]]) blks

612− _ -> splitBlocks' [] (acc ++ (if null cur then [] else [cur]) ++ [[d]]) blks

620+ splitBlocks' [] (acc ++ [cur ++ [d] ++ nts]) blks'

621+ _ -> splitBlocks' [] (acc ++ (if null cur then [] else [cur]) ++ [[d] ++ nts]) blks'

613622splitBlocks' cur acc (blk : blks) = splitBlocks' (cur ++ [blk]) acc blks

614623

615624splitBlocks :: [Block] -> Pres [[Block]]