diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-01-28 11:41:26 -0800 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-01-28 11:41:26 -0800 |
| commit | 8abe08d6d43b77fe05f3b942a28b0f1a987753bd (patch) | |
| tree | 2dcac1f7e6f344d6e0c8f84362cbbcf50336db00 /src/Text | |
| parent | 513af8dd1bce76e37e813366347563284d9879b6 (diff) | |
| download | pandoc-8abe08d6d43b77fe05f3b942a28b0f1a987753bd.tar.gz | |
Made `beamer` an output format, removed `pdf` as output format.
Removed `--beamer` option; instead, use `beamer` as output format.
There is no longer a `pdf` output format; instead, pandoc tries
to produce a pdf if the output file has a `.pdf` extension.
(The output format can be latex -- the default for pdf output,
latex+lhs, or beamer.)
This seems more consistent with the way pandoc currently works
(e.g. we have an `html5` output format, not an `--html5` option).
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index 1eab57fcb..878f0e0dd 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -190,6 +190,8 @@ writers = [("native" , writeNative) ,("latex" , writeLaTeX) ,("latex+lhs" , \o -> writeLaTeX o{ writerLiterateHaskell = True }) + ,("beamer" , \o -> + writeLaTeX o{ writerBeamer = True }) ,("context" , writeConTeXt) ,("texinfo" , writeTexinfo) ,("man" , writeMan) diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index ca2776ffc..73aba4de4 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -85,7 +85,7 @@ getDefaultTemplate _ "native" = return $ Right "" getDefaultTemplate _ "json" = return $ Right "" getDefaultTemplate _ "docx" = return $ Right "" getDefaultTemplate user "odt" = getDefaultTemplate user "opendocument" -getDefaultTemplate user "pdf" = getDefaultTemplate user "latex" +getDefaultTemplate user "beamer" = getDefaultTemplate user "latex" getDefaultTemplate user "epub" = getDefaultTemplate user "html" getDefaultTemplate user writer = do let format = takeWhile (/='+') writer -- strip off "+lhs" if present |