From b40d33b174d11c5f5b9b3011a3a3b6da42d5be20 Mon Sep 17 00:00:00 2001 From: mb21 Date: Sat, 17 Jan 2015 17:28:19 +0100 Subject: fixes #1859 HTML Reader table parsing --- tests/html-reader.html | 247 +++++++++++++++++++++++++++++++++++++++++++++++ tests/html-reader.native | 129 ++++++++++++++++++++++++- 2 files changed, 375 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/html-reader.html b/tests/html-reader.html index e9ba2a68b..749925b2a 100644 --- a/tests/html-reader.html +++ b/tests/html-reader.html @@ -433,6 +433,7 @@ An e-mail address: nobody [at] nowhere.net

text Leading spaces

Trailing spaces text

Tables

+

Tables with Headers

@@ -450,5 +451,251 @@ An e-mail address: nobody [at] nowhere.net
X6
+
+ + + + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + + + + + +
XYZ
123
456
+
+ + + + + + + + + + + + + + + + + + + + + + +
XYZ
1

2

3
456
+

Tables without Headers

+ + + + + + + + + + + + + +
123
456
+
+ + + + + + + + + + + +
123
456
+
+ + + + + + + + + + + + + + + +
123
456
+
+ + + + + + + + + + + + + + + +
123
456
+

Empty Tables

+

This section should be empty.

+ + + +
+ +
diff --git a/tests/html-reader.native b/tests/html-reader.native index aef6e40fc..b2d660fda 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -311,6 +311,7 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,Para [Str "text",Space,Emph [Str "Leading",Space,Str "spaces"]] ,Para [Emph [Str "Trailing",Space,Str "spaces"],Space,Str "text"] ,Header 1 ("",[],[]) [Str "Tables"] +,Header 2 ("",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"] ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] [[Plain [Str "X"]] ,[Plain [Str "Y"]] @@ -320,4 +321,130 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,[Plain [Str "3"]]] ,[[Plain [Str "4"]] ,[Plain [Str "5"]] - ,[Plain [Str "6"]]]]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.3333333333333333,0.3333333333333333,0.3333333333333333] + [[Plain [Str "X"]] + ,[Plain [Str "Y"]] + ,[Plain [Str "Z"]]] + [[[Plain [Str "1"]] + ,[Para [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,Header 2 ("",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"] +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,HorizontalRule +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [] + [[[Plain [Str "1"]] + ,[Plain [Str "2"]] + ,[Plain [Str "3"]]] + ,[[Plain [Str "4"]] + ,[Plain [Str "5"]] + ,[Plain [Str "6"]]]] +,Header 2 ("",[],[]) [Str "Empty",Space,Str "Tables"] +,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]] -- cgit v1.2.3