normalize html output for title/textarea also

rbri · rbri · commit c165891e0753 · 2026-07-27T17:20:15.000+02:00
diff --git a/src/main/java/org/htmlunit/cyberneko/filters/HTMLWriterFilter.java b/src/main/java/org/htmlunit/cyberneko/filters/HTMLWriterFilter.java
@@ -155,7 +155,13 @@ public void startElement(final QName element, final XMLAttributes attributes, fi
         throws XNIException {
         seenRootElement_ = true;
         elementDepth_++;
-        normalize_ = !htmlElements_.getElement(element.getRawname()).isSpecial();
+
+        final int elementCode = htmlElements_.getElement(element.getRawname()).code;
+        normalize_ = HTMLElements.PLAINTEXT != elementCode
+                        && HTMLElements.SCRIPT != elementCode
+                        && HTMLElements.STYLE != elementCode
+                        && HTMLElements.XMP != elementCode;
+
         printStartElement(element, attributes, false);
         super.startElement(element, attributes, augs);
     }
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/fuzzer/test-476170180/test-476170180.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/fuzzer/test-476170180/test-476170180.html.canonical-html
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/head/test-head-does-not-close-title.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/head/test-head-does-not-close-title.html.canonical-html
@@ -1 +1 @@
-<html><head><title>foo</head><body></title></head><body>foo</body></html>
+<html><head><title>foo&lt;&sol;head&gt;&lt;body&gt;</title></head><body>foo</body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/malformed/test-form-element-errors.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/malformed/test-form-element-errors.html.canonical-html
@@ -7,9 +7,9 @@
 </option><option>Option 2
 </option></select>
 <textarea>Text area content
-</div>
-<button>Submit
-</form>
-</body>
-</html>
+&lt;&sol;div&gt;
+&lt;button&gt;Submit
+&lt;&sol;form&gt;
+&lt;&sol;body&gt;
+&lt;&sol;html&gt;
 </textarea></label></div></form></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/malformed/test-real-world-malformed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/malformed/test-real-world-malformed.html.canonical-html
@@ -1,33 +1,33 @@
 <HTML><head>
 <meta charset="utf-8" />
 <title>Real World Example
-<body>
-<div id=header>
-<h1>Welcome</h1>
-</div>
-<div id=content>
-<p>This is a <b>bold <i>and italic</b></i> text.
-<ul>
-<li>First item
-<li>Second item
-<ul>
-<li>Nested item
-</ul>
-</ul>
-<table border=1>
-<tr>
-<th>Header 1<th>Header 2
-<tr>
-<td>Data 1<td>Data 2
-</table>
-<form action=submit.php method=post>
-<input type=text name=username>
-<input type=password name=password>
-<button>Submit
-</form>
-</div>
-<div id=footer>
-<p>© 2024 Example
-</div>
-</html>
+&lt;body&gt;
+&lt;div id&equals;header&gt;
+&lt;h1&gt;Welcome&lt;&sol;h1&gt;
+&lt;&sol;div&gt;
+&lt;div id&equals;content&gt;
+&lt;p&gt;This is a &lt;b&gt;bold &lt;i&gt;and italic&lt;&sol;b&gt;&lt;&sol;i&gt; text&period;
+&lt;ul&gt;
+&lt;li&gt;First item
+&lt;li&gt;Second item
+&lt;ul&gt;
+&lt;li&gt;Nested item
+&lt;&sol;ul&gt;
+&lt;&sol;ul&gt;
+&lt;table border&equals;1&gt;
+&lt;tr&gt;
+&lt;th&gt;Header 1&lt;th&gt;Header 2
+&lt;tr&gt;
+&lt;td&gt;Data 1&lt;td&gt;Data 2
+&lt;&sol;table&gt;
+&lt;form action&equals;submit&period;php method&equals;post&gt;
+&lt;input type&equals;text name&equals;username&gt;
+&lt;input type&equals;password name&equals;password&gt;
+&lt;button&gt;Submit
+&lt;&sol;form&gt;
+&lt;&sol;div&gt;
+&lt;div id&equals;footer&gt;
+&lt;p&gt;&copy; 2024 Example
+&lt;&sol;div&gt;
+&lt;&sol;html&gt;
 </title></head><body></body></HTML>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-UTF-8.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-UTF-8.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta charset="UTF-8" />
-<title>Avec à, é et è</title></head><body></body></html>
+<title>Avec &agrave;&comma; &eacute; et &egrave;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-gb2312.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-gb2312.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta charset="gb2312" />
-<title>Avec à, é et è 和平</title></head><body></body></html>
+<title>Avec &agrave;&comma; &eacute; et &egrave; 和平</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-unicode20utf8.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-unicode20utf8.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta charset="UniCode20utf8" />
-<title>Avec à, é et è</title></head><body></body></html>
+<title>Avec &agrave;&comma; &eacute; et &egrave;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-x-user-defined.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-charset-x-user-defined.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta charset="x-user-defined" />
-<title>abcd!€ªðÿ</title></head><body></body></html>
+<title>abcd&excl;&euro;&ordf;&eth;&yuml;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-encoding-ISO8859-1.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-encoding-ISO8859-1.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>Avec à, é et é</title></head><body></body></html>
+<title>Avec &agrave;&comma; &eacute; et &eacute;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-encoding-trim.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/meta/test-meta-encoding-trim.html.canonical-html
@@ -1,2 +1,2 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset = iso8859-1 ;charset=UTF-8" />
-<title>Avec à, é et é</title></head><body></body></html>
+<title>Avec &agrave;&comma; &eacute; et &eacute;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-attribute/test-textarea-close-inside-attribute.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-attribute/test-textarea-close-inside-attribute.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><div><textarea><link href="</textarea>&quot;&sol;&gt;</div></body></html>
+<html><head></head><body><div><textarea>&lt;link href&equals;&quot;</textarea>&quot;&sol;&gt;</div></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-comment/test-textarea-close-inside-comment.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-comment/test-textarea-close-inside-comment.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><div><textarea><!-- </textarea> --&gt;</div></body></html>
+<html><head></head><body><div><textarea>&lt;&excl;-- </textarea> --&gt;</div></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-comment2/test-textarea-close-inside-comment2.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-close-inside-comment2/test-textarea-close-inside-comment2.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><textarea><!--</textarea><img src="x" />--&gt;</body></html>
+<html><head></head><body><textarea>&lt;&excl;--</textarea><img src="x" />--&gt;</body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-entity-inside/test-textarea-entity-inside.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-entity-inside/test-textarea-entity-inside.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><textarea>&</textarea></body></html>
+<html><head></head><body><textarea>&amp;</textarea></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-quote-inside/test-textarea-quote-inside.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-quote-inside/test-textarea-quote-inside.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><textarea>arf "woof</textarea></body></html>
+<html><head></head><body><textarea>arf &quot;woof</textarea></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-script-inside/test-textarea-script-inside.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-script-inside/test-textarea-script-inside.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><textarea><script>alert('x');</script></textarea></body></html>
+<html><head></head><body><textarea>&lt;script&gt;alert&lpar;&apos;x&apos;&rpar;&semi;&lt;&sol;script&gt;</textarea></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-tag-inside/test-textarea-tag-inside.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/textarea/test-textarea-tag-inside/test-textarea-tag-inside.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><textarea>Hello <span>Worlds</span></textarea></body></html>
+<html><head></head><body><textarea>Hello &lt;span&gt;Worlds&lt;&sol;span&gt;</textarea></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-ampersand/test-title-ampersand.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-ampersand/test-title-ampersand.html.canonical-html
@@ -1 +1 @@
-<html><head><title>&X</title></head><body></body></html>
+<html><head><title>&amp;X</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-bug1922810/test-title-bug1922810.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-bug1922810/test-title-bug1922810.html.canonical-html
@@ -1 +1 @@
-<html><head><title>This doesn't work</title></head><body>Body</body></html>
+<html><head><title>This doesn&apos;t work</title></head><body>Body</body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-contains-tag/test-title-contains-tag.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-contains-tag/test-title-contains-tag.html.canonical-html
@@ -1 +1 @@
-<html><head><title><div>text</div></title></head><body></body></html>
+<html><head><title>&lt;div&gt;text&lt;&sol;div&gt;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-empty/test-title-entity.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-empty/test-title-entity.html
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-in-body-self-closed/test-title-in-body-self-closed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-in-body-self-closed/test-title-in-body-self-closed.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><title></body></html></title></body></html>
+<html><head></head><body><title>&lt;&sol;body&gt;&lt;&sol;html&gt;</title></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-in-body-unclosed/test-title-in-body-unclosed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-in-body-unclosed/test-title-in-body-unclosed.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><title>Titel<p>text</p></body></html></title></body></html>
+<html><head></head><body><title>Titel&lt;p&gt;text&lt;&sol;p&gt;&lt;&sol;body&gt;&lt;&sol;html&gt;</title></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-parse-text/test-title-parse-text.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-parse-text/test-title-parse-text.html.canonical-html
@@ -1 +1 @@
-<html><head><title><div id='</title></head><body>&apos;&gt;</body></html>
+<html><head><title>&lt;div id&equals;&apos;</title></head><body>&apos;&gt;</body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-quote/test-title-quote.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-quote/test-title-quote.html.canonical-html
@@ -1,3 +1,3 @@
 <html><head>
-<title>It's a wonderful world!</title>
+<title>It&apos;s a wonderful world&excl;</title>
 </head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-self-closed/test-title-self-closed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-self-closed/test-title-self-closed.html.canonical-html
@@ -1 +1 @@
-<html><head><title></head><body></body></html></title></head><body></body></html>
+<html><head><title>&lt;&sol;head&gt;&lt;body&gt;&lt;&sol;body&gt;&lt;&sol;html&gt;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-unclosed/test-title-unclosed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title-unclosed/test-title-unclosed.html.canonical-html
@@ -1,5 +1,5 @@
 <html><head>
 <title>Unclosed title
-</head>
-<body>Hello there</body>
-</html></title></head><body></body></html>
+&lt;&sol;head&gt;
+&lt;body&gt;Hello there&lt;&sol;body&gt;
+&lt;&sol;html&gt;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title/test-title.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/title/test-title/test-title.html.canonical-html
@@ -1,3 +1,3 @@
 <html><head>
-<title>This å is <span>my</span> little <xxx sample title with <!-- comments --></title>
+<title>This &aring; is &lt;span&gt;my&lt;&sol;span&gt; little &lt;xxx sample title with &lt;&excl;-- comments --&gt;</title>
 </head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-closed.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-closed.html.canonical-html
@@ -1 +1 @@
-<html><head></head><body><foo></foo><title>ti</head><body>1234</body></html></title></body></html>
+<html><head></head><body><foo></foo><title>ti&lt;&sol;head&gt;&lt;body&gt;1234&lt;&sol;body&gt;&lt;&sol;html&gt;</title></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-element.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-element.html.canonical-html
@@ -1,16 +1,16 @@
-<html><head><title>foo</head>
-<body>
-<a>Here is an <unknown>unknown element</unknown> in some inline text</a>
-<div>and <unknown>here</unknown> in some block text</div>
-<p>and <unknown>here</unknown> in a paragraph</p>
+<html><head><title>foo&lt;&sol;head&gt;
+&lt;body&gt;
+&lt;a&gt;Here is an &lt;unknown&gt;unknown element&lt;&sol;unknown&gt; in some inline text&lt;&sol;a&gt;
+&lt;div&gt;and &lt;unknown&gt;here&lt;&sol;unknown&gt; in some block text&lt;&sol;div&gt;
+&lt;p&gt;and &lt;unknown&gt;here&lt;&sol;unknown&gt; in a paragraph&lt;&sol;p&gt;
 
-<unknown>
-<p>containing p tag</p>
-</unknown>
-<unknown>
-<a>a tag</a>
-</unknown>
-<unknown>
-<div>and a div</div>
-</unknown>
-</body></html></title></head><body></body></html>
+&lt;unknown&gt;
+&lt;p&gt;containing p tag&lt;&sol;p&gt;
+&lt;&sol;unknown&gt;
+&lt;unknown&gt;
+&lt;a&gt;a tag&lt;&sol;a&gt;
+&lt;&sol;unknown&gt;
+&lt;unknown&gt;
+&lt;div&gt;and a div&lt;&sol;div&gt;
+&lt;&sol;unknown&gt;
+&lt;&sol;body&gt;&lt;&sol;html&gt;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/xhtml/test-xmldec-encoding-ignore.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/xhtml/test-xmldec-encoding-ignore.html.canonical-html
@@ -1 +1 @@
-<html><head><title>Avec à, é et é</title></head><body></body></html>
+<html><head><title>Avec &agrave;&comma; &eacute; et &eacute;</title></head><body></body></html>
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/xhtml/test-xmldec-encoding.html.canonical-html b/src/test/resources/org/htmlunit/cyberneko/testfiles/xhtml/test-xmldec-encoding.html.canonical-html
@@ -1 +1 @@
-<html><head><title>Avec à, é et é</title></head><body></body></html>
+<html><head><title>Avec &agrave;&comma; &eacute; et &eacute;</title></head><body></body></html>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<html><head><title>foo</head><body></title></head><body>foo</body></html>`
	`1`	`+<html><head><title>foo</head><body></title></head><body>foo</body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<html><head><meta charset="UTF-8" />`
`2`		`-<title>Avec à, é et è</title></head><body></body></html>`
	`2`	`+<title>Avec à, é et è</title></head><body></body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<html><head><meta charset="gb2312" />`
`2`		`-<title>Avec à, é et è 和平</title></head><body></body></html>`
	`2`	`+<title>Avec à, é et è 和平</title></head><body></body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<html><head><meta charset="UniCode20utf8" />`
`2`		`-<title>Avec à, é et è</title></head><body></body></html>`
	`2`	`+<title>Avec à, é et è</title></head><body></body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<html><head><meta charset="x-user-defined" />`
`2`		`-<title>abcd!€ªðÿ</title></head><body></body></html>`
	`2`	`+<title>abcd&excl;€ªðÿ</title></head><body></body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />`
`2`		`-<title>Avec à, é et é</title></head><body></body></html>`
	`2`	`+<title>Avec à, é et é</title></head><body></body></html>`