From d368536a4ebfc542a58bd9bec6718590711c6efb Mon Sep 17 00:00:00 2001 From: despresc Date: Sun, 5 Apr 2020 19:53:35 -0400 Subject: Adapt to the removal of the RowSpan, ColSpan, RowHeadColumns accessors --- test/tikiwiki-reader.native | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'test/tikiwiki-reader.native') diff --git a/test/tikiwiki-reader.native b/test/tikiwiki-reader.native index 84f19e20e..0c34f60ce 100644 --- a/test/tikiwiki-reader.native +++ b/test/tikiwiki-reader.native @@ -96,26 +96,26 @@ Pandoc (Meta {unMeta = fromList []}) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]]]]) - [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [(TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Apple"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Bread"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Pie"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Butter"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Ice",Space,Str "cream"]]]])] (TableFoot ("",[],[]) []) @@ -125,26 +125,26 @@ Pandoc (Meta {unMeta = fromList []}) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]]]]) - [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [(TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Apple"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Bread"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Pie"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Strong [Str "Butter"]]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Ice",Space,Str "cream"]]]])] (TableFoot ("",[],[]) []) @@ -154,21 +154,21 @@ Pandoc (Meta {unMeta = fromList []}) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]]]]) - [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [(TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Apple"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]])] (TableFoot ("",[],[]) []) @@ -179,34 +179,34 @@ Pandoc (Meta {unMeta = fromList []}) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str ""]]]]) - [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [(TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Orange",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Apple",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "more"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Bread",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Pie",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "more"]]] ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Butter",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "Ice",Space,Str "cream",Space]] - ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Space,Str "and",Space,Str "more",Space]]]])] (TableFoot ("",[],[]) [])] -- cgit v1.2.3