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/man-reader.native | 324 +++++++++++++++++++++++++++---------------------- 1 file changed, 181 insertions(+), 143 deletions(-) (limited to 'test/man-reader.native') diff --git a/test/man-reader.native b/test/man-reader.native index 7b2f6f966..54751d3c3 100644 --- a/test/man-reader.native +++ b/test/man-reader.native @@ -106,169 +106,207 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,", ,Para [Strong [Str "Me",Space,Str "Myself"],Space,Str "and",Space,Str "I.",Space,Emph [Str "The",Space,Str "author",Space,Str "is",Space,Str "John",Space,Str "Jones."],Space,Str "It's",Space,Str "The",Space,Strong [Str "Author"],Str "."] ,Header 1 ("",[],[]) [Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Left",Space,Emph [Str "more"]]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Left",Space,Emph [Str "more"]]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignLeft,Nothing),(AlignRight,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",Space,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Just 0.5),(AlignLeft,Just 0.5)] 0 + []) + [(AlignRight,ColWidth 0.5) + ,(AlignLeft,ColWidth 0.5)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "one"] - ,Para [Str "two"]] - ,Cell ("",[],[]) Nothing 1 1 - [CodeBlock ("",[],[]) "some\n code"]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "one"] + ,Para [Str "two"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [CodeBlock ("",[],[]) "some\n code"]]])] + (TableFoot ("",[],[]) + [])] -- cgit v1.2.3