git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: remove some code duplication.
commit7c8a6feaf2d494b9623ef5af9022580a7e4c3c16 authorJesse Rosenthal <jrosenthal@jhu.edu> dateThu 4 Jan 2018, 09:46 (9 years ago) parent85f8d92
1 file changed+3−10
src/Text/Pandoc/Writers/Powerpoint.hs+3−10
src/Text/Pandoc/Writers/Powerpoint.hs+3−10
@@ -530,6 +530,9 @@ splitBlocks' cur acc (h@(Header n _ _) : blks) = do
530530 LT -> splitBlocks' [] (acc ++ (if null cur then [] else [cur]) ++ [[h]]) blks
531531 EQ -> splitBlocks' [h] (acc ++ (if null cur then [] else [cur])) blks
532532 GT -> splitBlocks' (cur ++ [h]) acc blks
533+-- `blockToParagraphs` treats Plain and Para the same, so we can save
534+-- some code duplication by treating them the same here.
535+splitBlocks' cur acc ((Plain ils) : blks) = splitBlocks' cur acc ((Para ils) : blks)
533536splitBlocks' cur acc ((Para (il:ils)) : blks) | isImage il = do
534537 slideLevel <- asks envSlideLevel
535538 case cur of
@@ -540,16 +543,6 @@ splitBlocks' cur acc ((Para (il:ils)) : blks) | isImage il = do
540543 _ -> splitBlocks' []
541544 (acc ++ (if null cur then [] else [cur]) ++ [[Para [il]]])
542545 (if null ils then blks else (Para ils) : blks)
543−splitBlocks' cur acc ((Plain (il:ils)) : blks) | isImage il = do
544− slideLevel <- asks envSlideLevel
545− case cur of
546− (Header n _ _) : [] | n == slideLevel ->
547− splitBlocks' []
548− (acc ++ [cur ++ [Plain [il]]])
549− (if null ils then blks else (Plain ils) : blks)
550− _ -> splitBlocks' []
551− (acc ++ (if null cur then [] else [cur]) ++ [[Plain [il]]])
552− (if null ils then blks else (Plain ils) : blks)
553546splitBlocks' cur acc (tbl@(Table _ _ _ _ _) : blks) = do
554547 slideLevel <- asks envSlideLevel
555548 case cur of