20 files changed, 520 insertions, 215 deletions
diff --git a/test/command/1881.md b/test/command/1881.md
index c0902de71..fabd6d94b 100644
--- a/test/command/1881.md
+++ b/test/command/1881.md
@@ -20,15 +20,27 @@
 </tbody>
 </table>
 ^D
-[Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
- [[Plain [Str "Right"]]
- ,[Plain [Str "Left"]]
- ,[Plain [Str "Center"]]
- ,[Plain [Str "Default"]]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Right"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Left"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Center"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Default"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]]]
+ []]
 ```
 
 ```
@@ -42,14 +54,26 @@
 </tr>
 </table>
 ^D
-[Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]
- [[]
- ,[]
- ,[]
- ,[]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12"]]]]
+ []]
 ```
 
diff --git a/test/command/3348.md b/test/command/3348.md
index 6e0c07033..f21b4845d 100644
--- a/test/command/3348.md
+++ b/test/command/3348.md
@@ -7,11 +7,22 @@
         line of text
   ----- ------------------------------------------------
 ^D
-[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6805555555555556]
- [[]
- ,[]]
- [[[Plain [Str "foo"]]
-  ,[Plain [Str "bar"]]]
- ,[[Plain [Str "foo"]]
-  ,[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignRight,Just 8.333333333333333e-2),(AlignLeft,Just 0.6805555555555556)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "foo"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "bar"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "foo"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]]
+ []]
 ```
diff --git a/test/command/3516.md b/test/command/3516.md
index 8c7e478d3..602d8442b 100644
--- a/test/command/3516.md
+++ b/test/command/3516.md
@@ -24,24 +24,46 @@ on Windows builds.
 |   |   |
 +---+---+
 ^D
-[Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]
- [[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]]
- ,[[]
-  ,[]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "2"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ []]
 ```
 
 ```
 % pandoc -f native -t rst
-[Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]
- [[]
- ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]]
- ,[[]
-  ,[]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Para [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Para [Str "2"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ []]
 ^D
 +---+---+
 | 1 | 2 |
diff --git a/test/command/3533-rst-csv-tables.md b/test/command/3533-rst-csv-tables.md
index 181462f7f..1fcf3bae9 100644
--- a/test/command/3533-rst-csv-tables.md
+++ b/test/command/3533-rst-csv-tables.md
@@ -5,16 +5,30 @@
    :header: Flavor,Price,Slogan
    :file: command/3533-rst-csv-tables.csv
 ^D
-[Table [Str "Test"] [AlignDefault,AlignDefault,AlignDefault] [0.4,0.2,0.4]
- [[Plain [Str "Flavor"]]
- ,[Plain [Str "Price"]]
- ,[Plain [Str "Slogan"]]]
- [[[Plain [Str "Albatross"]]
-  ,[Plain [Str "2.99"]]
-  ,[Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]
- ,[[Plain [Str "Crunchy",Space,Str "Frog"]]
-  ,[Plain [Str "1.49"]]
-  ,[Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ [Para [Str "Test"]]) [(AlignDefault,Just 0.4),(AlignDefault,Just 0.2),(AlignDefault,Just 0.4)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Flavor"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Price"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Slogan"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Albatross"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "2.99"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Crunchy",Space,Str "Frog"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1.49"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]]
+ []]
 ```
 
 ```
@@ -28,16 +42,30 @@
    'cat''s' 3 4
    'dog''s' 2 3
 ^D
-[Table [Str "Test"] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[Plain [Str "a"]]
- ,[Plain [Str "b"]]]
- [[[Plain [Str "cat's"]]
-  ,[Plain [Str "3"]]
-  ,[Plain [Str "4"]]]
- ,[[Plain [Str "dog's"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "a"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "b"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "cat's"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "3"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "4"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "dog's"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "3"]]]]
+ []]
 ```
 
 ```
@@ -47,10 +75,18 @@
 
    "1","\""
 ^D
-[Table [Str "Test"] [AlignDefault,AlignDefault] [0.0,0.0]
- [[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "\""]]]]]
+[Table ("",[],[]) (Caption Nothing
+ [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "\""]]]]
+ []]
 ```
 
diff --git a/test/command/3706.md b/test/command/3706.md
index 3765372fa..8430a929c 100644
--- a/test/command/3706.md
+++ b/test/command/3706.md
@@ -16,15 +16,29 @@ pandoc -f org -t native
 |  3 | La   |
 ^D
 [Div ("tab",[],[])
- [Table [Str "Lalelu."] [AlignDefault,AlignDefault] [0.0,0.0]
-  [[Plain [Str "Id"]]
-  ,[Plain [Str "Desc"]]]
-  [[[Plain [Str "1"]]
-   ,[Plain [Str "La"]]]
-  ,[[Plain [Str "2"]]
-   ,[Plain [Str "La"]]]
-  ,[[Plain [Str "3"]]
-   ,[Plain [Str "La"]]]]]]
+ [Table ("",[],[]) (Caption Nothing
+  [Para [Str "Lalelu."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+  [Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "Id"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "Desc"]]]]
+  [Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "La"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "2"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "La"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "3"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "La"]]]]
+  []]]
 ```
 
 ```
diff --git a/test/command/3708.md b/test/command/3708.md
index 2cbc82c25..1eb0c256a 100644
--- a/test/command/3708.md
+++ b/test/command/3708.md
@@ -5,11 +5,22 @@
     C & D
 \end{tabular}
 ^D
-[Table [] [AlignCenter,AlignCenter] [0.0,0.0]
- [[]
- ,[]]
- [[[Plain [Str "A"]]
-  ,[Plain [Str "B&1"]]]
- ,[[Plain [Str "C"]]
-  ,[Plain [Str "D"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "A"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "B&1"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "C"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "D"]]]]
+ []]
 ```
