<!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>[28765] trunk: Fix abbreviations mixed with quotes, example: `'99% of people'`.</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/28765">28765</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-17 20:18:38 +0000 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix abbreviations mixed with quotes, example: `'99% of people'`.
Add/alter unit tests.
Props miqrogroove.
Fixes <a href="http://core.trac.wordpress.org/ticket/26850">#26850</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 (28764 => 28765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-17 20:13:54 UTC (rev 28764)
+++ trunk/src/wp-includes/formatting.php 2014-06-17 20:18:38 UTC (rev 28765)
</span><span class="lines">@@ -111,17 +111,17 @@
</span><span class="cx"> $dynamic[ '/\'(\d\d)"(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $apos . '$1' . $closing_quote;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // '99 '99s '99's (apostrophe) But never '9 or '999 or '99.0.
</del><ins>+ // '99 '99s '99's (apostrophe) But never '9 or '99% or '999 or '99.0.
</ins><span class="cx"> if ( "'" !== $apos ) {
</span><del>- $dynamic[ '/\'(?=\d\d(?:\Z|(?!\d|[.,]\d)))/' ] = $apos;
</del><ins>+ $dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Quoted Numbers like "42" or '42.00'
</span><span class="cx"> if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
</span><del>- $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[\d\.\,]*)"/' ] = $opening_quote . '$1' . $closing_quote;
</del><ins>+ $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
</ins><span class="cx"> }
</span><span class="cx"> if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
</span><del>- $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
</del><ins>+ $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php (28764 => 28765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-17 20:13:54 UTC (rev 28764)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-17 20:18:38 UTC (rev 28765)
</span><span class="lines">@@ -313,8 +313,8 @@
</span><span class="cx"> "word ’99’s word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "according to our source, '33% of all students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
- "according to our source, ’33% of all students scored less than 50′ on the test.",
</del><ins>+ "according to our source, '33 students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
+ "according to our source, ’33 students scored less than 50′ on the test.",
</ins><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="lines">@@ -1060,12 +1060,12 @@
</span><span class="cx"> 'word “4,242.00” word',
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><del>- "word '99's word", // Is this correct?
- "word ‘99’s word",
</del><ins>+ "word '99's word",
+ "word ’99’s word",
</ins><span class="cx"> ),
</span><span class="cx"> array(
</span><span class="cx"> "word '99'samsonite",
</span><del>- "word ‘99’samsonite",
</del><ins>+ "word ’99’samsonite",
</ins><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="lines">@@ -1341,6 +1341,10 @@
</span><span class="cx"> "word ‘999 word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><ins>+ "word '99% word",
+ "word ‘99% word",
+ ),
+ array(
</ins><span class="cx"> "word '9 word",
</span><span class="cx"> "word ‘9 word",
</span><span class="cx"> ),
</span></span></pre>
</div>
</div>
</body>
</html>