From 17b4066d677b24c490e60900958b25183a56ff62 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 27 May 2015 21:18:17 -0700 Subject: trypandoc - fixes for new API. --- trypandoc/trypandoc.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'trypandoc/trypandoc.hs') diff --git a/trypandoc/trypandoc.hs b/trypandoc/trypandoc.hs index c530f45f2..210bab49f 100644 --- a/trypandoc/trypandoc.hs +++ b/trypandoc/trypandoc.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings, CPP #-} module Main where import Network.Wai.Handler.CGI import Network.Wai @@ -29,7 +29,13 @@ app req respond = do $ lookup fromFormat fromFormats let writer = maybe (error $ "could not find writer for " ++ T.unpack toFormat) id $ lookup toFormat toFormats +#if MIN_VERSION_pandoc(1,14,0) + let result = case reader $ tabFilter 4 $ T.unpack text of + Right doc -> T.pack $ writer doc + Left err -> error (show err) +#else let result = T.pack $ writer $ reader $ tabFilter 4 $ T.unpack text +#endif let output = encode $ object [ T.pack "result" .= result , T.pack "name" .= if fromFormat == "markdown_strict" -- cgit v1.2.3