<!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>[28726] trunk: In `wptexturize()`, allow dashes before and after curly quotes.</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/28726">28726</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-10 14:21:36 +0000 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `wptexturize()`, allow dashes before and after curly quotes. Example: This is what she said---"Wow that is cool."
Adds unit tests.
Props adamsilverstein, miqrogroove.
Fixes <a href="http://core.trac.wordpress.org/ticket/20342">#20342</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 (28725 => 28726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-10 14:13:52 UTC (rev 28725)
+++ trunk/src/wp-includes/formatting.php 2014-06-10 14:21:36 UTC (rev 28726)
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> $cockney = $cockneyreplace = array();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $static_characters = array_merge( array( '---', '...', '``', '\'\'', ' (tm)' ), $cockney );
- $static_replacements = array_merge( array( $em_dash, '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
</del><ins>+ $static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
+ $static_replacements = array_merge( array( '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
</ins><span class="cx">
</span><span class="cx"> $spaces = wp_spaces_regexp();
</span><span class="cx">
</span><span class="lines">@@ -113,9 +113,9 @@
</span><span class="cx"> $dynamic[ '/\'(?=\d)/' ] = $apos;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Single quote at start, or preceded by (, {, <, [, ", or spaces.
</del><ins>+ // Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
</ins><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 or double apostrophes.
</span><span class="lines">@@ -133,9 +133,9 @@
</span><span class="cx"> $dynamic[ '/(?<=\d)\'/' ] = $prime;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces.
</del><ins>+ // Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
</ins><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">@@ -149,6 +149,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Dashes and spaces
</span><ins>+ $dynamic[ '/---/' ] = $em_dash;
</ins><span class="cx"> $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;
</span><span class="cx"> $dynamic[ '/(?<!xn)--/' ] = $en_dash;
</span><span class="cx"> $dynamic[ '/(?<=' . $spaces . ')-(?=' . $spaces . ')/' ] = $en_dash;
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php (28725 => 28726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-10 14:13:52 UTC (rev 28725)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-10 14:21:36 UTC (rev 28726)
</span><span class="lines">@@ -1066,4 +1066,66 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Quotations should be allowed to have dashes around them.
+ *
+ * @ticket 20342
+ * @dataProvider data_quotes_and_dashes
+ */
+ function test_quotes_and_dashes( $input, $output ) {
+ return $this->assertEquals( $output, wptexturize( $input ) );
+ }
+
+ function data_quotes_and_dashes() {
+ return array(
+ array(
+ 'word---"quote"',
+ 'word—“quote”',
+ ),
+ array(
+ 'word--"quote"',
+ 'word–“quote”',
+ ),
+ array(
+ 'word-"quote"',
+ 'word-“quote”',
+ ),
+ array(
+ "word---'quote'",
+ "word—‘quote’",
+ ),
+ array(
+ "word--'quote'",
+ "word–‘quote’",
+ ),
+ array(
+ "word-'quote'",
+ "word-‘quote’",
+ ),
+ array(
+ '"quote"---word',
+ '“quote”—word',
+ ),
+ array(
+ '"quote"--word',
+ '“quote”–word',
+ ),
+ array(
+ '"quote"-word',
+ '“quote”-word',
+ ),
+ array(
+ "'quote'---word",
+ "‘quote’—word",
+ ),
+ array(
+ "'quote'--word",
+ "‘quote’–word",
+ ),
+ array(
+ "'quote'-word",
+ "‘quote’-word",
+ ),
+ );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>