diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2012-07-23 22:58:16 -0700 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-07-23 22:58:16 -0700 |
commit | fb6e7989170ac73e75f6ecdf79b8aaca5d353c76 (patch) | |
tree | 16299982ea59cf8761f6ff21ee3658128c449fc8 | |
parent | 1bd0c479685fd009ba3c808e6fea3fac24f26428 (diff) |
Set writerTableOfContents for s5 in Text.Pandoc, not pandoc.hs.
-rw-r--r-- | src/Text/Pandoc.hs | 3 | ||||
-rw-r--r-- | src/pandoc.hs | 3 |
2 files changed, 3 insertions, 3 deletions
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, |