From eb090c50ff6dc35e3a2971d831a9832c69db7d8d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 19 Jul 2023 15:09:12 -0700 Subject: Fix errors for illegal output formats. Previously if you did `pandoc -s -t bbb`, it would give you an error about the missing bbb template instead of saying that it's not a supported output format. --- src/Text/Pandoc/App/OutputSettings.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs index d87c36a36..17a603b07 100644 --- a/src/Text/Pandoc/App/OutputSettings.hs +++ b/src/Text/Pandoc/App/OutputSettings.hs @@ -143,15 +143,17 @@ optToOutputSettings scriptingEngine opts = do Just t -> (runWithDefaultPartials $ compileTemplate path t) >>= templateOrThrow return (w, wexts, templ) - else do - tmpl <- processCustomTemplate (compileDefaultTemplate format) + else if optSandbox opts - then case runPure (getWriter flvrd) of + then do + tmpl <- processCustomTemplate (compileDefaultTemplate format) + case runPure (getWriter flvrd) of Right (w, wexts) -> return (makeSandboxed w, wexts, tmpl) Left e -> throwError e else do - (w, wexts) <- getWriter flvrd - return (w, wexts, tmpl) + (w, wexts) <- getWriter flvrd + tmpl <- processCustomTemplate (compileDefaultTemplate format) + return (w, wexts, tmpl) let addSyntaxMap existingmap f = do -- cgit v1.2.3