From 83c1ce1d77d3ef058e4e5c645a8eb0379fab780f Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov <root@livid.pp.ru> Date: Thu, 16 Apr 2020 02:20:01 +0300 Subject: Markdown Reader: Fix inline code in lists (#6284) Closes #6284. Previously inline code containing list markers was sometimes parsed incorrectly. --- src/Text/Pandoc/Readers/Markdown.hs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index c9643f1b0..66f4df341 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1517,12 +1517,17 @@ code :: PandocMonad m => MarkdownParser m (F Inlines) code = try $ do starts <- many1 (char '`') skipSpaces - result <- (trim . T.concat) <$> - manyTill (notFollowedBy (inList >> listStart) >> - (many1Char (noneOf "`\n") <|> many1Char (char '`') <|> - (char '\n' >> notFollowedBy' blankline >> return " "))) - (try (skipSpaces >> count (length starts) (char '`') >> - notFollowedBy (char '`'))) + result <- trim . T.concat + <$> manyTill + ( many1Char (noneOf "`\n") + <|> many1Char (char '`') + <|> (char '\n' + >> notFollowedBy (inList >> listStart) + >> notFollowedBy' blankline + >> return " ")) + (try $ skipSpaces + >> count (length starts) (char '`') + >> notFollowedBy (char '`')) rawattr <- (Left <$> try (guardEnabled Ext_raw_attribute >> rawAttribute)) <|> -- cgit v1.2.3