Merge pull request #4931 from ajscholl/master

RTF writer: Fix build failure with ghc-8.6.1 caused by missing MonadFail instance.
This commit is contained in:
John MacFarlane 2018-09-24 09:45:39 -07:00 committed by GitHub
commit 259d6f4f10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 =