<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28971] trunk: Fix texturization of quotes when enclosed by angle brackets.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28971">28971</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-03 16:21:18 +0000 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix texturization of quotes when enclosed by angle brackets.
props miqrogroove.
fixes <a href="http://core.trac.wordpress.org/ticket/28718">#28718</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (28970 => 28971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-07-03 16:10:01 UTC (rev 28970)
+++ trunk/src/wp-includes/formatting.php 2014-07-03 16:21:18 UTC (rev 28971)
</span><span class="lines">@@ -104,11 +104,10 @@
</span><span class="cx">
</span><span class="cx"> // '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
</span><span class="cx"> if ( "'" !== $apos || "'" !== $closing_single_quote ) {
</span><del>- $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
</del><ins>+ $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> if ( "'" !== $apos || '"' !== $closing_quote ) {
</span><del>- $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
</del><ins>+ $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // '99 '99s '99's (apostrophe) But never '9 or '99% or '999 or '99.0.
</span><span class="lines">@@ -126,12 +125,12 @@
</span><span class="cx">
</span><span class="cx"> // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
</span><span class="cx"> if ( "'" !== $opening_single_quote ) {
</span><del>- $dynamic[ '/(?<=\A|[([{<"\-]|' . $spaces . ')\'/' ] = $opening_single_quote;
</del><ins>+ $dynamic[ '/(?<=\A|[([{"\-]|<|' . $spaces . ')\'/' ] = $opening_single_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Apostrophe in a word. No spaces, double apostrophes, or other punctuation.
</span><span class="cx"> if ( "'" !== $apos ) {
</span><del>- $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
</del><ins>+ $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 9" (double prime)
</span><span class="lines">@@ -146,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> // Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
</span><span class="cx"> if ( '"' !== $opening_quote ) {
</span><del>- $dynamic[ '/(?<=\A|[([{<\-]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
</del><ins>+ $dynamic[ '/(?<=\A|[([{\-]|<|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Any remaining double quotes.
</span><span class="lines">@@ -156,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> // Single quotes followed by spaces or ending punctuation.
</span><span class="cx"> if ( "'" !== $closing_single_quote ) {
</span><del>- $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote;
</del><ins>+ $dynamic[ '/\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $closing_single_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Dashes and spaces
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php (28970 => 28971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-07-03 16:10:01 UTC (rev 28970)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-07-03 16:21:18 UTC (rev 28971)
</span><span class="lines">@@ -117,6 +117,9 @@
</span><span class="cx"> $this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99’s'"));
</span><span class="cx"> //$this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
</span><span class="cx"> $this->assertEquals('“Class of ’99”', wptexturize("\"Class of '99\""));
</span><ins>+ $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\"{")); // Not a quotation, may be between two other quotations.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_quotes_after_numbers() {
</span><span class="lines">@@ -346,12 +349,12 @@
</span><span class="cx"> "word [‘word word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word <'word word", // Invalid HTML input?
- "word <‘word word",
</del><ins>+ "word <'word word", // Invalid HTML input triggers the apos in a word pattern.
+ "word <’word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word <'word word", // Valid HTML input triggers the apos in a word pattern
- "word <’word word",
</del><ins>+ "word <'word word", // Valid HTML input makes curly quotes.
+ "word <‘word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word {'word word",
</span><span class="lines">@@ -375,11 +378,11 @@
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word<'word word",
</span><del>- "word<‘word word",
</del><ins>+ "word<’word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word<'word word",
</span><del>- "word<’word word",
</del><ins>+ "word<‘word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word{'word word",
</span><span class="lines">@@ -402,12 +405,12 @@
</span><span class="cx"> "word [‘ word word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word <' word word", // Invalid HTML input?
- "word <‘ word word",
</del><ins>+ "word <' word word",
+ "word <’ word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word <' word word", // Valid HTML input triggers the closing single quote here
- "word <’ word word",
</del><ins>+ "word <' word word",
+ "word <‘ word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word {' word word",
</span><span class="lines">@@ -431,11 +434,11 @@
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word<' word word",
</span><del>- "word<‘ word word",
</del><ins>+ "word<’ word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word<' word word",
</span><del>- "word<’ word word",
</del><ins>+ "word<‘ word word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word{' word word",
</span><span class="lines">@@ -533,34 +536,30 @@
</span><span class="cx"> "word word’s word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word word'. word", // Quotes with outside punctuation could end with apostrophes instead of closing quotes (may affect i18n)
- "word word’. word",
</del><ins>+ "word'[ word", // Apostrophes are never followed by opening punctuation.
+ "word'[ word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word ]'. word",
- "word ]’. word",
</del><ins>+ "word'( word",
+ "word'( word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word )'. word",
- "word )’. word",
</del><ins>+ "word'{ word",
+ "word'{ word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word }'. word",
- "word }’. word",
</del><ins>+ "word'< word",
+ "word'< word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word >'. word", // Not tested
- "word >’. word",
</del><ins>+ "word'< word", // Invalid HTML input does trigger the apos pattern.
+ "word’< word",
</ins><span class="cx"> ),
</span><del>- array(
- "word >'. word",
- "word >’. word",
- ),
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Double quote after a space or ([{< becomes “ (opening_quote) if not followed by spaces
</del><ins>+ * Double quote after a space or ([-{< becomes “ (opening_quote) if not followed by spaces
</ins><span class="cx"> *
</span><span class="cx"> * Checks all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
</span><span class="cx"> *
</span><span class="lines">@@ -586,18 +585,26 @@
</span><span class="cx"> 'word [“word word',
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- 'word <"word word', // Invalid HTML input?
- 'word <“word word',
</del><ins>+ 'word <"word word', // Invalid HTML input triggers the closing quote pattern.
+ 'word <”word word',
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- 'word <"word word', // Valid HTML input triggers the closing quote pattern
- 'word <”word word',
</del><ins>+ 'word <"word word',
+ 'word <“word word',
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> 'word {"word word',
</span><span class="cx"> 'word {“word word',
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><ins>+ 'word -"word word',
+ 'word -“word word',
+ ),
+ array(
+ 'word-"word word',
+ 'word-“word word',
+ ),
+ array(
</ins><span class="cx"> '"word word',
</span><span class="cx"> '“word word',
</span><span class="cx"> ),
</span><span class="lines">@@ -610,12 +617,12 @@
</span><span class="cx"> 'word[“word word',
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- 'word<"word word', // Invalid HTML input?
- 'word<“word word',
</del><ins>+ 'word<"word word',
+ 'word<”word word',
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- 'word<"word word', // Valid HTML input triggers the closing quote pattern
- 'word<”word word',
</del><ins>+ 'word<"word word',
+ 'word<“word word',
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> 'word{"word word',
</span><span class="lines">@@ -698,7 +705,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Test that single quotes followed by a space or a period become ’ (closing_single_quote)
</del><ins>+ * Test that single quotes followed by a space or .,-)}]> become ’ (closing_single_quote)
</ins><span class="cx"> *
</span><span class="cx"> * Checks all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
</span><span class="cx"> *
</span><span class="lines">@@ -728,6 +735,26 @@
</span><span class="cx"> "word word’, she said",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><ins>+ "word word'- word",
+ "word word’- word",
+ ),
+ array(
+ "word word') word",
+ "word word’) word",
+ ),
+ array(
+ "word word'} word",
+ "word word’} word",
+ ),
+ array(
+ "word word'] word",
+ "word word’] word",
+ ),
+ array(
+ "word word'> word",
+ "word word’> word",
+ ),
+ array(
</ins><span class="cx"> "word word'",
</span><span class="cx"> "word word’",
</span><span class="cx"> ),
</span></span></pre>
</div>
</div>
</body>
</html>