1 files changed, 76 insertions, 32 deletions
diff --git a/test/docx/tables.native b/test/docx/tables.native
index ae326950a..48de6f947 100644
--- a/test/docx/tables.native
+++ b/test/docx/tables.native
@@ -1,36 +1,80 @@
 [Header 2 ("a-table-with-and-without-a-header-row",[],[]) [Str "A",Space,Str "table,",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "a",Space,Str "header",Space,Str "row"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]
- [[Plain [Str "Name"]]
- ,[Plain [Str "Game"]]
- ,[Plain [Str "Fame"]]
- ,[Plain [Str "Blame"]]]
- [[[Plain [Str "Lebron",Space,Str "James"]]
-  ,[Plain [Str "Basketball"]]
-  ,[Plain [Str "Very",Space,Str "High"]]
-  ,[Plain [Str "Leaving",Space,Str "Cleveland"]]]
- ,[[Plain [Str "Ryan",Space,Str "Braun"]]
-  ,[Plain [Str "Baseball"]]
-  ,[Plain [Str "Moderate"]]
-  ,[Plain [Str "Steroids"]]]
- ,[[Plain [Str "Russell",Space,Str "Wilson"]]
-  ,[Plain [Str "Football"]]
-  ,[Plain [Str "High"]]
-  ,[Plain [Str "Tacky",Space,Str "uniform"]]]]
-,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[]
- ,[]]
- [[[Plain [Str "Sinple"]]
-  ,[Plain [Str "Table"]]]
- ,[[Plain [Str "Without"]]
-  ,[Plain [Str "Header"]]]]
-,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[]
- ,[]]
- [[[Para [Str "Simple"]
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Name"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Game"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Fame"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Blame"]]]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Lebron",Space,Str "James"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Basketball"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Very",Space,Str "High"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Leaving",Space,Str "Cleveland"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Ryan",Space,Str "Braun"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Baseball"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Moderate"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Steroids"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Russell",Space,Str "Wilson"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Football"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "High"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Tacky",Space,Str "uniform"]]]]
+ []
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Sinple"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Table"]]]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Without"]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Plain [Str "Header"]]]]
+ []
+,Table ("",[],[]) (Caption Nothing
+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   []
+  ,Cell ("",[],[]) Nothing 1 1
+   []]]
+ [Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Para [Str "Simple"]
    ,Para [Str "Multiparagraph"]]
-  ,[Para [Str "Table"]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Para [Str "Table"]
    ,Para [Str "Full"]]]
- ,[[Para [Str "Of"]
+ ,Row ("",[],[])
+  [Cell ("",[],[]) Nothing 1 1
+   [Para [Str "Of"]
    ,Para [Str "Paragraphs"]]
-  ,[Para [Str "In",Space,Str "each"]
-   ,Para [Str "Cell."]]]]]
+  ,Cell ("",[],[]) Nothing 1 1
+   [Para [Str "In",Space,Str "each"]
+   ,Para [Str "Cell."]]]]
+ []]