Use Text.Pandoc.Templates instead of Text.Pandoc.DefaultTemplates.

(in pandoc.hs and Text.Pandoc)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1689 788f1e2b-df1e-0410-8736-df70ead52e1b

2 files changed, 8 insertions, 5 deletions

diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index fedb4102a..88c425978 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -88,8 +88,8 @@ module Text.Pandoc
                , WriterOptions (..)
                , HTMLMathMethod (..)
                , defaultWriterOptions
-               -- * Default headers for various output formats
-               , module Text.Pandoc.DefaultTemplates
+               -- * Rendering templates and default templates
+               , module Text.Pandoc.Templates
                -- * Version
                , pandocVersion
              ) where
@@ -111,7 +111,7 @@ import Text.Pandoc.Writers.OpenDocument
 import Text.Pandoc.Writers.Man
 import Text.Pandoc.Writers.RTF 
 import Text.Pandoc.Writers.MediaWiki
-import Text.Pandoc.DefaultTemplates
+import Text.Pandoc.Templates
 import Text.Pandoc.Shared
 import Data.Version (showVersion)
 import Paths_pandoc (version)
diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs
index 887696159..98eed7292 100644
--- a/src/Text/Pandoc/Templates.hs
+++ b/src/Text/Pandoc/Templates.hs
@@ -57,11 +57,14 @@ import Paths_pandoc
 -- | Get the default template, either from the application's user data
 -- directory (~/.pandoc on unix) or from the cabal data directory.
 getDefaultTemplate :: String -> IO (Either E.IOException String)
+getDefaultTemplate "native" = return $ Right ""
+getDefaultTemplate "odt" = getDefaultTemplate "opendocument"
 getDefaultTemplate format = do
-  ut <- getTemplateFromUserDataDirectory format
+  let format' = takeWhile (/='+') format  -- strip off "+lhs" if present
+  ut <- getTemplateFromUserDataDirectory format'
   case ut of
        Right t -> return $ Right t
-       Left _  -> getTemplateFromCabalDataDirectory format
+       Left _  -> getTemplateFromCabalDataDirectory format'
  
 getTemplateFromUserDataDirectory :: String -> IO (Either E.IOException String)
 getTemplateFromUserDataDirectory format = E.try $ do