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/gfm.md | 72 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 30 deletions(-) (limited to 'test/command/gfm.md') diff --git a/test/command/gfm.md b/test/command/gfm.md index 3ef3665a6..a9be295a8 100644 --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -8,23 +8,29 @@ gfm tests: | orange|1.12| ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Price"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.13"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Price"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.13"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.12"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -69,23 +75,29 @@ My:thumbsup:emoji:heart: ``` % pandoc -t gfm -f native [Table ("",[],[]) (Caption Nothing - [Para [Str "The",Space,Str "caption."]]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0 + [Plain [Str "The",Space,Str "caption."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Price"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.13"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Price"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.13"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.12"]]]])] + (TableFoot ("",[],[]) + [])] ^D | Fruit | Price | | ------ | ----: | -- cgit v1.2.3