[wp-cvs] wordpress/wp-includes functions-formatting.php,1.41,1.42

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19133/wp-includes

Modified Files:
	functions-formatting.php 
Log Message:
Texturize fix.

Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** functions-formatting.php	28 Aug 2004 08:40:13 -0000	1.41
--- functions-formatting.php	4 Sep 2004 20:47:52 -0000	1.42
***************
*** 13,18 ****
  		if (isset($curl{0}) && '<' != $curl{0} && $next) { // If it's not a tag
  			$curl = str_replace('---', '&#8212;', $curl);
  			$curl = str_replace('--', '&#8211;', $curl);
! 			$curl = str_replace("...", '&#8230;', $curl);
  			$curl = str_replace('``', '&#8220;', $curl);
  
--- 13,19 ----
  		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('``', '&#8220;', $curl);
  
***************
*** 29,37 ****
  			$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.]|\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 = str_replace("''", '&#8221;', $curl);
  			
--- 30,38 ----
  			$curl = preg_replace("/(\S)'([^'\s])/", "$1&#8217;$2", $curl);
  			$curl = preg_replace('/(\s|\A)"(?!\s)/', '$1&#8220;$2', $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 = str_replace("''", '&#8221;', $curl);