@@ -105,21 +105,23 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do
105105 toc <- if writerTableOfContents opts
106106 then tableOfContents opts sects
107107 else return Nothing
108+ let startSlide = RawHtml "<div class=\"slide\">\n"
109+ endSlide = RawHtml "</div>\n"
108110 let cutUp (HorizontalRule : Header 1 ys : xs) = cutUp (Header 1 ys : xs)
109− cutUp (HorizontalRule : xs) = RawHtml "</div>\n<div class=\"slide\">\n" :
110− cutUp xs
111− cutUp (Header 1 ys : xs) = RawHtml ("</div>\n<div class=\"slide title\">\n") :
112− Header 1 ys : cutUp xs
111+ cutUp (HorizontalRule : xs) = [endSlide, startSlide] ++ cutUp xs
112+ cutUp (Header 1 ys : xs) = [endSlide, startSlide] ++
113+ (Header 1 ys : cutUp xs)
113114 cutUp (x:xs) = x : cutUp xs
114115 cutUp [] = []
115− let preamble = case blocks of
116− (HorizontalRule : _) -> []
117− (Header 1 _ : _) -> []
118− _ -> [RawHtml "<div class=\"slide\">\n"]
116+ let slides = case blocks of
117+ (HorizontalRule : xs) -> [startSlide] ++ cutUp xs ++ [endSlide]
118+ (Header 1 ys : xs) -> [startSlide, Header 1 ys] ++
119+ cutUp xs ++ [endSlide]
120+ _ -> [startSlide] ++ cutUp blocks ++
121+ [endSlide]
119122 blocks' <- liftM toHtmlFromList $
120123 if writerSlideVariant opts `elem` [SlidySlides, S5Slides]
121− then mapM (blockToHtml opts) $ preamble ++
122− cutUp blocks ++ [RawHtml "</div>"]
124+ then mapM (blockToHtml opts) slides
123125 else mapM (elementToHtml opts) sects
124126 st <- get
125127 let notes = reverse (stNotes st)