Index: src/wp-includes/formatting.php
===================================================================
--- src/wp-includes/formatting.php (revision 27823)
+++ src/wp-includes/formatting.php (working copy)
@@ -73,28 +73,42 @@
$static_characters = array_merge( array( '---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
$static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
+ // Pattern-based replacements of characters.
$dynamic = array();
- if ( "'" != $apos ) {
- $dynamic[ '/\'(\d\d(?:’|\')?s)/' ] = $apos . '$1'; // '99's
- $dynamic[ '/\'(\d)/' ] = $apos . '$1'; // '99
- }
+ $spaces = wp_spaces_regexp();
+
+ // '99s (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[ '/(?assertEquals('[a]a–b[code]---[/code]a–b[/a]', wptexturize('[a]a--b[code]---[/code]a--b[/a]'));
$this->assertEquals('
', wptexturize('
'));
- $this->assertEquals('---', wptexturize('---'));
+ $this->assertEquals( '---', wptexturize( '---' ) );
+ $this->assertEquals( '---', wptexturize( '---' ) );
+ $this->assertEquals( '', wptexturize( '' ) );
+ $this->assertEquals( '', wptexturize( '' ) );
+ $this->assertEquals( '---', wptexturize( '---' ) );
$this->assertEquals('href="baba" “baba”', wptexturize('href="baba" "baba"'));
@@ -44,7 +48,6 @@
//WP Ticket #4539
function test_basic_quotes() {
$this->assertEquals('test’s', wptexturize('test\'s'));
- $this->assertEquals('test’s', wptexturize('test\'s'));
$this->assertEquals('‘quoted’', wptexturize('\'quoted\''));
$this->assertEquals('“quoted”', wptexturize('"quoted"'));
@@ -194,4 +197,639 @@
$this->assertEquals( ' — ', wptexturize( ' -- ' ) );
$this->assertEquals( ' — ', wptexturize( ' -- ') );
}
+
+ /**
+ * @ticket 22692
+ */
+ function test_spaces_around_quotes() {
+ $nbsp = "\xC2\xA0";
+ $pi = "\xCE\xA0";
+
+ // This should never happen, even if the desired output changes some day.
+
+ $problem_input = "$nbsp\"A";
+ $problem_output = "$nbsp”A";
+
+ $this->assertNotEquals( $problem_output, wptexturize( $problem_input ) );
+
+ // These are desirable outputs for the current design.
+
+ $input = array();
+ $output = array();
+
+ $input[] = "stop. $nbsp\"A quote after 2 spaces.\"";
+ $output[] = "stop. $nbsp“A quote after 2 spaces.”";
+
+ $input[] = "stop.$nbsp$nbsp\"A quote after 2 spaces.\"";
+ $output[] = "stop.$nbsp$nbsp“A quote after 2 spaces.”";
+
+ $input[] = "stop. $nbsp'A quote after 2 spaces.'";
+ $output[] = "stop. $nbsp‘A quote after 2 spaces.’";
+
+ $input[] = "stop.$nbsp$nbsp'A quote after 2 spaces.'";
+ $output[] = "stop.$nbsp$nbsp‘A quote after 2 spaces.’";
+
+ $input[] = "stop. \"A quote after 2 spaces.\"";
+ $output[] = "stop. “A quote after 2 spaces.”";
+
+ $input[] = "stop. \"A quote after 2 spaces.\"";
+ $output[] = "stop. “A quote after 2 spaces.”";
+
+ $input[] = "stop. 'A quote after 2 spaces.'";
+ $output[] = "stop. ‘A quote after 2 spaces.’";
+
+ $input[] = "stop. 'A quote after 2 spaces.'";
+ $output[] = "stop. ‘A quote after 2 spaces.’";
+
+ $input[] = "Contraction: $pi's";
+ $output[] = "Contraction: $pi’s";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_apos_before_digits() {
+ $input = array();
+ $output = array();
+
+ // Apostrophe before a number always becomes ’ (apos);
+
+ $input[] = "word '99 word";
+ $output[] = "word ’99 word";
+
+ $input[] = "word'99 word";
+ $output[] = "word’99 word";
+
+ $input[] = "word '99word";
+ $output[] = "word ’99word";
+
+ $input[] = "word'99word";
+ $output[] = "word’99word";
+
+ $input[] = "word '99’s word"; // Appears as a separate but logically superfluous pattern in 3.8.
+ $output[] = "word ’99’s word";
+
+ $input[] = "word '99's word"; // Due to the logic error, second apos becomes a prime. See ticket #22823
+ $output[] = "word ’99′s word";
+
+ $input[] = "word '99'samsonite";
+ $output[] = "word ’99′samsonite";
+
+ $input[] = "according to our source, '33% of all students scored less than 50' on the test."; // Apostrophes and primes have priority over quotes
+ $output[] = "according to our source, ’33% of all students scored less than 50′ on the test.";
+
+ $input[] = "word '99' word"; // See ticket #8775
+ $output[] = "word ’99′ word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_opening_single_quote() {
+ $input = array();
+ $output = array();
+
+ // Apostrophe after a space or ([{<" becomes ‘ (opening_single_quote)
+
+ $input[] = "word 'word word";
+ $output[] = "word ‘word word";
+
+ $input[] = "word ('word word";
+ $output[] = "word (‘word word";
+
+ $input[] = "word ['word word";
+ $output[] = "word [‘word word";
+
+ $input[] = "word <'word word"; // Invalid HTML input?
+ $output[] = "word <‘word word";
+
+ $input[] = "word <'word word"; // Valid HTML input triggers the apos in a word pattern
+ $output[] = "word <’word word";
+
+ $input[] = "word {'word word";
+ $output[] = "word {‘word word";
+
+ $input[] = "word \"'word word";
+ $output[] = "word “‘word word"; // Two opening quotes
+
+ $input[] = "'word word";
+ $output[] = "‘word word";
+
+ $input[] = "word('word word";
+ $output[] = "word(‘word word";
+
+ $input[] = "word['word word";
+ $output[] = "word[‘word word";
+
+ $input[] = "word<'word word";
+ $output[] = "word<‘word word";
+
+ $input[] = "word<'word word";
+ $output[] = "word<’word word";
+
+ $input[] = "word{'word word";
+ $output[] = "word{‘word word";
+
+ $input[] = "word\"'word word";
+ $output[] = "word”‘word word"; // Closing quote, then opening quote
+
+ $input[] = "word ' word word";
+ $output[] = "word ‘ word word";
+
+ $input[] = "word (' word word";
+ $output[] = "word (‘ word word";
+
+ $input[] = "word [' word word";
+ $output[] = "word [‘ word word";
+
+ $input[] = "word <' word word"; // Invalid HTML input?
+ $output[] = "word <‘ word word";
+
+ $input[] = "word <' word word"; // Valid HTML input triggers the closing single quote here
+ $output[] = "word <’ word word";
+
+ $input[] = "word {' word word";
+ $output[] = "word {‘ word word";
+
+ $input[] = "word \"' word word";
+ $output[] = "word “‘ word word"; // Two opening quotes
+
+ $input[] = "' word word";
+ $output[] = "‘ word word";
+
+ $input[] = "word(' word word";
+ $output[] = "word(‘ word word";
+
+ $input[] = "word[' word word";
+ $output[] = "word[‘ word word";
+
+ $input[] = "word<' word word";
+ $output[] = "word<‘ word word";
+
+ $input[] = "word<' word word";
+ $output[] = "word<’ word word";
+
+ $input[] = "word{' word word";
+ $output[] = "word{‘ word word";
+
+ $input[] = "word\"' word word";
+ $output[] = "word”‘ word word"; // Closing quote, then opening quote
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_double_prime() {
+ $input = array();
+ $output = array();
+
+ // Double quote after a number becomes ″ (double_prime)
+
+ $input[] = 'word 99" word';
+ $output[] = 'word 99″ word';
+
+ $input[] = 'word 99"word';
+ $output[] = 'word 99″word';
+
+ $input[] = 'word99" word';
+ $output[] = 'word99″ word';
+
+ $input[] = 'word99"word';
+ $output[] = 'word99″word';
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_single_prime() {
+ $input = array();
+ $output = array();
+
+ // Apostrophe after a number becomes ′ (prime)
+
+ $input[] = "word 99' word";
+ $output[] = "word 99′ word";
+
+ $input[] = "word 99'word";
+ $output[] = "word 99′word";
+
+ $input[] = "word99' word";
+ $output[] = "word99′ word";
+
+ $input[] = "word99'word";
+ $output[] = "word99′word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_contractions() {
+ $input = array();
+ $output = array();
+
+ // Apostrophe "in a word" becomes ’ (apos)
+
+ $input[] = "word word's word";
+ $output[] = "word word’s word";
+
+ $input[] = "word word'. word"; // Quotes with outside punctuation could end with apostrophes instead of closing quotes (may affect i18n)
+ $output[] = "word word’. word";
+
+ $input[] = "word ]'. word";
+ $output[] = "word ]’. word";
+
+ $input[] = "word )'. word";
+ $output[] = "word )’. word";
+
+ $input[] = "word }'. word";
+ $output[] = "word }’. word";
+
+ $input[] = "word >'. word"; // Not tested
+ $output[] = "word >’. word";
+
+ $input[] = "word >'. word";
+ $output[] = "word >’. word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_opening_quote() {
+ $input = array();
+ $output = array();
+
+ // Double quote after a space or ([{< becomes “ (opening_quote) if not followed by spaces
+
+ $input[] = 'word "word word';
+ $output[] = 'word “word word';
+
+ $input[] = 'word ("word word';
+ $output[] = 'word (“word word';
+
+ $input[] = 'word ["word word';
+ $output[] = 'word [“word word';
+
+ $input[] = 'word <"word word'; // Invalid HTML input?
+ $output[] = 'word <“word word';
+
+ $input[] = 'word <"word word'; // Valid HTML input triggers the closing quote pattern
+ $output[] = 'word <”word word';
+
+ $input[] = 'word {"word word';
+ $output[] = 'word {“word word';
+
+ $input[] = '"word word';
+ $output[] = '“word word';
+
+ $input[] = 'word("word word';
+ $output[] = 'word(“word word';
+
+ $input[] = 'word["word word';
+ $output[] = 'word[“word word';
+
+ $input[] = 'word<"word word'; // Invalid HTML input?
+ $output[] = 'word<“word word';
+
+ $input[] = 'word<"word word'; // Valid HTML input triggers the closing quote pattern
+ $output[] = 'word<”word word';
+
+ $input[] = 'word{"word word';
+ $output[] = 'word{“word word';
+
+ $input[] = 'word "99 word';
+ $output[] = 'word “99 word';
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_closing_quote() {
+ $input = array();
+ $output = array();
+
+ // Double quote becomes ” (closing_quote) unless it is already converted to double_prime or opening_quote.
+
+ $input[] = 'word word" word';
+ $output[] = 'word word” word';
+
+ $input[] = 'word word") word';
+ $output[] = 'word word”) word';
+
+ $input[] = 'word word"] word';
+ $output[] = 'word word”] word';
+
+ $input[] = 'word word"} word';
+ $output[] = 'word word”} word';
+
+ $input[] = 'word word"> word'; // Invalid HTML input?
+ $output[] = 'word word”> word';
+
+ $input[] = 'word word"> word'; // Valid HTML should work
+ $output[] = 'word word”> word';
+
+ $input[] = 'word word"';
+ $output[] = 'word word”';
+
+ $input[] = 'word word"word';
+ $output[] = 'word word”word';
+
+ $input[] = 'word"word"word';
+ $output[] = 'word”word”word';
+
+ $input[] = 'test sentence".';
+ $output[] = 'test sentence”.';
+
+ $input[] = 'test sentence."';
+ $output[] = 'test sentence.”';
+
+ $input[] = 'test sentence". word';
+ $output[] = 'test sentence”. word';
+
+ $input[] = 'test sentence." word';
+ $output[] = 'test sentence.” word';
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_closing_single_quote() {
+ $input = array();
+ $output = array();
+
+ // Single quote followed by a space or a period becomes ’ (closing_single_quote)
+
+ $input[] = "word word' word";
+ $output[] = "word word’ word";
+
+ $input[] = "word word'. word";
+ $output[] = "word word’. word";
+
+ $input[] = "word word'.word";
+ $output[] = "word word’.word";
+
+ $input[] = "word word'";
+ $output[] = "word word’";
+
+ $input[] = "test sentence'.";
+ $output[] = "test sentence’.";
+
+ $input[] = "test sentence.'";
+ $output[] = "test sentence.’";
+
+ $input[] = "test sentence'. word";
+ $output[] = "test sentence’. word";
+
+ $input[] = "test sentence.' word";
+ $output[] = "test sentence.’ word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_multiplication() {
+ $input = array();
+ $output = array();
+
+ // 9x9 becomes 9×9
+
+ $input[] = "9x9";
+ $output[] = "9×9";
+
+ $input[] = "12x34";
+ $output[] = "12×34";
+
+ $input[] = "9 x 9";
+ $output[] = "9 x 9";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_ampersand() {
+ $input = array();
+ $output = array();
+
+ // & always becomes & unless it is followed by # or ;
+
+ $input[] = "word & word";
+ $output[] = "word & word";
+
+ $input[] = "word&word";
+ $output[] = "word&word";
+
+ $input[] = "word word";
+ $output[] = "word word";
+
+ $input[] = "word & word";
+ $output[] = "word & word";
+
+ $input[] = "word &# word";
+ $output[] = "word &# word"; // invalid output?
+
+ $input[] = "word &44; word";
+ $output[] = "word &44; word";
+
+ $input[] = "word && word";
+ $output[] = "word && word";
+
+ $input[] = "word &!amp; word";
+ $output[] = "word &!amp; word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_cockney() {
+ $input = array();
+ $output = array();
+
+ // "cockney" phrases begin with apos instead of opening_single_quote.
+
+ $input[] = "word 'tain't word";
+ $output[] = "word ’tain’t word";
+
+ $input[] = "word 'twere word";
+ $output[] = "word ’twere word";
+
+ $input[] = "word 'twas word";
+ $output[] = "word ’twas word";
+
+ $input[] = "word 'tis word";
+ $output[] = "word ’tis word";
+
+ $input[] = "word 'twill word";
+ $output[] = "word ’twill word";
+
+ $input[] = "word 'til word";
+ $output[] = "word ’til word";
+
+ $input[] = "word 'bout word";
+ $output[] = "word ’bout word";
+
+ $input[] = "word 'nuff word";
+ $output[] = "word ’nuff word";
+
+ $input[] = "word 'round word";
+ $output[] = "word ’round word";
+
+ $input[] = "word 'cause word";
+ $output[] = "word ’cause word";
+
+ $input[] = "word 'em word";
+ $output[] = "word ‘em word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_smart_dashes() {
+ $input = array();
+ $output = array();
+
+ // Smart dashes, etc
+
+ $input[] = "word --- word";
+ $output[] = "word — word";
+
+ $input[] = "word---word";
+ $output[] = "word—word";
+
+ $input[] = "word -- word";
+ $output[] = "word — word";
+
+ $input[] = "word--word";
+ $output[] = "word–word";
+
+ $input[] = "word - word";
+ $output[] = "word – word";
+
+ $input[] = "word-word";
+ $output[] = "word-word";
+
+ $input[] = "word xn– word";
+ $output[] = "word xn-- word";
+
+ $input[] = "wordxn–word";
+ $output[] = "wordxn--word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
+
+ /**
+ * Check all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
+ *
+ * @ticket 22692
+ */
+ function test_misc_static_replacements() {
+ $input = array();
+ $output = array();
+
+ $input[] = "word ... word";
+ $output[] = "word … word";
+
+ $input[] = "word...word";
+ $output[] = "word…word";
+
+ $input[] = "word `` word";
+ $output[] = "word “ word";
+
+ $input[] = "word``word";
+ $output[] = "word“word";
+
+ $input[] = "word '' word";
+ $output[] = "word ” word";
+
+ $input[] = "word''word";
+ $output[] = "word”word";
+
+ $input[] = "word (tm) word";
+ $output[] = "word ™ word";
+
+ $input[] = "word (tm)word";
+ $output[] = "word ™word";
+
+ $input[] = "word(tm) word";
+ $output[] = "word(tm) word";
+
+ $input[] = "word(tm)word";
+ $output[] = "word(tm)word";
+
+ foreach($input as $key => $in) {
+ $this->assertEquals( $output[$key], wptexturize( $in ) );
+ }
+ }
}