git.iko.soy/typeable/pandoc
on master help sign in
Markdown reader: Use logMessage instead of report.
commit1e43e3767e8e92560a304fb7661da02f4ee4ba12 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 17 Feb 2017, 19:59 (10 years ago) parenta341235
1 file changed+7−5
src/Text/Pandoc/Readers/Markdown.hs+7−5
src/Text/Pandoc/Readers/Markdown.hs+7−5
@@ -268,7 +268,8 @@ yamlMetaBlock = try $ do
268268 ) nullMeta hashmap
269269 Right Yaml.Null -> return nullMeta
270270 Right _ -> do
271− report $ CouldNotParseYamlMetadata "not an object"
271+ logMessage $
272+ CouldNotParseYamlMetadata "not an object"
272273 pos
273274 return nullMeta
274275 Left err' -> do
@@ -280,12 +281,12 @@ yamlMetaBlock = try $ do
280281 yamlLine = yline
281282 , yamlColumn = ycol
282283 }}) ->
283− report $ CouldNotParseYamlMetadata
284+ logMessage $ CouldNotParseYamlMetadata
284285 problem (setSourceLine
285286 (setSourceColumn pos
286287 (sourceColumn pos + ycol))
287288 (sourceLine pos + 1 + yline))
288− _ -> report $ CouldNotParseYamlMetadata
289+ _ -> logMessage $ CouldNotParseYamlMetadata
289290 (show err') pos
290291 return nullMeta
291292 updateState $ \st -> st{ stateMeta' = stateMeta' st <> (return meta') }
@@ -364,6 +365,7 @@ parseMarkdown = do
364365 let Pandoc _ bs = B.doc $ runF blocks st
365366 eastAsianLineBreaks <- option False $
366367 True <$ guardEnabled Ext_east_asian_line_breaks
368+ reportLogMessages
367369 return $ (if eastAsianLineBreaks
368370 then bottomUp softBreakFilter
369371 else id) $ Pandoc meta bs
@@ -403,7 +405,7 @@ referenceKey = try $ do
403405 let oldkeys = stateKeys st
404406 let key = toKey raw
405407 case M.lookup key oldkeys of
406− Just _ -> report $ DuplicateLinkReference raw pos
408+ Just _ -> logMessage $ DuplicateLinkReference raw pos
407409 Nothing -> return ()
408410 updateState $ \s -> s { stateKeys = M.insert key (target, attr') oldkeys }
409411 return $ return mempty
@@ -469,7 +471,7 @@ noteBlock = try $ do
469471 let newnote = (ref, parsed)
470472 oldnotes <- stateNotes' <$> getState
471473 case lookup ref oldnotes of
472− Just _ -> report $ DuplicateNoteReference ref pos
474+ Just _ -> logMessage $ DuplicateNoteReference ref pos
473475 Nothing -> return ()
474476 updateState $ \s -> s { stateNotes' = newnote : oldnotes }
475477 return mempty