aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2012-01-11 12:53:20 -0800
committerJohn MacFarlane <fiddlosopher@gmail.com>2012-01-11 12:53:43 -0800
commit4daf471920072ed8a3552cdbd9db040e2cad4c44 (patch)
treec961f0f9c01f69023e8a6c2b59d5710554768a52
parent63918a03b9e21522c7c5305d612a7c654a949587 (diff)
downloadpandoc-4daf471920072ed8a3552cdbd9db040e2cad4c44.tar.gz
Split html template into html, html5 templates.
-rw-r--r--pandoc.cabal3
-rw-r--r--src/Text/Pandoc/Templates.hs1
m---------templates10
3 files changed, 7 insertions, 7 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index d865862a3..887085572 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -37,7 +37,8 @@ Description: Pandoc is a Haskell library for converting from one markup
only adding a reader or writer.
Data-Files:
-- templates
- templates/default.html, templates/default.docbook,
+ templates/default.html, templates/default.html5,
+ templates/default.docbook,
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 0312ba1c6..0d627e447 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 user "odt" = getDefaultTemplate user "opendocument"
getDefaultTemplate user "epub" = getDefaultTemplate user "html"
-getDefaultTemplate user "html5" = getDefaultTemplate user "html"
getDefaultTemplate user "beamer" = getDefaultTemplate user "latex"
getDefaultTemplate user writer = do
let format = takeWhile (/='+') writer -- strip off "+lhs" if present
diff --git a/templates b/templates
-Subproject 04e35de2de8c45603993f60e5869bf9d1fddfa2
+Subproject 727772183db59ed74a26757c259e6bf947850fa