From 4e34d366df31937cdc69b6b366355f10a84c16b2 Mon Sep 17 00:00:00 2001 From: despresc Date: Sat, 4 Apr 2020 16:35:42 -0400 Subject: Adapt to the newest Table type, fix some previous adaptation issues - Writers.Native is now adapted to the new Table type. - Inline captions should now be conditionally wrapped in a Plain, not a Para block. - The toLegacyTable function now lives in Writers.Shared. --- test/command/tabularx.md | 183 ++++++++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 81 deletions(-) (limited to 'test/command/tabularx.md') diff --git a/test/command/tabularx.md b/test/command/tabularx.md index 9ed991713..6ceb23a3f 100644 --- a/test/command/tabularx.md +++ b/test/command/tabularx.md @@ -21,36 +21,43 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -76,36 +83,43 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidth 0.25)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -131,34 +145,41 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Just 0.25),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0 + []) + [(AlignLeft,ColWidth 0.25) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidth 0.25)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` -- cgit v1.2.3