From 8d65651309ba99b0cd8f725f91fdada62f5eb955 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 9 Aug 2012 22:30:44 -0700
Subject: Changed strict to markdown_strict.

---
 src/Text/Pandoc.hs           | 6 +++---
 src/Text/Pandoc/Templates.hs | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index b43eaede2..33706816e 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -176,7 +176,7 @@ parseFormatSpec = parse formatSpec ""
 readers :: [(String, ReaderOptions -> String -> Pandoc)]
 readers = [("native"       , \_ -> readNative)
           ,("json"         , \_ -> decodeJSON)
-          ,("strict"       , readMarkdown)
+          ,("markdown_strict" , readMarkdown)
           ,("markdown"     , readMarkdown)
           ,("rst"          , readRST)
           ,("docbook"      , readDocBook)
@@ -220,7 +220,7 @@ writers = [
   ,("texinfo"      , PureStringWriter writeTexinfo)
   ,("man"          , PureStringWriter writeMan)
   ,("markdown"     , PureStringWriter writeMarkdown)
-  ,("strict"       , PureStringWriter writeMarkdown)
+  ,("markdown_strict" , PureStringWriter writeMarkdown)
   ,("plain"        , PureStringWriter writePlain)
   ,("rst"          , PureStringWriter writeRST)
   ,("mediawiki"    , PureStringWriter writeMediaWiki)
@@ -231,7 +231,7 @@ writers = [
   ]
 
 getDefaultExtensions :: String -> Set Extension
-getDefaultExtensions "strict" = strictExtensions
+getDefaultExtensions "markdown_strict" = strictExtensions
 getDefaultExtensions _        = pandocExtensions
 
 -- | Retrieve reader based on formatSpec (format+extensions).
diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs
index 899f6510a..4f5ad54bd 100644
--- a/src/Text/Pandoc/Templates.hs
+++ b/src/Text/Pandoc/Templates.hs
@@ -92,8 +92,11 @@ getDefaultTemplate user writer = do
        "native" -> return $ Right ""
        "json"   -> return $ Right ""
        "docx"   -> return $ Right ""
-       "odt"    -> getDefaultTemplate user "opendocument"
        "epub"   -> return $ Right ""
+       "odt"    -> getDefaultTemplate user "opendocument"
+       "markdown_strict" -> getDefaultTemplate user "markdown"
+       "multimarkdown"   -> getDefaultTemplate user "markdown"
+       "markdown_github" -> getDefaultTemplate user "markdown"
        _        -> let fname = "templates" </> "default" <.> format
                    in  E.try $ readDataFile user fname
 
-- 
cgit v1.2.3