Combine grid table parsers

The grid table parsers for markdown and rst was combined into one single
parser, slightly changing parsing behavior of both parsers:

- The markdown parser now compactifies block content cell-wise: pure
  text blocks in cells are now treated as paragraphs only if the cell
  contains multiple paragraphs, and as plain blocks otherwise. Before,
  this was true only for single-column tables.

- The rst parser now accepts newlines and multiple blocks in header
  cells.

Closes: #3638

3 files changed, 42 insertions, 42 deletions

diff --git a/test/command/3516.md b/test/command/3516.md
index 982043874..8c7e478d3 100644
--- a/test/command/3516.md
+++ b/test/command/3516.md
@@ -27,8 +27,8 @@ on Windows builds.
 [Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]
  [[]
  ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]]
+ [[[Plain [Str "1"]]
+  ,[Plain [Str "2"]]]
  ,[[]
   ,[]]]]
 ```
diff --git a/test/markdown-reader-more.native b/test/markdown-reader-more.native
index baafb5334..1007dbac7 100644
--- a/test/markdown-reader-more.native
+++ b/test/markdown-reader-more.native
@@ -99,74 +99,74 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",S
  [[Plain [Str "col",Space,Str "1"]]
  ,[Plain [Str "col",Space,Str "2"]]
  ,[Plain [Str "col",Space,Str "3"]]]
- [[[Para [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Para [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Para [Str "r2",Space,Str "d"]]
-  ,[Para [Str "e"]]
-  ,[Para [Str "f"]]]]
+ [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
+  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
+ ,[[Plain [Str "r2",Space,Str "d"]]
+  ,[Plain [Str "e"]]
+  ,[Plain [Str "f"]]]]
 ,Para [Str "Headless"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[]
  ,[]
  ,[]]
- [[[Para [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Para [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Para [Str "r2",Space,Str "d"]]
-  ,[Para [Str "e"]]
-  ,[Para [Str "f"]]]]
+ [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
+  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
+ ,[[Plain [Str "r2",Space,Str "d"]]
+  ,[Plain [Str "e"]]
+  ,[Plain [Str "f"]]]]
 ,Para [Str "With",Space,Str "alignments"]
 ,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[Plain [Str "col",Space,Str "1"]]
  ,[Plain [Str "col",Space,Str "2"]]
  ,[Plain [Str "col",Space,Str "3"]]]
- [[[Para [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Para [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Para [Str "r2",Space,Str "d"]]
-  ,[Para [Str "e"]]
-  ,[Para [Str "f"]]]]
+ [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
+  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
+ ,[[Plain [Str "r2",Space,Str "d"]]
+  ,[Plain [Str "e"]]
+  ,[Plain [Str "f"]]]]
 ,Para [Str "Headless",Space,Str "with",Space,Str "alignments"]
 ,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[]
  ,[]
  ,[]]
- [[[Para [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Para [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Para [Str "r2",Space,Str "d"]]
-  ,[Para [Str "e"]]
-  ,[Para [Str "f"]]]]
+ [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
+  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
+ ,[[Plain [Str "r2",Space,Str "d"]]
+  ,[Plain [Str "e"]]
+  ,[Plain [Str "f"]]]]
 ,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[]
  ,[]
  ,[]]
- [[[Para [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Para [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Para [Str "r2",Space,Str "d"]]
-  ,[Para [Str "e"]]
-  ,[Para [Str "f"]]]]
+ [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
+  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
+ ,[[Plain [Str "r2",Space,Str "d"]]
+  ,[Plain [Str "e"]]
+  ,[Plain [Str "f"]]]]
 ,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[]
  ,[]
  ,[]]
  [[[Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"]
-   ,Para [Str "col",Space,Str "1"]]
+   ,Plain [Str "col",Space,Str "1"]]
   ,[Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"]
-   ,Para [Str "col",Space,Str "2"]]
+   ,Plain [Str "col",Space,Str "2"]]
   ,[Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"]
-   ,Para [Str "col",Space,Str "3"]]]
+   ,Plain [Str "col",Space,Str "3"]]]
  ,[[Para [Str "r1",Space,Str "a"]
    ,Para [Str "r1",Space,Str "bis"]]
   ,[BulletList
     [[Plain [Str "b"]]
     ,[Plain [Str "b",Space,Str "2"]]
     ,[Plain [Str "b",Space,Str "2"]]]]
-  ,[Para [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]
+  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]
 ,Para [Str "Empty",Space,Str "cells"]
 ,Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]
  [[]
diff --git a/test/tables-rstsubset.native b/test/tables-rstsubset.native
index d9bb9f2fb..8b7ccdf76 100644
--- a/test/tables-rstsubset.native
+++ b/test/tables-rstsubset.native
@@ -54,9 +54,9 @@
   ,[Plain [Str "1"]]]]
 ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
 ,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325]
- [[Plain [Str "Centered",Space,Str "Header"]]
- ,[Plain [Str "Left",Space,Str "Aligned"]]
- ,[Plain [Str "Right",Space,Str "Aligned"]]
+ [[Plain [Str "Centered",SoftBreak,Str "Header"]]
+ ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
+ ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
  ,[Plain [Str "Default",Space,Str "aligned"]]]
  [[[Plain [Str "First"]]
   ,[Plain [Str "row"]]
@@ -68,9 +68,9 @@
   ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]]
 ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325]
- [[Plain [Str "Centered",Space,Str "Header"]]
- ,[Plain [Str "Left",Space,Str "Aligned"]]
- ,[Plain [Str "Right",Space,Str "Aligned"]]
+ [[Plain [Str "Centered",SoftBreak,Str "Header"]]
+ ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
+ ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
  ,[Plain [Str "Default",Space,Str "aligned"]]]
  [[[Plain [Str "First"]]
   ,[Plain [Str "row"]]