From 009da61f8b49739718c4b2be14af54a172a6286e Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Fri, 9 Jul 2021 15:51:14 -0400 Subject: [PATCH] Fixes #836. Version bump to reflect change. Test cases added. --- .../cases/github-cases/case-836.conf | 3 ++ .../cases/github-cases/case-836@0.html | 22 +++++++++++++++ .../cases/github-expects/case-836.html | 28 +++++++++++++++++++ .../cases/github-expects/case-836.txt | 13 +++++++++ src/tags.c | 2 +- version.txt | 2 +- 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100755 regression_testing/cases/github-cases/case-836.conf create mode 100755 regression_testing/cases/github-cases/case-836@0.html create mode 100644 regression_testing/cases/github-expects/case-836.html create mode 100644 regression_testing/cases/github-expects/case-836.txt diff --git a/regression_testing/cases/github-cases/case-836.conf b/regression_testing/cases/github-cases/case-836.conf new file mode 100755 index 0000000..ae68f79 --- /dev/null +++ b/regression_testing/cases/github-cases/case-836.conf @@ -0,0 +1,3 @@ +# Sample config for 938. +indent: yes +wrap: 999 diff --git a/regression_testing/cases/github-cases/case-836@0.html b/regression_testing/cases/github-cases/case-836@0.html new file mode 100755 index 0000000..159a0b1 --- /dev/null +++ b/regression_testing/cases/github-cases/case-836@0.html @@ -0,0 +1,22 @@ + + + + + +Issue #836 + + + +

Issue #836

+ + diff --git a/regression_testing/cases/github-expects/case-836.html b/regression_testing/cases/github-expects/case-836.html new file mode 100644 index 0000000..4b0861a --- /dev/null +++ b/regression_testing/cases/github-expects/case-836.html @@ -0,0 +1,28 @@ + + + + + + + Issue #836 + + + + +

+ Issue #836 +

+ + diff --git a/regression_testing/cases/github-expects/case-836.txt b/regression_testing/cases/github-expects/case-836.txt new file mode 100644 index 0000000..0d4c82c --- /dev/null +++ b/regression_testing/cases/github-expects/case-836.txt @@ -0,0 +1,13 @@ +Info: Document content looks like HTML5 +No warnings or errors were found. + +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: http://dev.w3.org/html5/spec-author-view/ +Validate your HTML documents: http://validator.w3.org/nu/ +Lobby your company to join the W3C: http://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/src/tags.c b/src/tags.c index 70fb5ac..095c20c 100644 --- a/src/tags.c +++ b/src/tags.c @@ -325,7 +325,7 @@ static Dict tag_defs[] = { TidyTag_SLOT, "slot", VERS_ELEM_SLOT, &TY_(W3CAttrsFor_SLOT)[0], (CM_BLOCK|CM_INLINE|CM_MIXED), TY_(ParseBlock), NULL }, { TidyTag_SOURCE, "source", VERS_ELEM_SOURCE, &TY_(W3CAttrsFor_SOURCE)[0], (CM_BLOCK|CM_INLINE|CM_EMPTY), TY_(ParseBlock), NULL }, { TidyTag_SUMMARY, "summary", VERS_ELEM_SUMMARY, &TY_(W3CAttrsFor_SUMMARY)[0], (CM_BLOCK), TY_(ParseBlock), NULL }, /* Is. #895 */ - { TidyTag_TEMPLATE, "template", VERS_ELEM_TEMPLATE, &TY_(W3CAttrsFor_TEMPLATE)[0], (CM_BLOCK), TY_(ParseBlock), NULL }, + { TidyTag_TEMPLATE, "template", VERS_ELEM_TEMPLATE, &TY_(W3CAttrsFor_TEMPLATE)[0], (CM_BLOCK|CM_HEAD), TY_(ParseBlock), NULL }, { TidyTag_TIME, "time", VERS_ELEM_TIME, &TY_(W3CAttrsFor_TIME)[0], (CM_INLINE), TY_(ParseInline), NULL }, { TidyTag_TRACK, "track", VERS_ELEM_TRACK, &TY_(W3CAttrsFor_TRACK)[0], (CM_BLOCK|CM_EMPTY), TY_(ParseBlock), NULL }, { TidyTag_VIDEO, "video", VERS_ELEM_VIDEO, &TY_(W3CAttrsFor_VIDEO)[0], (CM_BLOCK|CM_INLINE), TY_(ParseBlock), NULL }, diff --git a/version.txt b/version.txt index 340d04c..5367c8e 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.7.57 +5.7.58 2021.07.09