aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-09-24 09:45:39 -0700
committerGitHub <noreply@github.com>2018-09-24 09:45:39 -0700
commit259d6f4f103d9f34d3c3abe94476703c8b0fa2b0 (patch)
tree4262f22e0c2846559f654ae89d060e9c7e6c08bf
parentcd610da8ccf3af925dd5d501902590a634c22b34 (diff)
parentf15c8d1ab48bd1bb0b3911468ce87a10fb88ce24 (diff)
downloadpandoc-259d6f4f103d9f34d3c3abe94476703c8b0fa2b0.tar.gz
Merge pull request #4931 from ajscholl/master
RTF writer: Fix build failure with ghc-8.6.1 caused by missing MonadFail instance.
-rw-r--r--src/Text/Pandoc/Writers/RTF.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/RTF.hs b/src/Text/Pandoc/Writers/RTF.hs
index 3045c1c10..ed8dc9ae4 100644
--- a/src/Text/Pandoc/Writers/RTF.hs
+++ b/src/Text/Pandoc/Writers/RTF.hs
@@ -341,8 +341,10 @@ listItemToRTF :: PandocMonad m
listItemToRTF alignment indent marker [] = return $
rtfCompact (indent + listIncrement) (negate listIncrement) alignment
(marker ++ "\\tx" ++ show listIncrement ++ "\\tab ")
-listItemToRTF alignment indent marker list = do
- (first:rest) <- mapM (blockToRTF (indent + listIncrement) alignment) list
+listItemToRTF alignment indent marker (listFirst:listRest) = do
+ let f = blockToRTF (indent + listIncrement) alignment
+ first <- f listFirst
+ rest <- mapM f listRest
let listMarker = "\\fi" ++ show (negate listIncrement) ++ " " ++ marker ++
"\\tx" ++ show listIncrement ++ "\\tab"
let insertListMarker ('\\':'f':'i':'-':d:xs) | isDigit d =