From 7254a2ae0ba40b29c04b8924f27739614229432b Mon Sep 17 00:00:00 2001
From: despresc <christian.j.j.despres@gmail.com>
Date: Sat, 28 Mar 2020 18:22:48 -0400
Subject: Implement the new Table type

---
 test/tables-rstsubset.native | 353 ++++++++++++++++++++++++++++++-------------
 1 file changed, 246 insertions(+), 107 deletions(-)

(limited to 'test/tables-rstsubset.native')

diff --git a/test/tables-rstsubset.native b/test/tables-rstsubset.native
index a4f801b1c..bb2a99997 100644
--- a/test/tables-rstsubset.native
+++ b/test/tables-rstsubset.native
@@ -1,114 +1,253 @@
 [Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,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"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
+,Table ("",[],[]) (Caption Nothing
+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,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"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]]]
+ []
 ,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault,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"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,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"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]]]
+ []
 ,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
-,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,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"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
+,Table ("",[],[]) (Caption Nothing
+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,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"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [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.3375]
- [[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"]]
-  ,[Plain [Str "12.0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
- ,[[Plain [Str "Second"]]
-  ,[Plain [Str "row"]]
-  ,[Plain [Str "5.0"]]
-  ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
+,Table ("",[],[]) (Caption Nothing
+ [Para [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,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Centered",SoftBreak,Str "Header"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Default",Space,Str "aligned"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "First"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Second"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "5.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,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.3375]
- [[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"]]
-  ,[Plain [Str "12.0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
- ,[[Plain [Str "Second"]]
-  ,[Plain [Str "row"]]
-  ,[Plain [Str "5.0"]]
-  ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Centered",SoftBreak,Str "Header"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Default",Space,Str "aligned"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "First"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Second"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "5.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
+ []
 ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]
- [[]
- ,[]
- ,[]
- ,[]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,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"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "123"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "1"]]]]
+ []
 ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]
- [[]
- ,[]
- ,[]
- ,[]]
- [[[Plain [Str "First"]]
-  ,[Plain [Str "row"]]
-  ,[Plain [Str "12.0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
- ,[[Plain [Str "Second"]]
-  ,[Plain [Str "row"]]
-  ,[Plain [Str "5.0"]]
-  ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]]
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 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 "First"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "12.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Second"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "row"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "5.0"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
+ []]
-- 
cgit v1.2.3