diff --git a/test/command/4056.md b/test/command/4056.md
index e972931dd..bf02ec5f0 100644
--- a/test/command/4056.md
+++ b/test/command/4056.md
@@ -14,11 +14,21 @@
 Blah & Foo & Bar \\
 \end{tabular}
 ^D
-[Table [] [AlignLeft,AlignRight,AlignRight] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "Blah"]]
-  ,[Plain [Str "Foo"]]
-  ,[Plain [Str "Bar"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Blah"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Foo"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Bar"]]]]
+ []]
 ```
diff --git a/test/command/4119.md b/test/command/4119.md
index 70f008643..1df7775c8 100644
--- a/test/command/4119.md
+++ b/test/command/4119.md
@@ -8,11 +8,19 @@ pandoc -t native
 not a caption!
 ::::::::::::::::
 ^D
-[Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Plain [Str "col1"]]
- ,[Plain [Str "col2"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "col1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "col2"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "2"]]]]
+ []
 ,Div ("",["notes"],[])
  [Para [Str "not",Space,Str "a",Space,Str "caption!"]]]
 ```
diff --git a/test/command/4320.md b/test/command/4320.md
index a205c9269..dc9b076d6 100644
--- a/test/command/4320.md
+++ b/test/command/4320.md
@@ -1,11 +1,19 @@
 ```
 % pandoc -f native -t rst --wrap=none
-[Table [] [AlignDefault,AlignDefault] [0.3,0.3]
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
- [[[Plain [Str "ports"]]
-  ,[BlockQuote
-    [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 0.3),(AlignDefault,Just 0.3)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "one"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "two"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "ports"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [BlockQuote
+    [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]
+ []]
 ^D
 +--------------------+-------------------------------------+
 | one                | two                                 |
diff --git a/test/command/4513.md b/test/command/4513.md
index e4a4406e4..e315d3820 100644
--- a/test/command/4513.md
+++ b/test/command/4513.md
@@ -2,8 +2,13 @@
 % pandoc -f textile -t native
 |_. heading 1 |_. heading 2|
 ^D
-[Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Plain [Str "heading",Space,Str "1"]]
- ,[Plain [Str "heading",Space,Str "2"]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "heading",Space,Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "heading",Space,Str "2"]]]]
+ []
  []]
 ```
diff --git a/test/command/4579.md b/test/command/4579.md
index 80f0f58c2..6c01cf734 100644
--- a/test/command/4579.md
+++ b/test/command/4579.md
@@ -8,9 +8,17 @@
   * - spam
     - ham
 ^D
-[Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Plain [Str "Foo"]]
- ,[Plain [Str "Bar"]]]
- [[[Plain [Str "spam"]]
-  ,[Plain [Str "ham"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Foo"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Bar"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "spam"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "ham"]]]]
+ []]
 ```
diff --git a/test/command/5014.md b/test/command/5014.md
index c19490496..79cc99cd0 100644
--- a/test/command/5014.md
+++ b/test/command/5014.md
@@ -13,7 +13,13 @@
     </tbody>
 </table>
 ^D
-[Table [] [AlignDefault] [0.0]
- [[Plain [Str "Name"]]]
- [[[Plain [Str "Accounts"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Name"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Accounts"]]]]
+ []]
 ```
