From a9c766291f529ffe50c0415a03f06f9756a0a5f0 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Fri, 27 Nov 2020 10:36:13 +0100 Subject: HTML reader: support body headers, row head columns Closes: #6312 --- test/command/1881.md | 6 +++--- test/html-reader.native | 41 ++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/command/1881.md b/test/command/1881.md index fe8cd52a0..f91c50d68 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -27,7 +27,7 @@ ,(AlignCenter,ColWidthDefault) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) - [Row ("",[],[]) + [Row ("",["header"],[]) [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) [Plain [Str "Right"]] ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) @@ -38,7 +38,7 @@ [Plain [Str "Default"]]]]) [(TableBody ("",[],[]) (RowHeadColumns 0) [] - [Row ("",[],[]) + [Row ("",["odd"],[]) [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) [Plain [Str "12"]] ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) @@ -72,7 +72,7 @@ []) [(TableBody ("",[],[]) (RowHeadColumns 0) [] - [Row ("",[],[]) + [Row ("",["odd"],[]) [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) [Plain [Str "12"]] ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) diff --git a/test/html-reader.native b/test/html-reader.native index 1b5e4f813..ea74c25e1 100644 --- a/test/html-reader.native +++ b/test/html-reader.native @@ -408,7 +408,7 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl [Plain [Str "Y"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Z"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) + [(TableBody ("",[],[]) (RowHeadColumns 1) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) @@ -440,7 +440,7 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl [Plain [Str "Y"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Z"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) + [(TableBody ("",[],[]) (RowHeadColumns 1) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) @@ -472,15 +472,14 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Z"]]]]) [(TableBody ("",[],[]) (RowHeadColumns 0) - [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "2"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "3"]]] - ,Row ("",[],[]) + [Plain [Str "3"]]]] + [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "4"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) @@ -496,15 +495,15 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,(AlignDefault,ColWidthDefault) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "X"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Y"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Z"]]]]) + []) [(TableBody ("",[],[]) (RowHeadColumns 0) - [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "X"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Y"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Z"]]]] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]] @@ -528,15 +527,15 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,(AlignDefault,ColWidthDefault) ,(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "X"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Y"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Z"]]]]) + []) [(TableBody ("",[],[]) (RowHeadColumns 0) - [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "X"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Y"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Z"]]]] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]] -- cgit v1.2.3