--- wp-includes/functions-formatting.php.orig	Sun May 16 17:14:14 2004
+++ wp-includes/functions-formatting.php	Thu Jun  3 10:36:26 2004
@@ -74,6 +74,7 @@
 	$pee = preg_replace('!(</?(?:table|thead|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|p|h[1-6])[^>]*>)\s*<br />!', "$1", $pee);
 	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)!', '$1', $pee);
 	$pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  clean_pre('$2')  . '</pre>' ", $pee);
+	$pee = preg_replace('!(<math.*?>)(.*?)</math>!ise', " stripslashes('$1') .  clean_pre('$2')  . '</math>' ", $pee);
 	
 	return $pee; 
 }
@@ -103,7 +104,7 @@
 	$content = preg_replace('/<category>(.+?)<\/category>/','',$content);
 
 	// Converts lone & characters into &#38; (a.k.a. &amp;)
-	$content = preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $content);
+	$content = preg_replace('/&([^#])(?![a-z]+;)/i', '&#038;$1', $content);
 
 	// Fix Word pasting
 	$content = strtr($content, $wp_htmltranswinuni);
--- /Users/distler/src/wordpress/wp-content/plugins/markdown.php	Mon Apr 19 03:58:36 2004
+++ wp-content/plugins/markdown.php	Thu May 20 11:42:32 2004
@@ -205,7 +205,7 @@
 
 	$text = '';   # rebuild $text from the tokens
 	$in_pre = 0;  # Keep track of when we're inside <pre> or <code> tags.
-	$tags_to_skip = "!<(/?)(?:pre|code|kbd|script)[\s>]!";
+	$tags_to_skip = "!<(/?)(?:pre|code|kbd|math|script)[\s>]!";
 
 	foreach ($tokens as $cur_token) {
 		if ($cur_token[0] == 'tag') {
--- wp-content/plugins/textile1.php.orig	Mon Apr 19 03:31:30 2004
+++ wp-content/plugins/textile1.php	Thu May 20 13:01:08 2004
@@ -218,15 +218,17 @@
 	foreach($text as $line){
 
 			if(preg_match('/<pre>/i',$line)){$pre = true; }
+			if(preg_match('/<math/i',$line)){$math = true; }
 
 			if ($pre == false){
 				$line = preg_replace($block_find,$block_replace,$line);
 			}
 
-			if ($pre == true){
+			if ($pre == true || $math == true){
 				$line = str_replace("<br />","\n",$line);
 			}
-				if(preg_match('/<\/pre>/i',$line)){$pre = false; }
+				if(preg_match('/<\/pre>/i',$line)){$pre = false;}
+				if(preg_match('/<\/math>/i',$line)){$math = false;}
 
 			if ($list == '' && preg_match('/^\t\t<li>/',$line)){
 					$list = "ul";
--- wp-content/plugins/textile2.php.orig	Mon Apr 19 03:31:33 2004
+++ wp-content/plugins/textile2.php	Thu May 20 13:03:34 2004
@@ -266,6 +266,7 @@
 
 	foreach($text as $line) {
 		if (preg_match('/<pre>/i',$line)) { $pre = true; }
+		if (preg_match('/<math/i',$line)) { $math = true; }
 		foreach($find as $tag){
 			$line = ($pre==false)
 			?    preg_replace_callback("/^($tag)($textile_a$textile_c)\.(?::(\S+))? (.*)$/",
@@ -275,8 +276,9 @@
 
 		$line = preg_replace('/^(?!\t|<\/?pre|<\/?code|$| )(.*)/',"\t<p>$1</p>",$line);
 
-		$line=($pre==true) ? str_replace("<br />","\n",$line):$line;
+		$line=($pre==true || $math == true) ? str_replace("<br />","\n",$line):$line;
 		if (preg_match('/<\/pre>/i',$line)) { $pre = false; }
+		if (preg_match('/<\/math>/i',$line)) { $math = false; }
 
 		$out[] = $line;
 	}