Changeset 57316 for trunk/src/wp-includes/html-api/class-wp-html-processor.php

Timestamp:

01/19/2024 09:40:01 PM (11 months ago)

Author:

dmsnell

Message:

HTML API: Add support for BR, EMBED, & other tags.

Adds support for the following HTML elements to the HTML Processor:

• AREA, BR, EMBED, KEYGEN, WBR
• Only the opening BR tag is supported, as the invalid closer </br> involves more complicated rules, to be implemented later.

Previously, these elements were not supported and the HTML Processor
would bail when encountering them. With this patch it will proceed to
parse an HTML document when encountering those tags as long as other
normal conditions don't cause it to bail (such as complicated format
reconstruction rules).

Props jonsurrell, dmsnell
Fixes #60283

File:

• trunk/src/wp-includes/html-api/class-wp-html-processor.php (modified) (7 diffs)

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -103 +103 @@
  *  - Custom elements: All custom elements are supported. :)
  *  - Form elements: BUTTON, DATALIST, FIELDSET, LABEL, LEGEND, METER, PROGRESS, SEARCH.
- *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U, WBR.
  *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
  *  - Links: A.
  *  - Lists: DD, DL, DT, LI, OL, LI.
- *  - Media elements: AUDIO, CANVAS, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
- *  - Paragraph: P.
- *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Media elements: AUDIO, CANVAS, EMBED, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
+ *  - Paragraph: BR, P.
+ *  - Phrasing elements: AREA, ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
  *  - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
  *  - Templating elements: SLOT.
  *  - Text decoration: RUBY.
- *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, MULTICOL, NEXTID, SPACER.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, MULTICOL, NEXTID, SPACER.
  *
  * ### Supported markup
@@ -936 +936 @@
 
             /*
+             * > An end tag whose tag name is "br"
+             * >   Parse error. Drop the attributes from the token, and act as described in the next
+             * >   entry; i.e. act as if this was a "br" start tag token with no attributes, rather
+             * >   than the end tag token that it actually is.
+             */
+            case '-BR':
+                $this->last_error = self::ERROR_UNSUPPORTED;
+                throw new WP_HTML_Unsupported_Exception( 'Closing BR tags require unimplemented special handling.' );
+
+            /*
              * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
              */
+            case '+AREA':
+            case '+BR':
+            case '+EMBED':
             case '+IMG':
+            case '+KEYGEN':
+            case '+WBR':
                 $this->reconstruct_active_formatting_elements();
                 $this->insert_html_element( $this->state->current_token );
+                $this->state->frameset_ok = false;
                 return true;
 
@@ -978 +994 @@
             case 'BGSOUND':
             case 'BODY':
-            case 'BR':
             case 'CAPTION':
             case 'COL':
@@ -984 +999 @@
             case 'DD':
             case 'DT':
-            case 'EMBED':
             case 'FORM':
             case 'FRAME':
@@ -992 +1006 @@
             case 'IFRAME':
             case 'INPUT':
-            case 'KEYGEN':
             case 'LI':
             case 'LINK':
@@ -1032 +1045 @@
             case 'TRACK':
             case 'UL':
-            case 'WBR':
             case 'XMP':
                 $this->last_error = self::ERROR_UNSUPPORTED;
@@ -1693 +1705 @@
             'INPUT' === $tag_name ||
             'LINK' === $tag_name ||
+            'KEYGEN' === $tag_name || // Obsolete but still treated as void.
             'META' === $tag_name ||
             'SOURCE' === $tag_name ||