diff options
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Readers/MediaWiki.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index 2e8ad27e5..56049e035 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -229,7 +229,7 @@ tableEnd = try $ guardColumnOne *> skipSpaces *> sym "|}" rowsep :: MWParser () rowsep = try $ guardColumnOne *> skipSpaces *> sym "|-" <* - optional (void parseAttr) <* blanklines + optional parseAttr <* blanklines cellsep :: MWParser () cellsep = try $ @@ -246,9 +246,8 @@ tableCaption = try $ do guardColumnOne skipSpaces sym "|+" - skipMany spaceChar - res <- anyLine >>= parseFromString (many inline) - return $ trimInlines $ mconcat res + optional (try $ parseAttr *> skipSpaces *> char '|' *> skipSpaces) + (trimInlines . mconcat) <$> many (notFollowedBy (cellsep <|> rowsep) *> inline) tableRow :: MWParser [((Alignment, Double), Blocks)] tableRow = try $ many tableCell |