From 34801acc69d91ee489aae92b97a11c8e3bcd9f91 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Mon, 30 Jan 2012 11:26:04 -0800
Subject: Added default.beamer template (separate from default.latex).

---
 pandoc.cabal                 | 2 +-
 src/Text/Pandoc/Templates.hs | 1 -
 templates                    | 2 +-
 3 files changed, 2 insertions(+), 3 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
index b8385d84d..f26a6351b 160000
--- a/templates
+++ b/templates
@@ -1 +1 @@
-Subproject commit b8385d84d7e43abbbdfbc17fc27dba6c56e14c9e
+Subproject commit f26a6351b20dff374b0209a1140faf1f7aeb5f74
-- 
cgit v1.2.3