From fb6e7989170ac73e75f6ecdf79b8aaca5d353c76 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 23 Jul 2012 22:58:16 -0700 Subject: Set writerTableOfContents for s5 in Text.Pandoc, not pandoc.hs. --- src/Text/Pandoc.hs | 3 ++- src/pandoc.hs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index b27651049..a813996c0 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -192,7 +192,8 @@ writers = [("native" , writeNative) writeHtmlString o{ writerLiterateHaskell = True, writerHtml5 = True }) ,("s5" , \o -> - writeHtmlString o{ writerSlideVariant = S5Slides }) + writeHtmlString o{ writerSlideVariant = S5Slides + , writerTableOfContents = False }) ,("slidy" , \o -> writeHtmlString o{ writerSlideVariant = SlidySlides }) ,("slideous" , \o -> diff --git a/src/pandoc.hs b/src/pandoc.hs index 631ed9d91..5cebab28f 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -952,8 +952,7 @@ main = do writerVariables = variables'', writerEPUBMetadata = epubMetadata, writerTabStop = tabStop, - writerTableOfContents = toc && - writerName' /= "s5", + writerTableOfContents = toc, writerHTMLMathMethod = mathMethod, writerIncremental = incremental, writerCiteMethod = citeMethod, -- cgit v1.2.3