<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57317] trunk: HTML API: Add support for PRE and LISTING elements.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57317">57317</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57317","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dmsnell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-19 22:05:37 +0000 (Fri, 19 Jan 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>HTML API: Add support for PRE and LISTING elements.
Adds support for the following HTML elements to the HTML Processor:
- PRE, LISTING
Previously, these elements were not supported and the HTML Processor would bail when encountering them. Now, with this patch applied, it will proceed to parse an HTML document when encountering those tags.
Developed in WordPress/wordpress-develop<a href="https://core.trac.wordpress.org/ticket/5903">#5903</a>
Props jonsurrell, dmsnell
Fixes <a href="https://core.trac.wordpress.org/ticket/60283">#60283</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-processor.php</a></li>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlProcessorphp">trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php</a></li>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlProcessorBreadcrumbsphp">trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeshtmlapiclasswphtmlprocessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-01-19 21:40:01 UTC (rev 57316)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-01-19 22:05:37 UTC (rev 57317)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
</span><span class="cx" style="display: block; padding: 0 10px"> * - Custom elements: All custom elements are supported. :)
</span><span class="cx" style="display: block; padding: 0 10px"> * - Form elements: BUTTON, DATALIST, FIELDSET, LABEL, LEGEND, METER, PROGRESS, SEARCH.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U, WBR.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Formatting elements: B, BIG, CODE, EM, FONT, I, PRE, SMALL, STRIKE, STRONG, TT, U, WBR.
</ins><span class="cx" style="display: block; padding: 0 10px"> * - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
</span><span class="cx" style="display: block; padding: 0 10px"> * - Links: A.
</span><span class="cx" style="display: block; padding: 0 10px"> * - Lists: DD, DL, DT, LI, OL, LI.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
</span><span class="cx" style="display: block; padding: 0 10px"> * - Templating elements: SLOT.
</span><span class="cx" style="display: block; padding: 0 10px"> * - Text decoration: RUBY.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, MULTICOL, NEXTID, SPACER.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, LISTING, MULTICOL, NEXTID, SPACER.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * ### Supported markup
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,10 +684,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case '-FOOTER':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-HEADER':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-HGROUP':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case '-LISTING':
</ins><span class="cx" style="display: block; padding: 0 10px"> case '-MAIN':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-MENU':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-NAV':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-OL':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case '-PRE':
</ins><span class="cx" style="display: block; padding: 0 10px"> case '-SEARCH':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-SECTION':
</span><span class="cx" style="display: block; padding: 0 10px"> case '-SUMMARY':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,6 +735,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * > A start tag whose tag name is one of: "pre", "listing"
+ */
+ case '+PRE':
+ case '+LISTING':
+ if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+ $this->close_a_p_element();
+ }
+ $this->insert_html_element( $this->state->current_token );
+ $this->state->frameset_ok = false;
+ return true;
+
+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * > An end tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> case '-H1':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,7 +1021,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'INPUT':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'LI':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'LINK':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'LISTING':
</del><span class="cx" style="display: block; padding: 0 10px"> case 'MARQUEE':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'MATH':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'META':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1021,7 +1034,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'OPTION':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'PARAM':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'PLAINTEXT':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'PRE':
</del><span class="cx" style="display: block; padding: 0 10px"> case 'RB':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'RP':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'RT':
</span></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlProcessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php 2024-01-19 21:40:01 UTC (rev 57316)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php 2024-01-19 22:05:37 UTC (rev 57317)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'IFRAME' => array( 'IFRAME' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'INPUT' => array( 'INPUT' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'LINK' => array( 'LINK' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'LISTING' => array( 'LISTING' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'MARQUEE' => array( 'MARQUEE' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'MATH' => array( 'MATH' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'META' => array( 'META' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,7 +266,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'OPTION' => array( 'OPTION' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'PARAM' => array( 'PARAM' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'PLAINTEXT' => array( 'PLAINTEXT' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'PRE' => array( 'PRE' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'RB' => array( 'RB' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'RP' => array( 'RP' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'RT' => array( 'RT' ),
</span></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlProcessorBreadcrumbsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php 2024-01-19 21:40:01 UTC (rev 57316)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php 2024-01-19 22:05:37 UTC (rev 57317)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'IFRAME',
</span><span class="cx" style="display: block; padding: 0 10px"> 'INPUT',
</span><span class="cx" style="display: block; padding: 0 10px"> 'LINK',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'LISTING', // Deprecated, use PRE instead.
</del><span class="cx" style="display: block; padding: 0 10px"> 'MARQUEE', // Deprecated.
</span><span class="cx" style="display: block; padding: 0 10px"> 'MATH',
</span><span class="cx" style="display: block; padding: 0 10px"> 'META',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +187,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'OPTGROUP',
</span><span class="cx" style="display: block; padding: 0 10px"> 'OPTION',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PLAINTEXT', // Neutralized.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'PRE',
</del><span class="cx" style="display: block; padding: 0 10px"> 'RB', // Neutralized.
</span><span class="cx" style="display: block; padding: 0 10px"> 'RP',
</span><span class="cx" style="display: block; padding: 0 10px"> 'RT',
</span></span></pre>
</div>
</div>
</body>
</html>