Changeset 1592

Timestamp:

09/04/2004 08:47:52 PM (22 years ago)

Author:

saxmatt

Message:

Texturize fix.

File:

• trunk/wp-includes/functions-formatting.php (modified) (2 diffs)

trunk/wp-includes/functions-formatting.php

@@ -13 +13 @@
         if (isset($curl{0}) && '<' != $curl{0} && $next) { // If it's not a tag
             $curl = str_replace('---', '&#8212;', $curl);
+            $curl = preg_replace('/(\s)--(\s)/', '$1&#8212;$2', $curl);
             $curl = str_replace('--', '&#8211;', $curl);
-            $curl = str_replace("...", '&#8230;', $curl);
+            $curl = str_replace('...', '&#8230;', $curl);
             $curl = str_replace('``', '&#8220;', $curl);
 
@@ -29 +30 @@
             $curl = preg_replace("/(\S)'([^'\s])/", "$1&#8217;$2", $curl);
             $curl = preg_replace('/(\s|\A)"(?!\s)/', '$1&#8220;$2', $curl);
-            $curl = preg_replace('/"(\s|\Z)/', '&#8221;$1', $curl);
+            $curl = preg_replace('/"(\s|\S|\Z)/', '&#8221;$1', $curl);
             $curl = preg_replace("/'([\s.]|\Z)/", '&#8217;$1', $curl);
-            $curl = preg_replace("/\(tm\)/i", '&#8482;', $curl);
-            $curl = preg_replace("/\(c\)/i", '&#169;', $curl);
-            $curl = preg_replace("/\(r\)/i", '&#174;', $curl);
+            $curl = preg_replace("/ \(tm\)/i", ' &#8482;', $curl);
+            $curl = preg_replace("/ \(c\)/i", ' &#169;', $curl);
+            $curl = preg_replace("/ \(r\)/i", ' &#174;', $curl);
             $curl = str_replace("''", '&#8221;', $curl);