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

Allow --section-divs with slidy output.

Browse source
This commit is contained in:
John MacFarlane 2011-04-13 18:36:21 -07:00
parent b7a2772d62
commit 220bd121d8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Text/Pandoc/Writers/HTML.hs
View file

@ -105,10 +105,6 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do
date <- if standalone
then inlineListToHtml opts date'
else return noHtml
let sects = hierarchicalize blocks
toc <- if writerTableOfContents opts
then tableOfContents opts sects
else return Nothing
let startSlide = RawBlock "html" "<div class=\"slide\">\n"
endSlide = RawBlock "html" "</div>\n"
let cutUp (HorizontalRule : Header 1 ys : xs) = cutUp (Header 1 ys : xs)
@ -123,10 +119,14 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do
cutUp xs ++ [endSlide]
_ -> [startSlide] ++ cutUp blocks ++
[endSlide]
let sects = if writerSlideVariant opts `elem` [SlidySlides, S5Slides]
then hierarchicalize slides
else hierarchicalize blocks
toc <- if writerTableOfContents opts
then tableOfContents opts sects
else return Nothing
blocks' <- liftM (toHtmlFromList . intersperse (nl opts)) $
if writerSlideVariant opts `elem` [SlidySlides, S5Slides]
then mapM (blockToHtml opts) slides
else mapM (elementToHtml opts) sects
mapM (elementToHtml opts) sects
st <- get
let notes = reverse (stNotes st)
let thebody = blocks' +++ footnoteSection opts notes
@ -238,12 +238,12 @@ elementToHtml opts (Sec level num id' title' elements) = do
modify $ \st -> st{stSecNum = num} -- update section number
header' <- blockToHtml opts (Header level title')
innerContents <- mapM (elementToHtml opts) elements
let slides = writerSlideVariant opts `elem` [SlidySlides, S5Slides]
let s5 = writerSlideVariant opts == S5Slides
let header'' = header' ! [prefixedId opts id' |
not (writerStrictMarkdown opts ||
writerSectionDivs opts || slides)]
writerSectionDivs opts || s5)]
let stuff = header'' : innerContents
return $ if slides -- S5 gets confused by the extra divs around sections
return $ if s5 -- S5 gets confused by the extra divs around sections
then toHtmlFromList $ intersperse (nl opts) stuff
else if writerSectionDivs opts
then if writerHtml5 opts