aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pandoc.cabal2
-rw-r--r--src/Text/Pandoc/Templates.hs1
m---------templates12
3 files changed, 6 insertions, 9 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 9d598fdc3..df77547c1 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -38,7 +38,7 @@ Description: Pandoc is a Haskell library for converting from one markup
Data-Files:
-- templates
templates/default.html, templates/default.html5,
- templates/default.docbook,
+ templates/default.docbook, templates/default.beamer,
templates/default.opendocument, templates/default.latex,
templates/default.context, templates/default.texinfo,
templates/default.man, templates/default.markdown,
diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs
index 73aba4de4..336efe453 100644
--- a/src/Text/Pandoc/Templates.hs
+++ b/src/Text/Pandoc/Templates.hs
@@ -85,7 +85,6 @@ getDefaultTemplate _ "native" = return $ Right ""
getDefaultTemplate _ "json" = return $ Right ""
getDefaultTemplate _ "docx" = return $ Right ""
getDefaultTemplate user "odt" = getDefaultTemplate user "opendocument"
-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
diff --git a/templates b/templates
-Subproject b8385d84d7e43abbbdfbc17fc27dba6c56e14c9
+Subproject f26a6351b20dff374b0209a1140faf1f7aeb5f7