Fixes #611.

balthisar · balthisar · commit 0d72ca395f8b · 2021-08-17T14:51:40.000-04:00
diff --git a/regression_testing/cases/github-cases/case-611a.conf b/regression_testing/cases/github-cases/case-611a.conf
@@ -0,0 +1,3 @@
+indent: auto
+tidy-mark: no
+clean: yes
diff --git a/regression_testing/cases/github-cases/case-611a@0.html b/regression_testing/cases/github-cases/case-611a@0.html
@@ -0,0 +1,7 @@
+<template><tr><td>1</td></tr></template>
+
+
+<template><td>1</td></template>
+
+
+<template><li>1</li></template>
diff --git a/regression_testing/cases/github-cases/case-611b.conf b/regression_testing/cases/github-cases/case-611b.conf
@@ -0,0 +1,3 @@
+indent: auto
+tidy-mark: no
+clean: yes
diff --git a/regression_testing/cases/github-cases/case-611b@0.html b/regression_testing/cases/github-cases/case-611b@0.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Issue #611-1</title>
+</head>
+<body>
+<template><tr><td>1</td></tr></template>
+</body>
+</html>
diff --git a/regression_testing/cases/github-cases/case-611c.conf b/regression_testing/cases/github-cases/case-611c.conf
@@ -0,0 +1,3 @@
+indent: auto
+tidy-mark: no
+clean: yes
diff --git a/regression_testing/cases/github-cases/case-611c@0.html b/regression_testing/cases/github-cases/case-611c@0.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Issue #611-2d</title>
+<script>
+ // Data is hard-coded here, but could come from the server
+ var data = [
+   { name: 'Pillar', color: 'Ticked Tabby', sex: 'Female (neutered)', legs: 3 },
+   { name: 'Hedral', color: 'Tuxedo', sex: 'Male (neutered)', legs: 4 },
+ ];
+</script>
+</head>
+<body>
+<table>
+ <thead>
+  <tr>
+   <th>Name <th>Color <th>Sex <th>Legs
+ <tbody>
+  <template id="row">
+   <tr><td><td><td><td>
+  </template>
+</table>
+<script>
+ var template = document.querySelector('#row');
+ for (var i = 0; i < data.length; i += 1) {
+   var cat = data[i];
+   var clone = template.content.cloneNode(true);
+   var cells = clone.querySelectorAll('td');
+   cells[0].textContent = cat.name;
+   cells[1].textContent = cat.color;
+   cells[2].textContent = cat.sex;
+   cells[3].textContent = cat.legs;
+   template.parentNode.appendChild(clone);
+ }
+</script>
+</body>
+</html>
+
diff --git a/src/parser.c b/src/parser.c
@@ -1417,7 +1417,7 @@ Node* TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                     return NULL;
                 }
             }
-            else /* things like list items */
+            else if ( ! nodeIsTEMPLATE( element ) )/* things like list items */
             {
                 if (node->tag->model & CM_HEAD)
                 {
diff --git a/src/tags.h b/src/tags.h
@@ -463,6 +463,7 @@ TY_PRIVATE uint TY_(nodeHeaderLevel)( Node* node );
 #define nodeIsDATALIST( node )   TagIsId( node, TidyTag_DATALIST )
 #define nodeIsDATA( node )       TagIsId( node, TidyTag_DATA )
 #define nodeIsMATHML( node )     TagIsId( node, TidyTag_MATHML ) /* #130 MathML attr and entity fix! */
+#define nodeIsTEMPLATE( node )   TagIsId( node, TidyTag_TEMPLATE )
 
 /* NOT in HTML 5 */
 #define nodeIsACRONYM( node )    TagIsId( node, TidyTag_ACRONYM )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+indent: auto`
	`2`	`+tidy-mark: no`
	`3`	`+clean: yes`
Original file line number	Diff line number	Diff line change
`@@ -1417,7 +1417,7 @@ Node* TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode )`
`1417`	`1417`	`return NULL;`
`1418`	`1418`	`}`
`1419`	`1419`	`}`
`1420`		`- else /* things like list items */`
	`1420`	`+ else if ( ! nodeIsTEMPLATE( element ) )/* things like list items */`
`1421`	`1421`	`{`
`1422`	`1422`	`if (node->tag->model & CM_HEAD)`
`1423`	`1423`	`{`