From 72d11ad20bd5f291c373b1aeb09cc869905b0f26 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Sun, 27 Jan 2013 22:13:05 -0800
Subject: Markdown/RST reader:  Skip blank lines.

This fixes a subtle regression involving grid tables with
empty cells.  Closes #732.

Also added test for grid table with empty cells.
---
 src/Text/Pandoc/Readers/Markdown.hs | 3 ++-
 src/Text/Pandoc/Readers/RST.hs      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 44cbbc676..9113cb75e 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -373,6 +373,7 @@ block = choice [ codeBlockFenced
                , abbrevKey
                , para
                , plain
+               , mempty <$ blanklines
                ] <?> "block"
 
 --
@@ -807,7 +808,7 @@ para = try $ do
                    _ -> return $ B.para result'
 
 plain :: MarkdownParser (F Blocks)
-plain = fmap B.plain . trimInlinesF . mconcat <$> many1 inline <* spaces
+plain = fmap B.plain . trimInlinesF . mconcat <$> many1 inline
 
 --
 -- raw html
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index c5e2617da..378e49703 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -143,6 +143,7 @@ block = choice [ codeBlock
                , list
                , lhsCodeBlock
                , para
+               , mempty <$ blanklines
                ] <?> "block"
 
 --
-- 
cgit v1.2.3