diff --git a/test/command/5079.md b/test/command/5079.md
index aa93ae6f3..1a566d6e4 100644
--- a/test/command/5079.md
+++ b/test/command/5079.md
@@ -10,7 +10,13 @@
 </tbody>
 </table>
 ^D
-[Table [] [AlignDefault] [0.0]
- [[]]
- [[[Plain [Str "Cell"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell"]]]]
+ []]
 ```
diff --git a/test/command/5708.md b/test/command/5708.md
index 00a98a371..f104c30c3 100644
--- a/test/command/5708.md
+++ b/test/command/5708.md
@@ -4,9 +4,17 @@
 | 123456 | :math:`a + b`  |
 +--------+----------------+
 ^D
-[Table [] [AlignDefault,AlignDefault] [0.125,0.2361111111111111]
- [[]
- ,[]]
- [[[Plain [Str "123456"]]
-  ,[Plain [Math InlineMath "a + b"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 0.125),(AlignDefault,Just 0.2361111111111111)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123456"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "a + b"]]]]
+ []]
 ```
diff --git a/test/command/5711.md b/test/command/5711.md
index 0d443c656..2e45d5fa1 100644
--- a/test/command/5711.md
+++ b/test/command/5711.md
@@ -7,7 +7,13 @@
 \end{tabular}
 \end{document}
 ^D
-[Table [] [AlignCenter] [0.0]
- [[]]
- [[[Plain [Str "d",LineBreak,Str "e"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignCenter,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "d",LineBreak,Str "e"]]]]
+ []]
 ```
diff --git a/test/command/6137.md b/test/command/6137.md
index c1e0ac01c..4dcc0fe8f 100644
--- a/test/command/6137.md
+++ b/test/command/6137.md
@@ -17,16 +17,30 @@ This reference to Figure \ref{fig:label} works fine.
 ^D
 [Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Table",Space,Link ("",[],[("reference-type","ref"),("reference","tbl:label")]) [Str "1"] ("#tbl:label",""),Space,Str "doesn\8217t",Space,Str "work."]
 ,Div ("tbl:label",[],[])
- [Table [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."] [AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0]
-  [[]
-  ,[]
-  ,[]]
-  [[[Plain [Str "\8212\8212\8211"]]
-   ,[Plain [Str "\8212\8212\8211"]]
-   ,[Plain [Str "\8212\8212\8211"]]]
-  ,[[Plain [Str "\8212\8212\8211"]]
-   ,[Plain [Str "\8212\8212\8211"]]
-   ,[Plain [Str "\8212\8212\8211"]]]]]
+ [Table ("",[],[]) (Caption Nothing
+  [Para [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0
+  [Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    []
+   ,Cell ("",[],[]) Nothing 1 1
+    []
+   ,Cell ("",[],[]) Nothing 1 1
+    []]]
+  [Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]
+   ,Cell ("",[],[]) Nothing 1 1
+    [Plain [Str "\8212\8212\8211"]]]]
+  []]
 ,Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:label")]) [Str "1"] ("#fig:label",""),Space,Str "works",Space,Str "fine."]
 ,Para [Image ("fig:label",[],[("width","\\textwidth")]) [Str "A",Space,Str "numbered",Space,Str "caption,",Space,Str "if",Space,Str "I",Space,Str "use",Space,Str "pandoc-crossref."] ("example.png","fig:")]]
 ```
diff --git a/test/command/csv.md b/test/command/csv.md
index 4d38572f1..d633840fd 100644
--- a/test/command/csv.md
+++ b/test/command/csv.md
@@ -5,17 +5,35 @@ Apple,25 cents,33
 """Navel"" Orange","35 cents",22
 ,,45
 ^D
-[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "Fruit"]]
- ,[Plain [Str "Price"]]
- ,[Plain [Str "Quantity"]]]
- [[[Plain [Str "Apple"]]
-  ,[Plain [Str "25",Space,Str "cents"]]
-  ,[Plain [Str "33"]]]
- ,[[Plain [Str "\"Navel\"",Space,Str "Orange"]]
-  ,[Plain [Str "35",Space,Str "cents"]]
-  ,[Plain [Str "22"]]]
- ,[[]
-  ,[]
-  ,[Plain [Str "45"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Fruit"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Price"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Quantity"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Apple"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "25",Space,Str "cents"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "33"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "\"Navel\"",Space,Str "Orange"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "35",Space,Str "cents"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "22"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "45"]]]]
+ []]
 ```
diff --git a/test/command/gfm.md b/test/command/gfm.md
index a4bb088b6..3ef3665a6 100644
--- a/test/command/gfm.md
+++ b/test/command/gfm.md
@@ -7,13 +7,24 @@ gfm tests:
 | apple | 0.13  |
 | orange|1.12|
 ^D
-[Table [] [AlignDefault,AlignRight] [0.0,0.0]
- [[Plain [Str "Fruit"]]
- ,[Plain [Str "Price"]]]
- [[[Plain [Str "apple"]]
-  ,[Plain [Str "0.13"]]]
- ,[[Plain [Str "orange"]]
-  ,[Plain [Str "1.12"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Fruit"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Price"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "apple"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "0.13"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "orange"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1.12"]]]]
+ []]
 ```
 
 ```
@@ -57,13 +68,24 @@ My:thumbsup:emoji:heart:
 
 ```
 % pandoc -t gfm -f native
-[Table [Str "The",Space,Str "caption."] [AlignDefault,AlignRight] [0.0,0.0]
- [[Plain [Str "Fruit"]]
- ,[Plain [Str "Price"]]]
- [[[Plain [Str "apple"]]
-  ,[Plain [Str "0.13"]]]
- ,[[Plain [Str "orange"]]
-  ,[Plain [Str "1.12"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ [Para [Str "The",Space,Str "caption."]]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Fruit"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Price"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "apple"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "0.13"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "orange"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1.12"]]]]
+ []]
 ^D
 | Fruit  | Price |
 | ------ | ----: |
diff --git a/test/command/latex-tabular-column-specs.md b/test/command/latex-tabular-column-specs.md
index ed44a9980..65835019f 100644
--- a/test/command/latex-tabular-column-specs.md
+++ b/test/command/latex-tabular-column-specs.md
@@ -11,14 +11,28 @@ f      & 0.5    & 5,5  \\
 \bottomrule
 \end{tabular}
 ^D
-[Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Plain [Math InlineMath ""]]
- ,[Plain [Math InlineMath "f1"]]
- ,[Plain [Math InlineMath "f2"]]]
- [[[Plain [Math InlineMath "e"]]
-  ,[Plain [Math InlineMath "0.5"]]
-  ,[Plain [Math InlineMath "4"]]]
- ,[[Plain [Math InlineMath "f"]]
-  ,[Plain [Math InlineMath "0.5"]]
-  ,[Plain [Math InlineMath "5,5"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath ""]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "f1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "f2"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "e"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "0.5"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "4"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "f"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "0.5"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Math InlineMath "5,5"]]]]
+ []]
 ```
diff --git a/test/command/tabularx.md b/test/command/tabularx.md
index bf7670e9c..9ed991713 100644
--- a/test/command/tabularx.md
+++ b/test/command/tabularx.md
@@ -6,33 +6,51 @@
   & Column Heading 2
   & Column Heading 3 \\
 \hline
-  Cell 1.1 
+  Cell 1.1
   & Cell 1.2
   & Cell 1.3 \\
 \hline
-  Cell 2.1 
+  Cell 2.1
   & Cell 2.2
   & Cell 2.3 \\
 \hline
-  Cell 3.1 
+  Cell 3.1
   & Cell 3.2
   & Cell 3.3 \\
 \hline
 \end{tabularx}
 ^D
-[Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]
- [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
- [[[Plain [Str "Cell",Space,Str "1.1"]]
-  ,[Plain [Str "Cell",Space,Str "1.2"]]
-  ,[Plain [Str "Cell",Space,Str "1.3"]]]
- ,[[Plain [Str "Cell",Space,Str "2.1"]]
-  ,[Plain [Str "Cell",Space,Str "2.2"]]
-  ,[Plain [Str "Cell",Space,Str "2.3"]]]
- ,[[Plain [Str "Cell",Space,Str "3.1"]]
-  ,[Plain [Str "Cell",Space,Str "3.2"]]
-  ,[Plain [Str "Cell",Space,Str "3.3"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.3"]]]]
+ []]
 ```
 
 ```
@@ -43,33 +61,51 @@
   & Column Heading 2
   & Column Heading 3 \\
 \hline
-  Cell 1.1 
+  Cell 1.1
   & Cell 1.2
   & Cell 1.3 \\
 \hline
-  Cell 2.1 
+  Cell 2.1
   & Cell 2.2
   & Cell 2.3 \\
 \hline
-  Cell 3.1 
+  Cell 3.1
   & Cell 3.2
   & Cell 3.3 \\
 \hline
 \end{tabularx}
 ^D
-[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.25]
- [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
- [[[Plain [Str "Cell",Space,Str "1.1"]]
-  ,[Plain [Str "Cell",Space,Str "1.2"]]
-  ,[Plain [Str "Cell",Space,Str "1.3"]]]
- ,[[Plain [Str "Cell",Space,Str "2.1"]]
-  ,[Plain [Str "Cell",Space,Str "2.2"]]
-  ,[Plain [Str "Cell",Space,Str "2.3"]]]
- ,[[Plain [Str "Cell",Space,Str "3.1"]]
-  ,[Plain [Str "Cell",Space,Str "3.2"]]
-  ,[Plain [Str "Cell",Space,Str "3.3"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.3"]]]]
+ []]
 ```
 
 ```
@@ -80,31 +116,49 @@
   & Column Heading 2
   & Column Heading 3 \\
 \hline
-  Cell 1.1 
+  Cell 1.1
   & Cell 1.2
   & Cell 1.3 \\
 \hline
-  Cell 2.1 
+  Cell 2.1
   & Cell 2.2
   & Cell 2.3 \\
 \hline
-  Cell 3.1 
+  Cell 3.1
   & Cell 3.2
   & Cell 3.3 \\
 \hline
 \end{tabularx}
 ^D
-[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.25,0.0,0.25]
- [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
- ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
- [[[Plain [Str "Cell",Space,Str "1.1"]]
-  ,[Plain [Str "Cell",Space,Str "1.2"]]
-  ,[Plain [Str "Cell",Space,Str "1.3"]]]
- ,[[Plain [Str "Cell",Space,Str "2.1"]]
-  ,[Plain [Str "Cell",Space,Str "2.2"]]
-  ,[Plain [Str "Cell",Space,Str "2.3"]]]
- ,[[Plain [Str "Cell",Space,Str "3.1"]]
-  ,[Plain [Str "Cell",Space,Str "3.2"]]
-  ,[Plain [Str "Cell",Space,Str "3.3"]]]]]
+[Table ("",[],[]) (Caption Nothing
+ []) [(AlignLeft,Just 0.25),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "1.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "2.3"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.2"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Cell",Space,Str "3.3"]]]]
+ []]
 ```