Index: src/wp-includes/formatting.php
===================================================================
--- src/wp-includes/formatting.php (revision 29764)
+++ src/wp-includes/formatting.php (working copy)
@@ -30,7 +30,9 @@
function wptexturize($text, $reset = false) {
global $wp_cockneyreplace, $shortcode_tags;
static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
- $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
+ $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true,
+ $apos_flag, $apos, $prime, $double_prime, $opening_quote, $closing_quote, $opening_single_quote,
+ $closing_single_quote;
// If there's nothing to do, just stop.
if ( empty( $text ) || false === $run_texturize ) {
@@ -105,18 +107,19 @@
$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
$dynamic = array();
$spaces = wp_spaces_regexp();
+ $apos_flag = ''; // We need a semantic representation that is not identical to a quote.
// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
if ( "'" !== $apos || "'" !== $closing_single_quote ) {
- $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
+ $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
}
if ( "'" !== $apos || '"' !== $closing_quote ) {
- $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
+ $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_quote;
}
// '99 '99s '99's (apostrophe) But never '9 or '99% or '999 or '99.0.
if ( "'" !== $apos ) {
- $dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos;
+ $dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
}
// Quoted Numbers like '0.42'
@@ -131,19 +134,9 @@
// Apostrophe in a word. No spaces, double apostrophes, or other punctuation.
if ( "'" !== $apos ) {
- $dynamic[ '/(?';
+ $quote_pattern = "/$needle(?=\\Z|[.,)}\\-\\]]|>|" . $spaces . ")/";
+ $prime_pattern = "/(?<=\\d)$needle/";
+ $flag_after_digit = "/(?<=\\d)$flag/";
+ $flag_no_digit = "/(? &$sentence ) {
+ if ( false === strpos( $sentence, $needle ) ) {
+ continue;
+ } elseif ( 0 !== $key && substr_count( $sentence, $close_quote ) === 0 ) {
+ $sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
+ if ( $count > 1) {
+ // This sentence appears to have multiple closing quotes. Attempt Vulcan logic.
+ $sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );
+ if ( 0 === $count2 ) {
+ // Closing quote still ambiguous. Look for a quote followed by a period.
+ $count2 = substr_count( $sentence, "$flag." );
+ if ( $count2 > 0 ) {
+ // Assume the rightmost quote-period match is the end of quotation.
+ $pos = strrpos( $sentence, "$flag." );
+ } else {
+ // When all else fails, make the rightmost candidate a closing quote.
+ // This is most likely to be problematic in the context of bug #18549.
+ $pos = strrpos( $sentence, $flag );
+ }
+ $sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
+ }
+ // Use conventional replacement on any remaining primes and quotes.
+ $sentence = preg_replace( $prime_pattern, $prime, $sentence );
+ $sentence = preg_replace( $flag_after_digit, $prime, $sentence );
+ $sentence = str_replace( $flag, $close_quote, $sentence );
+ } elseif ( 1 == $count ) {
+ // Found only one closing quote candidate, so give it priority over primes.
+ $sentence = str_replace( $flag, $close_quote, $sentence );
+ $sentence = preg_replace( $prime_pattern, $prime, $sentence );
+ } else {
+ // No closing quotes found. Just run primes pattern.
+ $sentence = preg_replace( $prime_pattern, $prime, $sentence );
+ }
+ } else {
+ $sentence = preg_replace( $prime_pattern, $prime, $sentence );
+ $sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
+ }
+ if ( '"' == $needle ) {
+ $sentence = str_replace( '"', $close_quote, $sentence );
+ }
+ }
+
+ return implode( $open_quote, $sentences );
+}
+
+/**
* Search for disabled element tags. Push element to stack on tag open and pop
* on tag close.
*
Index: tests/phpunit/tests/formatting/WPTexturize.php
===================================================================
--- tests/phpunit/tests/formatting/WPTexturize.php (revision 29764)
+++ tests/phpunit/tests/formatting/WPTexturize.php (working copy)
@@ -90,8 +90,8 @@
//$this->assertEquals('Here is “a test with a link”… and ellipses.', wptexturize('Here is "a test with a link"... and ellipses.'));
//$this->assertEquals('Here is “a test with a link”.', wptexturize('Here is "a test with a link".'));
//$this->assertEquals('Here is “a test with a link”and a work stuck to the end.', wptexturize('Here is "a test with a link"and a work stuck to the end.'));
- //$this->assertEquals('A test with a finishing number, “like 23”.', wptexturize('A test with a finishing number, "like 23".'));
- //$this->assertEquals('A test with a number, “like 62”, is nice to have.', wptexturize('A test with a number, "like 62", is nice to have.'));
+ $this->assertEquals('A test with a finishing number, “like 23”.', wptexturize('A test with a finishing number, "like 23".'));
+ $this->assertEquals('A test with a number, “like 62”, is nice to have.', wptexturize('A test with a number, "like 62", is nice to have.'));
}
/**
@@ -114,7 +114,7 @@
$this->assertEquals('‘Class of ’99’', wptexturize("'Class of '99'"));
$this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99's'"));
$this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99’s'"));
- //$this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
+ $this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
$this->assertEquals('“Class of ’99”', wptexturize("\"Class of '99\""));
$this->assertEquals('{“Class of ’99”}', wptexturize("{\"Class of '99\"}"));
$this->assertEquals(' “Class of ’99” ', wptexturize(" \"Class of '99\" "));
@@ -1771,4 +1771,64 @@
),
);
}
+
+ /**
+ * Ensure primes logic is not too greedy at the end of a quotation.
+ *
+ * @ticket 29256
+ * @dataProvider primes_vs_quotes
+ */
+ function test_primes_vs_quotes( $input, $output ) {
+ return $this->assertEquals( $output, wptexturize( $input ) );
+ }
+
+ function data_primes_vs_quotes() {
+ return array(
+ array(
+ "George's porch is 99' long.",
+ "George’s porch is 99′ long.",
+ ),
+ array(
+ 'The best year "was that time in 2012" when everyone partied, he said.',
+ 'The best year “was that time in 2012” when everyone partied, he said.',
+ ),
+ array(
+ "I need 4 x 20' = 80' of trim.", // Works only with a space before the = char.
+ "I need 4 x 20′ = 80′ of trim.",
+ ),
+ array(
+ '"Lorem ipsum dolor sit amet 1234"',
+ '“Lorem ipsum dolor sit amet 1234”',
+ ),
+ array(
+ "'Etiam eu egestas dui 1234'",
+ "‘Etiam eu egestas dui 1234’",
+ ),
+ array(
+ 'according to our source, "33% of all students scored less than 50" on the test.',
+ 'according to our source, “33% of all students scored less than 50” on the test.',
+ ),
+ array(
+ "The doctor said, 'An average height is between 5' and 6' in study group 7'. He then produced a 6' chart of averages. A man of 7', incredibly, is very possible.",
+ "The doctor said, ‘An average height is between 5′ and 6′ in study group 7’. He then produced a 6′ chart of averages. A man of 7′, incredibly, is very possible.",
+ ),
+ array(
+ 'Pirates have voted on "The Expendables 3" with their clicks -- and it turns out the Sylvester Stallone-starrer hasn\'t been astoundingly popular among digital thieves, relatively speaking.
+
+As of Sunday, 5.12 million people worldwide had pirated "Expendables 3" since a high-quality copy hit torrent-sharing sites July 23, according to piracy-tracking firm Excipio.
+
+That likely contributed to the action movie\'s dismal box-office debut this weekend. But over the same July 23-Aug. 18 time period, the movie was No. 4 in downloads, after "Captain America: The Winter Soldier" (7.31 million), "Divergent" (6.29 million) and "The Amazing Spider-Man 2" (5.88 million). Moreover, that\'s despite "Expendables 3" becoming available more than three weeks prior to the film\'s U.S. theatrical debut.
+
+String with a number followed by a single quote \'Expendables 3\' vestibulum in arcu mi.',
+
+ 'Pirates have voted on “The Expendables 3” with their clicks — and it turns out the Sylvester Stallone-starrer hasn’t been astoundingly popular among digital thieves, relatively speaking.
+
+As of Sunday, 5.12 million people worldwide had pirated “Expendables 3” since a high-quality copy hit torrent-sharing sites July 23, according to piracy-tracking firm Excipio.
+
+That likely contributed to the action movie’s dismal box-office debut this weekend. But over the same July 23-Aug. 18 time period, the movie was No. 4 in downloads, after “Captain America: The Winter Soldier” (7.31 million), “Divergent” (6.29 million) and “The Amazing Spider-Man 2” (5.88 million). Moreover, that’s despite “Expendables 3” becoming available more than three weeks prior to the film’s U.S. theatrical debut.
+
+String with a number followed by a single quote ‘Expendables 3’ vestibulum in arcu mi.',
+ ),
+ );
+ }
}
\ No newline at end of file