From 351b3e09c3a7b03240aab530a33b3126f80ffd48 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 27 Mar 2013 08:45:51 -0700 Subject: mediawiki reader: allow space before table rows. --- src/Text/Pandoc/Readers/MediaWiki.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index cb9eee47d..31d14117b 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -219,17 +219,17 @@ parseAttr = try $ do return (k,v) tableStart :: MWParser () -tableStart = try $ guardColumnOne *> sym "{|" +tableStart = try $ guardColumnOne *> skipSpaces *> sym "{|" tableEnd :: MWParser () -tableEnd = try $ guardColumnOne *> sym "|}" +tableEnd = try $ guardColumnOne *> skipSpaces *> sym "|}" rowsep :: MWParser () -rowsep = try $ guardColumnOne *> sym "|-" <* blanklines +rowsep = try $ guardColumnOne *> skipSpaces *> sym "|-" <* blanklines cellsep :: MWParser () cellsep = try $ - (guardColumnOne <* + (guardColumnOne *> skipSpaces <* ( (char '|' <* notFollowedBy (oneOf "-}+")) <|> (char '!') ) @@ -240,6 +240,7 @@ cellsep = try $ tableCaption :: MWParser Inlines tableCaption = try $ do guardColumnOne + skipSpaces sym "|+" skipMany spaceChar res <- anyLine >>= parseFromString (many inline) -- cgit v1.2.3