From b5d28d7d306585eaf3db807612a6c87cdd565ea3 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Thu, 26 Aug 2021 15:59:33 -0400 Subject: [PATCH] Fixes #523. Added test case to test flexibility. Updated old test case 443678, which is better with this fix. This fixes #523 and tries to be as general as possible. Right now the fix is only applied if the prev or next tag is a body level div, but perhaps should be applied for anything that's acting as block level element. In any case, the specific bug is killed. --- .../cases/github-cases/case-523.conf | 4 +++ .../cases/github-cases/case-523@1.html | 28 +++++++++++++++++++ .../cases/github-expects/case-523.html | 27 ++++++++++++++++++ .../cases/github-expects/case-523.txt | 26 +++++++++++++++++ .../cases/legacy-expects/case-443678.html | 2 +- src/parser.c | 16 +++++++++++ 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100755 regression_testing/cases/github-cases/case-523.conf create mode 100644 regression_testing/cases/github-cases/case-523@1.html create mode 100644 regression_testing/cases/github-expects/case-523.html create mode 100644 regression_testing/cases/github-expects/case-523.txt diff --git a/regression_testing/cases/github-cases/case-523.conf b/regression_testing/cases/github-cases/case-523.conf new file mode 100755 index 0000000..dd7818a --- /dev/null +++ b/regression_testing/cases/github-cases/case-523.conf @@ -0,0 +1,4 @@ +# Config for test case. +tidy-mark: no +indent: no +wrap: 99999 diff --git a/regression_testing/cases/github-cases/case-523@1.html b/regression_testing/cases/github-cases/case-523@1.html new file mode 100644 index 0000000..fec3c7f --- /dev/null +++ b/regression_testing/cases/github-cases/case-523@1.html @@ -0,0 +1,28 @@ + + + + +test + + + + +

Hello

+ + + +

This is a block level element, and as such, is capable of inlining inline elements. Scripts are inline elements, so this script should be included in the flow.

+ +
+

This is another paragraph with an tag inline.

+ + + diff --git a/regression_testing/cases/github-expects/case-523.html b/regression_testing/cases/github-expects/case-523.html new file mode 100644 index 0000000..eae4782 --- /dev/null +++ b/regression_testing/cases/github-expects/case-523.html @@ -0,0 +1,27 @@ + + + + +test + + + + +

Hello

+ + +

This is a block level element, and as such, is capable of inlining inline elements. + Scripts are inline elements, so this script should be included in the flow.

+ + +
+

This is another paragraph with an tag inline.

+ + + diff --git a/regression_testing/cases/github-expects/case-523.txt b/regression_testing/cases/github-expects/case-523.txt new file mode 100644 index 0000000..f31fab1 --- /dev/null +++ b/regression_testing/cases/github-expects/case-523.txt @@ -0,0 +1,26 @@ +line 19 column 1 - Warning: lacks "alt" attribute +line 23 column 41 - Warning: lacks "alt" attribute +line 25 column 38 - Warning: lacks "alt" attribute +line 26 column 1 - Warning: lacks "alt" attribute +line 26 column 20 - Warning: lacks "alt" attribute +line 26 column 39 - Warning: lacks "alt" attribute +Info: Document content looks like HTML5 +Tidy found 6 warnings and 0 errors! + +The alt attribute should be used to give a short description +of an image; longer descriptions should be given with the +longdesc attribute which takes a URL linked to the description. +These measures are needed for people using non-graphical browsers. + +For further advice on how to make your pages accessible +see https://www.w3.org/WAI/GL. +About HTML Tidy: https://github.com/htacg/tidy-html5 +Bug reports and comments: https://github.com/htacg/tidy-html5/issues +Official mailing list: https://lists.w3.org/Archives/Public/public-htacg/ +Latest HTML specification: https://html.spec.whatwg.org/multipage/ +Validate your HTML documents: https://validator.w3.org/nu/ +Lobby your company to join the W3C: https://www.w3.org/Consortium + +Do you speak a language other than English, or a different variant of +English? Consider helping us to localize HTML Tidy. For details please see +https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md diff --git a/regression_testing/cases/legacy-expects/case-443678.html b/regression_testing/cases/legacy-expects/case-443678.html index d27f241..61c6336 100644 --- a/regression_testing/cases/legacy-expects/case-443678.html +++ b/regression_testing/cases/legacy-expects/case-443678.html @@ -18,7 +18,7 @@ - Just a test. + Just a test.