<!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>[32789] trunk: Improve the consistency of punctuation matching in `wptexturize()`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32789">32789</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32789","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-16 00:49:45 +0000 (Tue, 16 Jun 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve the consistency of punctuation matching in `wptexturize()`.
Adds unit tests.
Props miqrogroove.
Fixes <a href="https://core.trac.wordpress.org/ticket/31886">#31886</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-06-16 00:45:49 UTC (rev 32788)
+++ trunk/src/wp-includes/formatting.php 2015-06-16 00:49:45 UTC (rev 32789)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,10 +127,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( "'" !== $apos || "'" !== $closing_single_quote ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dynamic[ '/\'(\d\d)\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_single_quote;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( "'" !== $apos || '"' !== $closing_quote ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|>|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '99 '99s '99's (apostrophe) But never '9 or '99% or '999 or '99.0.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Apostrophe in a word. No spaces, double apostrophes, or other punctuation.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( "'" !== $apos ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 9' (prime)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Single quotes followed by spaces or ending punctuation.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( "'" !== $closing_single_quote ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dynamic[ '/\'(?=\Z|[.,)}\-\]]|>|' . $spaces . ')/' ] = $closing_single_quote;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dynamic[ '/\'(?=\Z|[.,:;!?)}\-\]]|>|' . $spaces . ')/' ] = $closing_single_quote;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $dynamic_characters['apos'] = array_keys( $dynamic );
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2015-06-16 00:45:49 UTC (rev 32788)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2015-06-16 00:49:45 UTC (rev 32789)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,12 +112,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('Class of ’99', wptexturize("Class of '99"));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('Class of ’99’s', wptexturize("Class of '99's"));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('‘Class of ’99’', wptexturize("'Class of '99'"));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals('‘Class of ’99’ ', wptexturize("'Class of '99' "));
+ $this->assertEquals('‘Class of ’99’.', wptexturize("'Class of '99'."));
+ $this->assertEquals('‘Class of ’99’, she said', wptexturize("'Class of '99', she said"));
+ $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'?"));
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99's'"));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99’s'"));
</span><span class="cx" style="display: block; padding: 0 10px"> //$this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('“Class of ’99”', wptexturize("\"Class of '99\""));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('{“Class of ’99”}', wptexturize("{\"Class of '99\"}"));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(' “Class of ’99” ', wptexturize(" \"Class of '99\" "));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(' “Class of ’99”.', wptexturize(" \"Class of '99\"."));
+ $this->assertEquals(' “Class of ’99”, she said', wptexturize(" \"Class of '99\", she said"));
+ $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\"?"));
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('}”Class of ’99″{', wptexturize("}\"Class of '99\"{")); // Not a quotation, may be between two other quotations.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,6 +715,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'test sentence”.',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test sentence",',
+ 'test sentence”,',
+ ),
+ array(
+ 'test sentence":',
+ 'test sentence”:',
+ ),
+ array(
+ 'test sentence";',
+ 'test sentence”;',
+ ),
+ array(
+ 'test sentence"!',
+ 'test sentence”!',
+ ),
+ array(
+ 'test sentence"?',
+ 'test sentence”?',
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'test sentence."',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test sentence.”',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,6 +780,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "word word’, she said",
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "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" style="display: block; padding: 0 10px"> "word word'- word",
</span><span class="cx" style="display: block; padding: 0 10px"> "word word’- word",
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>