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/latex-tabular-column-specs.md | 47 +++++++++++++++++------------- 1 file changed, 27 insertions(+), 20 deletions(-) (limited to 'test/command/latex-tabular-column-specs.md') diff --git a/test/command/latex-tabular-column-specs.md b/test/command/latex-tabular-column-specs.md index 65835019f..c4ab8eae0 100644 --- a/test/command/latex-tabular-column-specs.md +++ b/test/command/latex-tabular-column-specs.md @@ -12,27 +12,34 @@ f & 0.5 & 5,5 \\ \end{tabular} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Math InlineMath ""]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "f2"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "0.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "4"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "f"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "0.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "5,5"]]]])] + (TableFoot ("",[],[]) + [])] ``` -- cgit v1.2.3