From a400d0dc623a2f08d7470788855e880291d2f222 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sat, 12 Sep 2020 20:44:15 +0200 Subject: HTML writer: render table footers if present Part of: #6314 --- test/Tests/Old.hs | 13 +++++----- test/tables/nordics.html4 | 59 ++++++++++++++++++++++++++++++++++++++++++++++ test/tables/nordics.html5 | 59 ++++++++++++++++++++++++++++++++++++++++++++++ test/tables/nordics.native | 46 ++++++++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 test/tables/nordics.html4 create mode 100644 test/tables/nordics.html5 create mode 100644 test/tables/nordics.native (limited to 'test') diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs index 9ae10261e..ba6947eda 100644 --- a/test/Tests/Old.hs +++ b/test/Tests/Old.hs @@ -267,12 +267,13 @@ writerTests pandocPath format extendedWriterTests :: FilePath -> String -> [TestTree] extendedWriterTests pandocPath format = writerTests pandocPath format ++ - [ test pandocPath - "tables" - opts - ("tables" "planets.native") - ("tables" "planets" <.> format) - ] + let testForTable name = + test pandocPath + (name ++ " table") + opts + ("tables" name <.> "native") + ("tables" name <.> format) + in map testForTable ["planets", "nordics"] where opts = ["-r", "native", "-w", format, "--columns=78", "--variable", "pandoc-version="] diff --git a/test/tables/nordics.html4 b/test/tables/nordics.html4 new file mode 100644 index 000000000..13fa1976d --- /dev/null +++ b/test/tables/nordics.html4 @@ -0,0 +1,59 @@ + + ++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

States belonging to the Nordics.
NameCapitalPopulation
+(in 2018)		Area
+(in km2)
DenmarkCopenhagen5,809,50243,094
FinlandHelsinki5,537,364338,145
IcelandReykjavik343,518103,000
NorwayOslo5,372,191323,802
SwedenStockholm10,313,447450,295
Total27,376,0221,258,336
diff --git a/test/tables/nordics.html5 b/test/tables/nordics.html5 new file mode 100644 index 000000000..f0dd8b958 --- /dev/null +++ b/test/tables/nordics.html5 @@ -0,0 +1,59 @@ + + ++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

States belonging to the Nordics.
NameCapitalPopulation
+(in 2018)		Area
+(in km2)
DenmarkCopenhagen5,809,50243,094
FinlandHelsinki5,537,364338,145
IcelandReykjavik343,518103,000
NorwayOslo5,372,191323,802
SwedenStockholm10,313,447450,295
Total27,376,0221,258,336
diff --git a/test/tables/nordics.native b/test/tables/nordics.native new file mode 100644 index 000000000..dc6a33b39 --- /dev/null +++ b/test/tables/nordics.native @@ -0,0 +1,46 @@ +[Table ("",[],[]) (Caption (Just [Str "Nordic countries"]) + [Para [Str "States", Space, Str "belonging", Space, Str "to", Space, Str "the", Space, Emph [Str "Nordics."]]]) + [(AlignCenter,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.2) + ,(AlignLeft,ColWidth 0.2)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) [Plain [Str "Name"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) [Plain [Str "Capital"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) [Plain [Str "Population", LineBreak, Str "(in", Space, Str "2018)"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) [Plain [Str "Area", LineBreak, Str "(in", Space, Str "km", Superscript [Str "2"], Str ")"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 1) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Denmark"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Copenhagen"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "5,809,502"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "43,094"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Finland"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Helsinki"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "5,537,364"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "338,145"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Iceland"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Reykjavik"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "343,518"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "103,000"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Norway"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Oslo"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "5,372,191"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "323,802"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Sweden"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Stockholm"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "10,313,447"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "450,295"]]]])] + (TableFoot ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Total"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "27,376,022"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1,258,336"]]]]) +] -- cgit v1.2.3