git.iko.soy/typeable/pandoc
on master help sign in
mediawiki reader: allow space before table rows.
351b3e0John MacFarlane
src/Text/Pandoc/Readers/MediaWiki.hs+5−4
@@ -219,17 +219,17 @@ parseAttr = try $ do
219 return (k,v)
219 return (k,v)
220
220
221tableStart :: MWParser ()
221tableStart :: MWParser ()
222−tableStart = try $ guardColumnOne *> sym "{|"
222+tableStart = try $ guardColumnOne *> skipSpaces *> sym "{|"
223
223
224tableEnd :: MWParser ()
224tableEnd :: MWParser ()
225−tableEnd = try $ guardColumnOne *> sym "|}"
225+tableEnd = try $ guardColumnOne *> skipSpaces *> sym "|}"
226
226
227rowsep :: MWParser ()
227rowsep :: MWParser ()
228−rowsep = try $ guardColumnOne *> sym "|-" <* blanklines
228+rowsep = try $ guardColumnOne *> skipSpaces *> sym "|-" <* blanklines
229
229
230cellsep :: MWParser ()
230cellsep :: MWParser ()
231cellsep = try $
231cellsep = try $
232− (guardColumnOne <*
232+ (guardColumnOne *> skipSpaces <*
233 ( (char '|' <* notFollowedBy (oneOf "-}+"))
233 ( (char '|' <* notFollowedBy (oneOf "-}+"))
234 <|> (char '!')
234 <|> (char '!')
235 )
235 )
@@ -240,6 +240,7 @@ cellsep = try $
240tableCaption :: MWParser Inlines
240tableCaption :: MWParser Inlines
241tableCaption = try $ do
241tableCaption = try $ do
242 guardColumnOne
242 guardColumnOne
243+ skipSpaces
243 sym "|+"
244 sym "|+"
244 skipMany spaceChar
245 skipMany spaceChar
245 res <- anyLine >>= parseFromString (many inline)
246 res <- anyLine >>= parseFromString (many inline)