Changeset 28726

Timestamp:

06/10/2014 02:21:36 PM (10 years ago)

Author:

wonderboymusic

Message:

In wptexturize(), allow dashes before and after curly quotes. Example: This is what she said---"Wow that is cool."

Adds unit tests.

Props adamsilverstein, miqrogroove.
Fixes #20342.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (4 diffs)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -92 +92 @@
         }
 
-        $static_characters = array_merge( array( '---', '...', '``', '\'\'', ' (tm)' ), $cockney );
-        $static_replacements = array_merge( array( $em_dash, '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
+        $static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
+        $static_replacements = array_merge( array( '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
         $spaces = wp_spaces_regexp();
@@ -114 +114 @@
         }
 
-        // Single quote at start, or preceded by (, {, <, [, ", or spaces.
+        // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
         if ( "'" !== $opening_single_quote ) {
-            $dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote;
+            $dynamic[ '/(?<=\A|[([{<"\-]|' . $spaces . ')\'/' ] = $opening_single_quote;
         }
 
@@ -134 +134 @@
         }
 
-        // Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces.
+        // Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
         if ( '"' !== $opening_quote ) {
-            $dynamic[ '/(?<=\A|[([{<]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
+            $dynamic[ '/(?<=\A|[([{<\-]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
         }
 
@@ -150 +150 @@
 
         // Dashes and spaces
+        $dynamic[ '/---/' ] = $em_dash;
         $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;
         $dynamic[ '/(?<!xn)--/' ] = $en_dash;

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -1067 +1067 @@
     }
 
+    /**
+     * Quotations should be allowed to have dashes around them.
+     *
+     * @ticket 20342
+     * @dataProvider data_quotes_and_dashes
+     */
+    function test_quotes_and_dashes( $input, $output ) {
+        return $this->assertEquals( $output, wptexturize( $input ) );
+    }
+
+    function data_quotes_and_dashes() {
+        return array(
+            array(
+                'word---"quote"',
+                'word—“quote”',
+            ),
+            array(
+                'word--"quote"',
+                'word–“quote”',
+            ),
+            array(
+                'word-"quote"',
+                'word-“quote”',
+            ),
+            array(
+                "word---'quote'",
+                "word—‘quote’",
+            ),
+            array(
+                "word--'quote'",
+                "word–‘quote’",
+            ),
+            array(
+                "word-'quote'",
+                "word-‘quote’",
+            ),
+            array(
+                '"quote"---word',
+                '“quote”—word',
+            ),
+            array(
+                '"quote"--word',
+                '“quote”–word',
+            ),
+            array(
+                '"quote"-word',
+                '“quote”-word',
+            ),
+            array(
+                "'quote'---word",
+                "‘quote’—word",
+            ),
+            array(
+                "'quote'--word",
+                "‘quote’–word",
+            ),
+            array(
+                "'quote'-word",
+                "‘quote’-word",
+            ),
+        );
+    }
 }