Changeset 27839 for trunk/src/wp-includes/formatting.php

Timestamp:

03/29/2014 07:15:33 AM (11 years ago)

Author:

nacin

Message:

Texturize: Massive performance improvements (~600% faster); better handling of nbsp, double, and weird spaces; 136 new unit tests.

big props miqrogroove.
fixes #22692.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -74 +74 @@
         $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
+        /*
+         * Regex for common whitespace characters.
+         *
+         * By default, spaces include new lines, tabs, nbsp entities, and the UTF-8 nbsp.
+         * This is designed to replace the PCRE \s sequence.  In #WP22692, that sequence
+         * was found to be unreliable due to random inclusion of the A0 byte.
+         */
+        $spaces = '[\r\n\t ]|\xC2\xA0| ';
+
+
+        // Pattern-based replacements of characters.
         $dynamic = array();
-        if ( "'" != $apos ) {
-            $dynamic[ '/\'(\d\d(?:’|\')?s)/' ] = $apos . '$1'; // '99's
-            $dynamic[ '/\'(\d)/'                   ] = $apos . '$1'; // '99
-        }
+
+        // '99 '99s '99's (apostrophe)
+        if ( "'" != $apos )
+            $dynamic[ '/\'(?=\d)/' ] = $apos;
+
+        // Single quote at start, or preceded by (, {, <, [, ", or spaces.
         if ( "'" != $opening_single_quote )
-            $dynamic[ '/(\s|\A|[([{<]|")\'/'       ] = '$1' . $opening_single_quote; // opening single quote, even after (, {, <, [
+            $dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote;
+
+        // 9" (double prime)
         if ( '"' != $double_prime )
-            $dynamic[ '/(\d)"/'                    ] = '$1' . $double_prime; // 9" (double prime)
+            $dynamic[ '/(?<=\d)"/' ] = $double_prime;
+
+        // 9' (prime)
         if ( "'" != $prime )
-            $dynamic[ '/(\d)\'/'                   ] = '$1' . $prime; // 9' (prime)
+            $dynamic[ '/(?<=\d)\'/' ] = $prime;
+
+        // Apostrophe in a word.  No spaces or double primes.
         if ( "'" != $apos )
-            $dynamic[ '/(\S)\'([^\'\s])/'          ] = '$1' . $apos . '$2'; // apostrophe in a word
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos;
+
+        // Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces.
         if ( '"' != $opening_quote )
-            $dynamic[ '/(\s|\A|[([{<])"(?!\s)/'    ] = '$1' . $opening_quote . '$2'; // opening double quote, even after (, {, <, [
+            $dynamic[ '/(?<=\A|[([{<]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
+
+        // Any remaining double quotes.
         if ( '"' != $closing_quote )
-            $dynamic[ '/"(\s|\S|\Z)/'              ] = $closing_quote . '$1'; // closing double quote
+            $dynamic[ '/"/' ] = $closing_quote;
+
+        // Single quotes followed by spaces or a period.
         if ( "'" != $closing_single_quote )
-            $dynamic[ '/\'([\s.]|\Z)/'             ] = $closing_single_quote . '$1'; // closing single quote
-
-        $dynamic[ '/\b(\d+)x(\d+)\b/'              ] = '$1&#215;$2'; // 9x9 (times)
+            $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote; 
 
         $dynamic_characters = array_keys( $dynamic );
@@ -135 +158 @@
             _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
         } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
+
             // This is not a tag, nor is the texturization disabled static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
+
             // regular expressions
             $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
+
+            // 9x9 (times)
+            if ( 1 === preg_match( '/(?<=\d)x\d/', $text ) ) {
+                // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
+                $curl = preg_replace( '/\b(\d+)x(\d+)\b/', '$1&#215;$2', $curl );
+            }
         }
+
+        // Replace each & with &#038; unless it already looks like an entity.
         $curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
     }