Index: includes/Parser.php
===================================================================
--- includes/Parser.php	(revision 24829)
+++ includes/Parser.php	(working copy)
@@ -2017,7 +2017,7 @@
 	/* private */ function closeParagraph() {
 		$result = '';
 		if ( '' != $this->mLastSection ) {
-			$result = '</' . $this->mLastSection  . ">\n";
+			$result = '</' . $this->mLastSection  . '>';
 		}
 		$this->mInPre = false;
 		$this->mLastSection = '';
@@ -2042,47 +2042,47 @@
 	/* private */ function openList( $char ) {
 		$result = $this->closeParagraph();
 
-		if ( '*' == $char ) { $result .= '<ul><li>'; }
-		else if ( '#' == $char ) { $result .= '<ol><li>'; }
-		else if ( ':' == $char ) { $result .= '<dl><dd>'; }
+		if ( '*' == $char ) { $result .= "<ul>\n<li>"; }
+		else if ( '#' == $char ) { $result .= "<ol>\n<li>"; }
+		else if ( ':' == $char ) { $result .= "<dl>\n<dd>"; }
 		else if ( ';' == $char ) {
-			$result .= '<dl><dt>';
+			$result .= "<dl>\n<dt>";
 			$this->mDTopen = true;
 		}
-		else { $result = '<!-- ERR 1 -->'; }
+		else { $result = "\n<!-- ERR 1 -->"; }
 
 		return $result;
 	}
 
 	/* private */ function nextItem( $char ) {
-		if ( '*' == $char || '#' == $char ) { return '</li><li>'; }
+		if ( '*' == $char || '#' == $char ) { return "</li>\n<li>"; }
 		else if ( ':' == $char || ';' == $char ) {
-			$close = '</dd>';
-			if ( $this->mDTopen ) { $close = '</dt>'; }
+			$close = "</dd>";
+			if ( $this->mDTopen ) { $close = "</dt>"; }
 			if ( ';' == $char ) {
 				$this->mDTopen = true;
-				return $close . '<dt>';
+				return $close . "\n<dt>";
 			} else {
 				$this->mDTopen = false;
-				return $close . '<dd>';
+				return $close . "\n<dd>";
 			}
 		}
-		return '<!-- ERR 2 -->';
+		return "\n<!-- ERR 2 -->";
 	}
 
 	/* private */ function closeList( $char ) {
-		if ( '*' == $char ) { $text = '</li></ul>'; }
-		else if ( '#' == $char ) { $text = '</li></ol>'; }
+		if ( '*' == $char ) { $text = "</li>\n</ul>"; }
+		else if ( '#' == $char ) { $text = "</li>\n</ol>"; }
 		else if ( ':' == $char ) {
 			if ( $this->mDTopen ) {
 				$this->mDTopen = false;
-				$text = '</dt></dl>';
+				$text = "</dt>\n</dl>";
 			} else {
-				$text = '</dd></dl>';
+				$text = "</dd>\n</dl>";
 			}
 		}
-		else {	return '<!-- ERR 3 -->'; }
-		return $text."\n";
+		else {	return "\n<!-- ERR 3 -->"; }
+		return $text;
 	}
 	/**#@-*/
 
@@ -2130,10 +2130,12 @@
 				$t = $oLine;
 			}
 
+			$delim = '';
+
 			# List generation
 			if( $prefixLength && 0 == strcmp( $lastPrefix, $pref2 ) ) {
 				# Same as the last item, so no need to deal with nesting or opening stuff
-				$output .= $this->nextItem( substr( $pref, -1 ) );
+				$delim .= $this->nextItem( substr( $pref, -1 ) );
 				$paragraphStack = false;
 
 				if ( substr( $pref, -1 ) == ';') {
@@ -2144,7 +2146,7 @@
 					$term = $t2 = '';
 					if ($this->findColonNoLinks($t, $term, $t2) !== false) {
 						$t = $t2;
-						$output .= $term . $this->nextItem( ':' );
+						$delim .= $term . $this->nextItem( ':' );
 					}
 				}
 			} elseif( $prefixLength || $lastPrefixLength ) {
@@ -2153,21 +2155,21 @@
 				$paragraphStack = false;
 
 				while( $commonPrefixLength < $lastPrefixLength ) {
-					$output .= $this->closeList( $lastPrefix{$lastPrefixLength-1} );
+					$delim .= $this->closeList( $lastPrefix{$lastPrefixLength-1} );
 					--$lastPrefixLength;
 				}
 				if ( $prefixLength <= $commonPrefixLength && $commonPrefixLength > 0 ) {
-					$output .= $this->nextItem( $pref{$commonPrefixLength-1} );
+					$delim .= $this->nextItem( $pref{$commonPrefixLength-1} );
 				}
 				while ( $prefixLength > $commonPrefixLength ) {
 					$char = substr( $pref, $commonPrefixLength, 1 );
-					$output .= $this->openList( $char );
+					$delim .= $this->openList( $char );
 
 					if ( ';' == $char ) {
 						# FIXME: This is dupe of code above
 						if ($this->findColonNoLinks($t, $term, $t2) !== false) {
 							$t = $t2;
-							$output .= $term . $this->nextItem( ':' );
+							$delim .= $term . $this->nextItem( ':' );
 						}
 					}
 					++$commonPrefixLength;
@@ -2185,7 +2187,7 @@
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					# TODO bug 5718: paragraph closed
-					$output .= $this->closeParagraph();
+					$delim .= $this->closeParagraph();
 					if ( $preOpenMatch and !$preCloseMatch ) {
 						$this->mInPre = true;
 					}
@@ -2199,7 +2201,7 @@
 						// pre
 						if ($this->mLastSection != 'pre') {
 							$paragraphStack = false;
-							$output .= $this->closeParagraph().'<pre>';
+							$delim .= $this->closeParagraph().'<pre>';
 							$this->mLastSection = 'pre';
 						}
 						$t = substr( $t, 1 );
@@ -2207,25 +2209,25 @@
 						// paragraph
 						if ( '' == trim($t) ) {
 							if ( $paragraphStack ) {
-								$output .= $paragraphStack.'<br />';
+								$delim .= $paragraphStack.'<br />';
 								$paragraphStack = false;
 								$this->mLastSection = 'p';
 							} else {
 								if ($this->mLastSection != 'p' ) {
-									$output .= $this->closeParagraph();
+									$delim .= $this->closeParagraph();
 									$this->mLastSection = '';
 									$paragraphStack = '<p>';
 								} else {
-									$paragraphStack = '</p><p>';
+									$paragraphStack = "</p>\n<p>";
 								}
 							}
 						} else {
 							if ( $paragraphStack ) {
-								$output .= $paragraphStack;
+								$delim .= $paragraphStack;
 								$paragraphStack = false;
 								$this->mLastSection = 'p';
 							} else if ($this->mLastSection != 'p') {
-								$output .= $this->closeParagraph().'<p>';
+								$delim .= $this->closeParagraph().'<p>';
 								$this->mLastSection = 'p';
 							}
 						}
@@ -2237,9 +2239,8 @@
 			if($preCloseMatch && $this->mInPre) {
 				$this->mInPre = false;
 			}
-			if ($paragraphStack === false) {
-				$output .= $t."\n";
-			}
+			if ('' == $delim && '' == $paragraphStack) $delim = "\n";
+			$output .= $delim . $t;
 		}
 		while ( $prefixLength ) {
 			$output .= $this->closeList( $pref2{$prefixLength-1} );