diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-07-22 22:58:48 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-07-22 22:58:48 -0700 |
| commit | a11b5309351cfa813face2d07cdbc32b1fa6cf0f (patch) | |
| tree | 0c33dad4609baafa629218f2159f1a035eb0e2fd /src/pandoc.hs | |
| parent | da52412455707656e7738d110c32be2decee2dcd (diff) | |
| download | pandoc-a11b5309351cfa813face2d07cdbc32b1fa6cf0f.tar.gz | |
Moved s5 writing from S5 module to HTML.
Now s5 is handled in more or less the same way as slidy,
as a variant of HTML.
Diffstat (limited to 'src/pandoc.hs')
| -rw-r--r-- | src/pandoc.hs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index b7ff42803..67e81d6fa 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -30,7 +30,7 @@ writers. -} module Main where import Text.Pandoc -import Text.Pandoc.Writers.S5 (s5HeaderIncludes, s5Links, s5Meta) +import Text.Pandoc.Writers.S5 (s5HeaderIncludes) import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..), readDataFile, headerShift ) #ifdef _HIGHLIGHTING @@ -105,7 +105,7 @@ writers :: [ ( String, WriterOptions -> Pandoc -> String ) ] writers = [("native" , writeNative) ,("html" , writeHtmlString) ,("html+lhs" , writeHtmlString) - ,("s5" , writeS5String) + ,("s5" , writeHtmlString) ,("slidy" , writeHtmlString) ,("docbook" , writeDocbook) ,("opendocument" , writeOpenDocument) @@ -746,10 +746,7 @@ main = do variables' <- case (writerName', standalone', offline) of ("s5", True, True) -> do inc <- s5HeaderIncludes datadir - return $ ("header-includes", inc) : variables - ("s5", True, False) -> - return $ ("header-includes", s5Meta ++ s5Links) : - variables + return $ ("s5includes", inc) : variables ("slidy", True, True) -> do slidyJs <- readDataFile datadir $ "slidy" </> "slidy.min.js" |