git.iko.soy/typeable/pandoc
on master help sign in
Rename getTemplate -> getDefaultTemplate.
9fed261fiddlosopher
src/Text/Pandoc/Templates.hs+9−9
compare with master
unifiedsplit
@@ -66,7 +66,7 @@ You may optionally specify separators using @$sep$@:
66
66
67module Text.Pandoc.Templates ( renderTemplate
67module Text.Pandoc.Templates ( renderTemplate
68 , TemplateTarget
68 , TemplateTarget
69− , getTemplate ) where
69+ , getDefaultTemplate ) where
70
70
71import Text.ParserCombinators.Parsec
71import Text.ParserCombinators.Parsec
72import Control.Monad (liftM, when, forM)
72import Control.Monad (liftM, when, forM)
@@ -86,14 +86,14 @@ import System.IO.UTF8 ( readFile )
86#endif
86#endif
87import Paths_pandoc (getDataFileName)
87import Paths_pandoc (getDataFileName)
88
88
89−-- | Get a template for the specified writer.
89+-- | Get default template for the specified writer.
90−getTemplate :: (Maybe FilePath) -- ^ User data directory to search first
90+getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first
91− -> String -- ^ Name of writer
91+ -> String -- ^ Name of writer
92− -> IO (Either E.IOException String)
92+ -> IO (Either E.IOException String)
93−getTemplate _ "native" = return $ Right ""
93+getDefaultTemplate _ "native" = return $ Right ""
94−getTemplate user "s5" = getTemplate user "html"
94+getDefaultTemplate user "s5" = getDefaultTemplate user "html"
95−getTemplate user "odt" = getTemplate user "opendocument"
95+getDefaultTemplate user "odt" = getDefaultTemplate user "opendocument"
96−getTemplate user writer = do
96+getDefaultTemplate user writer = do
97 let format = takeWhile (/='+') writer -- strip off "+lhs" if present
97 let format = takeWhile (/='+') writer -- strip off "+lhs" if present
98 let fname = "templates" </> format <.> "template"
98 let fname = "templates" </> format <.> "template"
99 E.try $ case user of
99 E.try $ case user of
src/pandoc.hs+2−2
@@ -441,7 +441,7 @@ options =
441 , Option "D" ["print-default-template"]
441 , Option "D" ["print-default-template"]
442 (ReqArg
442 (ReqArg
443 (\arg _ -> do
443 (\arg _ -> do
444− templ <- getTemplate Nothing arg
444+ templ <- getDefaultTemplate Nothing arg
445 case templ of
445 case templ of
446 Right t -> hPutStr stdout t
446 Right t -> hPutStr stdout t
447 Left e -> error $ show e
447 Left e -> error $ show e
@@ -650,7 +650,7 @@ main = do
650 Just r -> return r
650 Just r -> return r
651 Nothing -> error ("Unknown writer: " ++ writerName')
651 Nothing -> error ("Unknown writer: " ++ writerName')
652
652
653− templ <- getTemplate (Just datadir) writerName'
653+ templ <- getDefaultTemplate (Just datadir) writerName'
654 let defaultTemplate = case templ of
654 let defaultTemplate = case templ of
655 Right t -> t
655 Right t -> t
656 Left e -> error (show e)
656 Left e -> error (show e)