git.iko.soy/typeable/pandoc
on master help sign in
Add a general ByteStringReader with warnings.

Have docx reader use it.

commit68fd333ec4475c5a524004bcf2e76a7959dc3afa authorJesse Rosenthal <jrosenthal@jhu.edu> dateSat 12 Mar 2016, 10:24 (11 years ago) parentee03e95
1 file changed+9−1
src/Text/Pandoc.hs+9−1
src/Text/Pandoc.hs+9−1
@@ -223,6 +223,14 @@ mkStringReaderWithWarnings r = StringReader $ \o s ->
223223mkBSReader :: (ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag)) -> Reader
224224mkBSReader r = ByteStringReader (\o s -> return $ r o s)
225225
226+mkBSReaderWithWarnings :: (ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag, [String])) -> Reader
227+mkBSReaderWithWarnings r = ByteStringReader $ \o s ->
228+ case r o s of
229+ Left err -> return $ Left err
230+ Right (doc, mediaBag, warnings) -> do
231+ mapM_ warn warnings
232+ return $ Right (doc, mediaBag)
233+
226234-- | Association list of formats and readers.
227235readers :: [(String, Reader)]
228236readers = [ ("native" , StringReader $ \_ s -> return $ readNative s)
@@ -243,7 +251,7 @@ readers = [ ("native" , StringReader $ \_ s -> return $ readNative s)
243251 ,("latex" , mkStringReader readLaTeX)
244252 ,("haddock" , mkStringReader readHaddock)
245253 ,("twiki" , mkStringReader readTWiki)
246− ,("docx" , mkBSReader readDocx)
254+ ,("docx" , mkBSReaderWithWarnings readDocxWithWarnings)
247255 ,("odt" , mkBSReader readOdt)
248256 ,("t2t" , mkStringReader readTxt2TagsNoMacros)
249257 ,("epub" , mkBSReader readEPUB)