diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-01-15 20:10:48 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-01-15 20:10:48 +0100 |
| commit | 232484c0c7ec9987459851039c2e2d14578ec133 (patch) | |
| tree | 2614177e097132b660d8e7f5f3337fae327b03a7 | |
| parent | e4702126ca8ee01714a13b0ed1df3b7adcd8b63f (diff) | |
Fixed a bug when an opening quote is preceded by a paragraph tag and immediately followed by another tag.
| -rw-r--r-- | system/libraries/Typography.php | 8 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 11b3917c0..1ae45774a 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -267,23 +267,23 @@ class CI_Typography { // on which direction to curl, with non-word characters like punctuation // being a secondary factor only after whitespace is addressed. '/\'"(\s|$)/' => '’”$1', - '/(^|\s)\'"/' => '$1‘“', + '/(^|\s|<p>)\'"/' => '$1‘“', '/\'"(\W)/' => '’”$1', '/(\W)\'"/' => '$1‘“', '/"\'(\s|$)/' => '”’$1', - '/(^|\s)"\'/' => '$1“‘', + '/(^|\s|<p>)"\'/' => '$1“‘', '/"\'(\W)/' => '”’$1', '/(\W)"\'/' => '$1“‘', // single quote smart quotes '/\'(\s|$)/' => '’$1', - '/(^|\s)\'/' => '$1‘', + '/(^|\s|<p>)\'/' => '$1‘', '/\'(\W)/' => '’$1', '/(\W)\'/' => '$1‘', // double quote smart quotes '/"(\s|$)/' => '”$1', - '/(^|\s)"/' => '$1“', + '/(^|\s|<p>)"/' => '$1“', '/"(\W)/' => '”$1', '/(\W)"/' => '$1“', diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9de2b1fae..245f218c5 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,7 @@ SVN Revision: </p> <li>Fixed a bug where HTML comments and <pre> tags were being parsed in Typography::auto_typography().</li> <li>Fixed a bug with non-breaking space cleanup in Typography::auto_typography().</li> <li>Fixed a bug in database escaping where a compound statement (ie: SUM()) wasn't handled correctly with database prefixes.</li> + <li>Fixed a bug when an opening quote is preceded by a paragraph tag and immediately followed by another tag.</li> <li>Tweaked Typography::auto_typography() for some edge-cases.</li> </ul> |