@@ -207,18 +207,18 @@ parseFormatSpec = parse formatSpec ""
207data Reader = StringReader (ReaderOptions -> String -> IO (Either PandocError Pandoc))
207data Reader = StringReader (ReaderOptions -> String -> IO (Either PandocError Pandoc))
208 | ByteStringReader (ReaderOptions -> BL.ByteString -> IO (Either PandocError (Pandoc,MediaBag)))
208 | ByteStringReader (ReaderOptions -> BL.ByteString -> IO (Either PandocError (Pandoc,MediaBag)))
210−mkStringReader :: (ReaderOptions -> String -> (Either PandocError Pandoc)) -> Reader
210+mkStringReader :: (ReaderOptions -> String -> Either PandocError Pandoc) -> Reader
211mkStringReader r = StringReader (\o s -> return $ r o s)
211mkStringReader r = StringReader (\o s -> return $ r o s)
213mkStringReaderWithWarnings :: (ReaderOptions -> String -> Either PandocError (Pandoc, [String])) -> Reader
213mkStringReaderWithWarnings :: (ReaderOptions -> String -> Either PandocError (Pandoc, [String])) -> Reader
214−mkStringReaderWithWarnings r = StringReader $ \o s -> do
214+mkStringReaderWithWarnings r = StringReader $ \o s ->
215 case r o s of
215 case r o s of
216 Left err -> return $ Left err
216 Left err -> return $ Left err
217 Right (doc, warnings) -> do
217 Right (doc, warnings) -> do
218 mapM_ warn warnings
218 mapM_ warn warnings
219 return (Right doc)
219 return (Right doc)
221−mkBSReader :: (ReaderOptions -> BL.ByteString -> (Either PandocError (Pandoc, MediaBag))) -> Reader
221+mkBSReader :: (ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag)) -> Reader
222mkBSReader r = ByteStringReader (\o s -> return $ r o s)
222mkBSReader r = ByteStringReader (\o s -> return $ r o s)
224-- | Association list of formats and readers.
224-- | Association list of formats and readers.
@@ -330,7 +330,7 @@ getDefaultExtensions _ = Set.fromList [Ext_auto_identifiers]
330getReader :: String -> Either String Reader
330getReader :: String -> Either String Reader
331getReader s =
331getReader s =
332 case parseFormatSpec s of
332 case parseFormatSpec s of
333− Left e -> Left $ intercalate "\n" $ [m | Message m <- errorMessages e]
333+ Left e -> Left $ intercalate "\n" [m | Message m <- errorMessages e]
334 Right (readerName, setExts) ->
334 Right (readerName, setExts) ->
335 case lookup readerName readers of
335 case lookup readerName readers of
336 Nothing -> Left $ "Unknown reader: " ++ readerName
336 Nothing -> Left $ "Unknown reader: " ++ readerName
@@ -345,7 +345,7 @@ getReader s =
345getWriter :: String -> Either String Writer
345getWriter :: String -> Either String Writer
346getWriter s
346getWriter s
347 = case parseFormatSpec s of
347 = case parseFormatSpec s of
348− Left e -> Left $ intercalate "\n" $ [m | Message m <- errorMessages e]
348+ Left e -> Left $ intercalate "\n" [m | Message m <- errorMessages e]
349 Right (writerName, setExts) ->
349 Right (writerName, setExts) ->
350 case lookup writerName writers of
350 case lookup writerName writers of
351 Nothing -> Left $ "Unknown writer: " ++ writerName
351 Nothing -> Left $ "Unknown writer: " ++ writerName