Changeset 28761

Timestamp:

06/17/2014 05:40:07 PM (11 years ago)

Author:

wonderboymusic

Message:

wptexturize() adjustments:

• Only place an apostrophe before a number when it has exactly two digits.
• Never match '99' with the single prime pattern.
• Always assume '99' is an abbreviated year at the end of a quotation.
• Add unit tests.
• Resolves the unit test broken in [28721] for #8775.

See #26850.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -101 +101 @@
         $dynamic = array();
 
+        // '99' is an ambiguous case 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;
+        }
+
+        // '99 '99s '99's (apostrophe)  But never '9 or '999 or '99.0.
+        if ( "'" !== $apos ) {
+            $dynamic[ '/\'(?=\d\d(?:\Z|(?!\d|[.,]\d)))/' ] = $apos;
+        }
+
         // Quoted Numbers like "42" or '42.00'
         if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
@@ -107 +117 @@
         if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
             $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
-        }
-
-        // '99 '99s '99's (apostrophe)
-        if ( "'" !== $apos ) {
-            $dynamic[ '/\'(?=\d)/' ] = $apos;
         }
 

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

@@ -1280 +1280 @@
         );
     }
+
+    /**
+     * Year abbreviations consist of exactly two digits.
+     *
+     * @ticket 26850
+     * @dataProvider data_quotes_and_dashes
+     */
+    function test_year_abbr( $input, $output ) {
+        return $this->assertEquals( $output, wptexturize( $input ) );
+    }
+
+    function data_year_abbr() {
+        return array(
+            array(
+                "word '99 word",
+                "word ’99 word",
+            ),
+            array(
+                "word '99. word",
+                "word ’99. word",
+            ),
+            array(
+                "word '99, word",
+                "word ’99, word",
+            ),
+            array(
+                "word '99; word",
+                "word ’99; word",
+            ),
+            array(
+                "word '99' word", // For this pattern, prime doesn't make sense.  Should get apos and a closing quote.
+                "word ’99’ word",
+            ),
+            array(
+                "word '99'. word",
+                "word ’99’. word",
+            ),
+            array(
+                "word '99', word",
+                "word ’99’, word",
+            ),
+            array(
+                "word '99.' word",
+                "word ’99.’ word",
+            ),
+            array(
+                "word '99",
+                "word ’99",
+            ),
+            array(
+                "'99 word",
+                "’99 word",
+            ),
+            array(
+                "word '999 word", // Does not match the apos pattern, should be opening quote.
+                "word ‘999 word",
+            ),
+            array(
+                "word '9 word",
+                "word ‘9 word",
+            ),
+            array(
+                "word '99.9 word",
+                "word ‘99.9 word",
+            ),
+            array(
+                "word '999",
+                "word ‘999",
+            ),
+            array(
+                "word '9",
+                "word ‘9",
+            ),
+            array(
+                "in '4 years, 3 months,' Obama cut the deficit",
+                "in ‘4 years, 3 months,’ Obama cut the deficit",
+            ),
+            array(
+                "testing's '4' through 'quotes'",
+                "testing’s ‘4’ through ‘quotes’",
+            ),
+        );
+    }
 }