code blocks get unwanted empty lines

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
+.idea
 nbproject

Parsedown.php

@@ -50,7 +50,8 @@ class Parsedown
 		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
 		
 		# Removes \r characters.
-		$text = str_replace("\r", '', $text);
+		$text = str_replace("\r\n", "\n", $text);
+		$text = str_replace("\r", "\n", $text);
 		
 		# Replaces tabs with spaces.
 		$text = str_replace("\t", '    ', $text);
@@ -74,21 +75,14 @@ class Parsedown
 			}
 		}
 		
-		# Extracts link references.
-		
-		if (preg_match_all('/^[ ]{0,3}\[(.+)\][ ]?:[ ]*\n?[ ]*(.+)$/m', $text, $matches, PREG_SET_ORDER))
-		{
-			foreach ($matches as $matches)
-			{
-				$this->reference_map[$matches[1]] = $matches[2];
-				
-				$text = str_replace($matches[0], '', $text);
-			}
-		}
-		
 		# ~ 
 		
-		$text = $this->parse_blocks($text);
+		$text = preg_replace('/\n\s*\n/', "\n\n", $text);
+		$text = trim($text, "\n ");
+		
+		$lines = explode("\n", $text);
+		
+		$text = $this->parse_block_elements($lines);
 		
 		# Decodes escape sequences (leaves out backslashes).
 		
@@ -106,380 +100,421 @@ class Parsedown
 	# Private Methods 
 	# 
 	
-	private function parse_blocks($text)
+	private function parse_block_elements(array $lines, $context = '')
 	{
-		# Divides text into blocks.
+		$elements = array();
-		$blocks = preg_split('/\n\s*\n/', $text, -1, PREG_SPLIT_NO_EMPTY);
 		
-		# Makes sure compound blocks get rendered.
+		$element = array(
-		$blocks []= NULL;
+			'type' => '',
+		);
 		
-		$markup = '';
+		foreach ($lines as $line)
-		
-		# Parses blocks.
-		
-		foreach ($blocks as $block)
 		{
-			if (isset($block) and $block[0] >= 'A')
+			# Block-Level HTML 
-			{
-				$quick_block = $block;
 			
-				unset($block);
+			if ($element['type'] === 'block' and ! isset($element['closed']))
+			{
+				if (preg_match('{<'.$element['subtype'].'>$}', $line)) # <open>
+				{
+					$element['depth']++;
 				}
 				
-			# List 
+				if (preg_match('{</'.$element['subtype'].'>$}', $line)) # </close>
-			
-			if (isset($block) and preg_match('/^([ ]{0,3})(\d+[.]|[*+-])[ ]/', $block, $matches)) # list item
 				{
-				if (isset($list)) # subsequent 
+					$element['depth'] > 0 
-				{
+						? $element['depth']-- 
-					$list .= "\n\n".$block;
+						: $element['closed'] = true;
-				}
-				else # first 
-				{
-					$list = $block;
-					$list_indentation = strlen($matches[1]);
-					
-					list($list_type, $list_marker_pattern) = ($matches[2] === '-' or $matches[2] === '+' or $matches[2] === '*')
-						? array('ul', '[*+-]')
-						: array('ol', '\d+[.]');
 				}
 				
-				unset($block);
+				$element['text'] .= "\n".$line;
+
+				continue;
 			}
-			elseif (isset($block) and isset($list) and $block[0] === ' ') # list item block 
-			{
-				$list .= "\n\n".$block;
 			
-				unset($block);
+			# Empty 
+			
+			if ($line === '')
+			{
+				$element['interrupted'] = true;
+				
+				continue;
 			}
-			elseif (isset($list))
-			{
-				$markup .= '<'.$list_type.'>'."\n";
 			
-				$list_items = preg_split('/^([ ]{'.$list_indentation.'})'.$list_marker_pattern.'[ ]/m', $list, -1, PREG_SPLIT_NO_EMPTY);
+			# Lazy Blockquote 
 			
-				foreach ($list_items as $list_item)
+			if ($element['type'] === 'blockquote' and ! isset($element['interrupted']))
 			{
-					$markup .= '<li>';
+				$line = preg_replace('/^[ ]*>[ ]?/', '', $line);
 				
-					if (strpos($list_item, "\n\n")) # sparse 
+				$element['lines'] []= $line;
-					{
-						$list_item = trim($list_item, "\n");
 				
-						if (strpos($list_item, "\n\n"))
+				continue;
+			}
+			
+			# Lazy List Item 
+			
+			if ($element['type'] === 'li')
 			{
-							$list_item = preg_replace('/^[ ]{0,4}/m', '', $list_item);
+				if (preg_match('/^([ ]{0,3})(\d+[.]|[*+-])[ ](.*)/', $line, $matches))
-							$list_item = $this->parse_blocks($list_item);
+				{
+					if ($element['indentation'] !== $matches[1]) 
+					{
+						$element['lines'] []= $line;
 					}
 					else 
 					{
-							$list_item = $this->parse_lines($list_item, TRUE);
+						unset($element['last']);
+						
+						$elements []= $element;
+						
+						$element = array(
+							'type' => 'li',
+							'indentation' => $matches[1],
+							'last' => true,
+							'lines' => array(
+								preg_replace('/^[ ]{0,4}/', '', $matches[3]),
+							),
+						);
 					}
 					
-						$markup .= "\n".$list_item;
+					continue;
 				}
-					else # dense 
+				
+				if (isset($element['interrupted']))
 				{
-						$list_item = trim($list_item, "\n");
+					if ($line[0] === ' ')
-
-						$list_item = strpos($list_item, "\n")
-							? $this->parse_lines($list_item)
-							: $this->parse_inline_elements($list_item);
-						
-						$markup .= $list_item;
-					}
-					
-					$markup .= '</li>'."\n";
-				}
-				
-				$markup .= '</'.$list_type.'>'."\n";
-				
-				unset($list);
-			}
-			
-			# Code Block 
-			
-			if (isset($block) and strlen($block) > 4 and $block[0] === ' ' and $block[1] === ' ' and $block[2] === ' ' and $block[3] === ' ')
 					{
-				if (isset($code_block))
+						$element['lines'] []= '';
-				{
+						
-					$code_block .= "\n\n".$block;
+						$line = preg_replace('/^[ ]{0,4}/', '', $line);;
+						
+						$element['lines'] []= $line;
+						
+						continue;
+					}
 				}
 				else
 				{
-					$code_block = $block;
+					$line = preg_replace('/^[ ]{0,4}/', '', $line);;
+						
+					$element['lines'] []= $line;
+					
+					continue;
+				}
 			}
 			
-				unset($block);
+			# Quick Paragraph 
-			}
+			
-			elseif (isset($code_block))
+			if ($line[0] >= 'A' and $line[0] !== '_' and $line[0] !== '[')
 			{
-				$code_block_text = preg_replace('/^[ ]{4}/m', '', $code_block);
+				goto paragraph; # trust me 
-				$code_block_text = htmlentities($code_block_text, ENT_NOQUOTES);
-				
-				# Decodes encoded escape sequences if present.
-				strpos($code_block_text, "\x1A\\") !== FALSE and $code_block_text = strtr($code_block_text, $this->escape_sequence_map);
-				
-				$markup .= '<pre><code>'.$code_block_text.'</code></pre>'."\n";
-				
-				unset($code_block);
 			}
 			
-			# Atx Heading 
+			# Code 
 			
-			if (isset($block) and $block[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $block, $matches))
+			if ($line[0] === ' ' and preg_match('/^[ ]{4}(.*)/', $line, $matches))
 			{
+				if ($element['type'] === 'code')
+				{
+					if (isset($element['interrupted']))
+					{
+						$element['text'] .= "\n";
+						
+						unset ($element['interrupted']);
+					}
+					
+					$element['text'] .= "\n".$matches[1];
+				}
+				else
+				{
+					$elements []= $element;
+					
+					$element = array(
+						'type' => 'code',
+						'text' => $matches[1],
+					);
+				}
+
+				continue;
+			}
+			
+			# Setext Header (---)  
+			
+			if ($line[0] === '-' and $element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[-]+[ ]*$/', $line))
+			{
+				$element['type'] = 'h.';
+				$element['level'] = 2;
+				
+				continue;
+			}
+			
+			# Atx Header (#)
+			
+			if ($line[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $line, $matches))
+			{
+				$elements []= $element;
+				
 				$level = strlen($matches[1]);
 				
-				$heading = $this->parse_inline_elements($matches[2]);
+				$element = array(
-				
+					'type' => 'h.',
-				$markup .= '<h'.$level.'>'.$heading.'</h'.$level.'>'."\n";
+					'text' => $matches[2],
+					'level' => $level,
+				);
 				
 				continue;
 			}
 			
-			# Quote Block 
+			# Setext Header (===) 
 			
-			if (isset($block) and preg_match('/^[ ]{0,3}>/', $block))
+			if ($line[0] === '=' and $element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
 			{
-				$block = preg_replace('/^[ ]{0,3}>[ ]?/m', '', $block);
+				$element['type'] = 'h.';
-				$block = $this->parse_blocks($block);
+				$element['level'] = 1;
-				
-				$markup .= '<blockquote>'."\n".$block.'</blockquote>'."\n";
-				
-				continue;
-			}
-			
-			# Horizontal Line 
-			
-			if (isset($block) and preg_match('/^[ ]{0,3}([-*_])([ ]{0,2}\1){2,}$/', $block))
-			{
-				$markup .= '<hr />'."\n";
 				
 				continue;
 			}
 			
 			# ~ 
 			
-			if (isset($quick_block))
+			$pure_line = ltrim($line);
-			{
-				$block = $quick_block;
 			
-				unset ($quick_block);
+			# Link Reference 
+			
+			if ($pure_line[0] === '[' and preg_match('/^\[(.+?)\]:[ ]*([^ ]+)/', $pure_line, $matches))
+			{
+				$label = $matches[1];
+				$url = trim($matches[2], '<>');
+				
+				$this->reference_map[$label] = $url;
+				
+				continue;
 			}
 			
-			# 
+			# Blockquote 
-			# Paragraph 
 			
-			if (isset($block))
+			if ($pure_line[0] === '>' and preg_match('/^>[ ]?(.*)/', $pure_line, $matches))
 			{
-				if (strpos($block, "\n"))
+				if ($element['type'] === 'blockquote')
 				{
-					$markup .= $this->parse_lines($block, TRUE);
+					if (isset($element['interrupted']))
+					{
+						$element['lines'] []= '';
+						
+						unset($element['interrupted']);
+					}
+					
+					$element['lines'] []= $matches[1];
 				}
 				else
 				{
-					$element_text = $this->parse_inline_elements($block);
+					$elements []= $element;
-					$element = '<p>'.$element_text.'</p>'."\n";
 					
-					$markup .= $element;
+					$element = array(
-				}
+						'type' => 'blockquote',
-			}
+						'lines' => array(
+							$matches[1],
+						),
+					);
 				}
 				
-		return $markup;
+				continue;
 			}
 			
-	private function parse_lines($text, $paragraph_based = FALSE)
+			# HTML  
+			
+			if ($pure_line[0] === '<')
 			{
-		$text = trim($text, "\n");
+				# Block-Level HTML <self-closing/>
 
-		$lines = explode("\n", $text);
+				if (preg_match('{^<.+?/>$}', $pure_line))
+				{
+					$elements []= $element;
 
-		$lines []= NULL;
+					$element = array(
+						'type' => '',
+						'text' => $pure_line,
+					);
+
+					continue;
+				}
+				
+				# Block-Level HTML <open>
+
+				if (preg_match('{^<(\w+)(?:[ ].*?)?>}', $pure_line, $matches))
+				{
+					$elements []= $element;
+
+					$element = array(
+						'type' => 'block',
+						'subtype' => strtolower($matches[1]),
+						'text' => $pure_line,
+						'depth' => 0,
+					);
+					
+					preg_match('{</'.$matches[1].'>\s*$}', $pure_line) and $element['closed'] = true;
+
+					continue;
+				}
+			}
+			
+			# Horizontal Rule   
+			
+			if (preg_match('/^([-*_])([ ]{0,2}\1){2,}[ ]*$/', $pure_line))
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'hr',
+				);
+				
+				continue;
+			}
+			
+			# List Item 
+			
+			if (preg_match('/^([ ]*)(\d+[.]|[*+-])[ ](.*)/', $line, $matches))
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'li',
+					'ordered' => isset($matches[2][1]),
+					'indentation' => $matches[1],
+					'last' => true,
+					'lines' => array(
+						preg_replace('/^[ ]{0,4}/', '', $matches[3]),
+					),
+				);
+				
+				continue;
+			}
+			
+			# ~ 
+			
+			paragraph:
+			
+			if ($element['type'] === 'p')
+			{
+				if (isset($element['interrupted']))
+				{
+					$elements []= $element;
+					
+					$element['text'] = $line;
+					
+					unset($element['interrupted']);
+				}
+				else
+				{
+					$element['text'] .= "\n".$line;
+				}
+			}
+			else
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'p', 
+					'text' => $line,
+				);
+			}
+		}
+		
+		$elements []= $element;
+		
+		array_shift($elements);
+		
+		# 
+		# ~ 
+		# 
 		
 		$markup = '';
 		
-		foreach ($lines as $line)
+		foreach ($elements as $index => $element)
 		{
-			if (isset($line) and $line === '')
+			switch ($element['type'])
 			{
-				unset($line);
+				case 'li':
-			}
 					
-			# Paragraph 
+					if (isset($element['ordered'])) # first
-			
-			if (isset($line) and $line[0] >= 'A')
 					{
-				$quick_line = $line;
+						$list_type = $element['ordered'] ? 'ol' : 'ul';
-				
-				unset($line);
-			}
-			
-			# List 
-			
-			if (isset($line) and preg_match('/^([ ]*)(\d+[.]|[*+-])[ ](.*)/', $line, $matches)) # list item 
-			{
-				$list_item_indentation = strlen($matches[1]);
-				$list_item_type = ($matches[2] === '-' or $matches[2] === '+' or $matches[2] === '*')
-					? 'ul'
-					: 'ol';
-				
-				if (isset($list)) # subsequent 
-				{
-					if ($list_item_indentation === $list_indentation and $list_item_type === $list_type)
-					{
-						# Adds last list item to the list.
-						$list []= $list_item;
-						
-						# Creates a separate list item.
-						$list_item = $matches[3];
-					}
-					else 
-					{
-						# Adds line to the current list item.
-						$list_item .= "\n".$line;
-					}
-				}
-				else # first 
-				{
-					$list = array();
-					$list_indentation = $list_item_indentation;
-					$list_type = $list_item_type;
-					
-					$list_item = $matches[3];
-				}
-				
-				unset($line);
-			}
-			else 
-			{
-				if (isset($list))
-				{
-					$list []= $list_item;
 						
 						$markup .= '<'.$list_type.'>'."\n";
-					
-					foreach ($list as $list_item)
-					{
-						$list_item_text = strpos($list_item, "\n") 
-							? $this->parse_lines($list_item)
-							: $this->parse_inline_elements($list_item);
-						
-						$markup .= '<li>'.$list_item_text.'</li>'."\n";
 					}
 					
-					$markup .= '</'.$list_type.'>'."\n";
+					if (isset($element['interrupted']) and ! isset($element['last']))
-					
+					{
-					unset($list);
+						$element['lines'] []= '';
-				}
 					}
 					
-			# Quote Block 
+					$text = $this->parse_block_elements($element['lines'], 'li');
 					
-			if (isset($line) and preg_match('/^[ ]*>[ ]?(.*)/', $line, $matches))
+					$markup .= '<li>'.$text.'</li>'."\n";
+					
+					isset($element['last']) and $markup .= '</'.$list_type.'>'."\n";
+					
+					break;
+				
+				case 'p':
+					
+					$text = $this->parse_inline_elements($element['text']);
+					
+					$text = preg_replace('/[ ]{2}\n/', '<br />'."\n", $text);
+					
+					if ($context === 'li' and $index === 0)
 					{
-				if (isset($quote))
+						if (isset($element['interrupted']))
 						{
-					$quote .= "\n".$matches[1];
+							$markup .= "\n".'<p>'.$text.'</p>'."\n";
 						}
 						else 
 						{
-					$quote = $matches[1];
+							$markup .= $text;
-				}
-				
-				unset($line);
-			}
-			else 
-			{
-				if (isset($quote))
-				{
-					$quote = $this->parse_blocks($quote);
-					
-					$markup .= '<blockquote>'."\n".$quote.'</blockquote>'."\n";
-					
-					unset($quote);
-				}
-			}
-			
-			# Atx Heading 
-			
-			if (isset($atx_heading))
-			{
-				$markup .= '<h'.$atx_heading_level.'>'.$atx_heading.'</h'.$atx_heading_level.'>'."\n";
-				
-				unset($atx_heading);
-			}
-			
-			if (isset($line) and $line[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $line, $matches))
-			{
-				$atx_heading_level = strlen($matches[1]);
-				
-				$atx_heading = $this->parse_inline_elements($matches[2]);
-				
-				unset($line);
-			}
-			
-			# Setext Heading 
-			
-			if (isset($line) and isset($paragraph))
-			{
-				$setext_characters = array('=', '-');
-				
-				foreach ($setext_characters as $index => $setext_character)
-				{
-					if ($line[0] === $setext_character and preg_match('/^['.$setext_character.']+[ ]*$/', $line))
-					{
-						$setext_heading_level = $index + 1;
-						
-						$setext_heading_text = $this->parse_inline_elements($paragraph);
-						
-						$markup .= '<h'.$setext_heading_level.'>'.$setext_heading_text.'</h'.$setext_heading_level.'>'."\n";
-						
-						unset($paragraph, $line);
-						
-						continue 2;
-					}
-				}
-			}
-			
-			# Paragraph 
-			
-			if (isset($quick_line))
-			{
-				$line = $quick_line;
-				
-				unset($quick_line);
-			}
-			
-			if (isset($line))
-			{
-				substr($line, -2) === '  '
-					and $line = substr($line, 0, -2)
-					and $line .= '<br/>';
-				
-				if (isset($paragraph))
-				{
-					$paragraph .= "\n".$line;
-				}
-				else 
-				{
-					$paragraph = $line;
 						}
 					}
 					else 
 					{
-				if (isset($paragraph))
+						$markup .= '<p>'.$text.'</p>'."\n";
-				{
-					$paragraph_text = $this->parse_inline_elements($paragraph);
-					
-					$markup .= $markup === '' && $paragraph_based === FALSE
-						? $paragraph_text
-						: '<p>'.$paragraph_text.'</p>'."\n";
-					
-					unset($paragraph);
 					}
+					
+					break;
+				
+				case 'code':
+					
+					$text = htmlentities($element['text'], ENT_NOQUOTES);
+					
+					strpos($text, "\x1A\\") !== FALSE and $text = strtr($text, $this->escape_sequence_map);
+					
+					$markup .= '<pre><code>'.$text.'</code></pre>'."\n";
+					
+					break;
+				
+				case 'blockquote':
+					
+					$text = $this->parse_block_elements($element['lines']);
+					
+					$markup .= '<blockquote>'."\n".$text.'</blockquote>'."\n";
+					
+					break;
+				
+				case 'h.':
+					
+					$text = $this->parse_inline_elements($element['text']);
+					
+					$markup .= '<h'.$element['level'].'>'.$text.'</h'.$element['level'].'>'."\n";
+					
+					break;
+				
+				case 'hr':
+					
+					$markup .= '<hr />'."\n";
+					
+					break;
+
+				default:
+					
+					$markup .= $element['text']."\n";
 			}
 		}
 		
@@ -523,15 +558,53 @@ class Parsedown
 			}
 		}
 		
-		# Reference(d) Link / Image 
+		# Inline Link / Image 
 		
-		if ($this->reference_map and strpos($text, '[') !== FALSE and preg_match_all('/(!?)\[(.+?)\][ ]?\[(.+?)\]/', $text, $matches, PREG_SET_ORDER))
+		if (strpos($text, '](') !== FALSE and preg_match_all('/(!?)(\[((?:[^][]+|(?2))*)\])\((.*?)\)/', $text, $matches, PREG_SET_ORDER)) # inline 
 		{
 			foreach ($matches as $matches)
 			{
-				if (array_key_exists($matches[3], $this->reference_map))
+				$url = $this->escape_special_characters($matches[4]);
+				
+				if ($matches[1]) # image 
 				{
-					$url = $this->reference_map[$matches[3]];
+					$element = '<img alt="'.$matches[3].'" src="'.$url.'">';
+				}
+				else
+				{
+					$element_text = $this->parse_inline_elements($matches[3]);
+					
+					$element = '<a href="'.$url.'">'.$element_text.'</a>';
+				}
+				
+				# ~ 
+
+				$code = "\x1A".'$'.$index;
+
+				$text = str_replace($matches[0], $code, $text);
+
+				$map[$code] = $element;
+				
+				$index ++;
+			}
+		}
+		
+		# Reference(d) Link / Image 
+		
+		if ($this->reference_map and strpos($text, '[') !== FALSE and preg_match_all('/(!?)\[(.+?)\](?:\n?[ ]?\[(.*?)\])?/ms', $text, $matches, PREG_SET_ORDER))
+		{
+			foreach ($matches as $matches)
+			{
+				$link_definition = isset($matches[3]) && $matches[3]
+					? $matches[3]
+					: $matches[2]; # implicit 
+				
+				$link_definition = strtolower($link_definition);
+				
+				if (isset($this->reference_map[$link_definition]))
+				{
+					$url = $this->reference_map[$link_definition];
+					$url = $this->escape_special_characters($url);
 					
 					if ($matches[1]) # image 
 					{
@@ -557,44 +630,17 @@ class Parsedown
 			}
 		}
 		
-		# Inline Link / Image 
+		# Automatic Links 
-		
-		if (strpos($text, '](') !== FALSE and preg_match_all('/(!?)(\[((?:[^][]+|(?2))*)\])\((.*?)\)/', $text, $matches, PREG_SET_ORDER)) # inline 
-		{
-			foreach ($matches as $matches)
-			{
-				if ($matches[1]) # image 
-				{
-					$element = '<img alt="'.$matches[3].'" src="'.$matches[4].'">';
-				}
-				else 
-				{
-					$element_text = $this->parse_inline_elements($matches[3]);
-					
-					$element = '<a href="'.$matches[4].'">'.$element_text.'</a>';
-				}
-				
-				$element_text = $this->parse_inline_elements($matches[1]);
-				
-				# ~ 
-
-				$code = "\x1A".'$'.$index;
-
-				$text = str_replace($matches[0], $code, $text);
-
-				$map[$code] = $element;
-				
-				$index ++;
-			}
-		}
 		
 		if (strpos($text, '<') !== FALSE and preg_match_all('/<((https?|ftp|dict):[^\^\s]+?)>/i', $text, $matches, PREG_SET_ORDER))
 		{
 			foreach ($matches as $matches)
 			{
+				$url = $this->escape_special_characters($matches[1]);
+				
 				$element = '<a href=":href">:text</a>';
-				$element = str_replace(':text', $matches[1], $element);
+				$element = str_replace(':text', $url, $element);
-				$element = str_replace(':href', $matches[1], $element);
+				$element = str_replace(':href', $url, $element);
 				
 				# ~ 
 				
@@ -608,15 +654,35 @@ class Parsedown
 			}
 		}
 		
-		if (strpos($text, '*') !== FALSE or strpos($text, '_') !== FALSE)
+		# ~ 
+		
+		$text = $this->escape_special_characters($text);
+
+		# ~ 
+		
+		if (strpos($text, '_') !== FALSE)
 		{
-			$text = preg_replace('/(\*\*|__)(.+?[*_]*)(?<=\S)\1/', '<strong>$2</strong>', $text);
+			$text = preg_replace('/__(?=\S)(.+?)(?<=\S)__/', '<strong>$1</strong>', $text);
-			$text = preg_replace('/(\*|_)(.+?)(?<=\S)\1/', '<em>$2</em>', $text);
+			$text = preg_replace('/_(?=\S)(.+?)(?<=\S)_/', '<em>$1</em>', $text);
+		}
+		
+		if (strpos($text, '*') !== FALSE)
+		{
+			$text = preg_replace('/\*\*(?=\S)(.+?)(?<=\S)\*\*/', '<strong>$1</strong>', $text);
+			$text = preg_replace('/\*(?=\S)(.+?)(?<=\S)\*/', '<em>$1</em>', $text);
 		}
 		
 		$text = strtr($text, $map);
 		
 		return $text;
 	}
-}
 	
+	private function escape_special_characters($text)
+	{
+		strpos($text, '&') !== FALSE and $text = preg_replace('/&(?!#?\w+;)/', '&amp;', $text);
+		
+		$text = str_replace('<', '&lt;', $text);
+		
+		return $text;
+	}
+}

tests/Test.php

@@ -34,6 +34,8 @@ class Test extends PHPUnit_Framework_TestCase
 					continue;
 				
 				$expected_markup = file_get_contents(__DIR__ . '/' . self::provider_dir . $basename . '.html');
+				$expected_markup = str_replace("\r\n", "\n", $expected_markup);
+				$expected_markup = str_replace("\r", "\n", $expected_markup);
 				
 				$provider [] = array($markdown, $expected_markup);
 			}

tests/data/atx_heading.html

@@ -4,11 +4,3 @@
 <h4>This is an h4</h4>
 <h5>This is an h5</h5>
 <h6>This is an h6</h6>
-<h1>This is a closed h1</h1>
-<h2>This is a closed h2</h2>
-<h3>This is a closed h3</h3>
-<h4>This is a closed h4</h4>
-<h5>This is a closed h5</h5>
-<h6>This is a closed h6</h6>
-<h1>This is an irregularly closed h1</h1>
-<h4>This is an irregularly closed h4</h4>

tests/data/atx_heading.md

@@ -9,19 +9,3 @@
 ##### This is an h5
 
 ###### This is an h6
-
-# This is a closed h1 #
-
-## This is a closed h2 ##
-
-### This is a closed h3 ###
-
-#### This is a closed h4 ####
-
-##### This is a closed h5 #####
-
-###### This is a closed h6 ######
-
-# This is an irregularly closed h1 ###
-
-#### This is an irregularly closed h4 ##

tests/data/blockquote.html

@@ -1,25 +1,13 @@
 <p>Here's a regular blockquote:</p>
 <blockquote>
-<p>This is a blockquote.</p>
+<p>blockquote</p>
 </blockquote>
 <p>Here's one with no space after the ">":</p>
 <blockquote>
-<p>This is a blockquote.</p>
+<p>blockquote</p>
 </blockquote>
-<p>Here's one with multiple paragraphs:</p>
+<p>Here's one on multiple lines:</p>
 <blockquote>
-<p>This is line one.</p>
+<p>line 1
-<p>This is line two.</p>
+line 2</p>
-</blockquote>
-<p>Here's one with multiple types of blocks:</p>
-<blockquote>
-<p>This is a quoted paragraph.</p>
-<ul>
-<li>This is a list item of a quoted list.</li>
-<li>This is another list item.</li>
-</ul>
-<blockquote>
-<p>This is a nested quote block.</p>
-</blockquote>
-<p>This is another paragraph.</p>
 </blockquote>

tests/data/blockquote.md

@@ -1,24 +1,12 @@
 Here's a regular blockquote:
 
-> This is a blockquote.
+> blockquote
 
 Here's one with no space after the ">":
 
->This is a blockquote.
+>blockquote
 
-Here's one with multiple paragraphs:
+Here's one on multiple lines:
 
-> This is line one.
+> line 1
->
+> line 2
-> This is line two.
-
-Here's one with multiple types of blocks:
-
-> This is a quoted paragraph.
-> 
-> - This is a list item of a quoted list.
-> - This is another list item.
->
-> > This is a nested quote block.
-> 
-> This is another paragraph.

tests/data/closed_atx_heading.html

@@ -0,0 +1,6 @@
+<h1>h1</h1>
+<h2>h2</h2>
+<h3>h3</h3>
+<h4>h4</h4>
+<h5>h5</h5>
+<h6>h6</h6>

tests/data/closed_atx_heading.md

@@ -0,0 +1,11 @@
+# h1 #
+
+## h2 ##
+
+### h3 ###
+
+#### h4 ####
+
+##### h5 #####
+
+###### h6 ######

tests/data/code_block.html

@@ -1,9 +1,8 @@
-<p>Here's a regular code block:</p>
+<p>Here's a code block:</p>
 <pre><code>&lt;?php
 
-echo 'Hello World!'; 
+$message = 'Hello World!'; 
-
+echo $message;</code></pre>
-?&gt;</code></pre>
 <p>Here's one that holds a list:</p>
 <pre><code>- list item
 - another list item</code></pre>

tests/data/code_block.md

@@ -1,10 +1,9 @@
-Here's a regular code block:
+Here's a code block:
 
     <?php
     
-    echo 'Hello World!'; 
+    $message = 'Hello World!'; 
-	
+    echo $message;
-	?>
 
 Here's one that holds a list:
 

tests/data/compound_blockquote.html

@@ -0,0 +1,16 @@
+<p>Here's one with multiple paragraphs:</p>
+<blockquote>
+<p>This is line one.</p>
+<p>This is line two.</p>
+</blockquote>
+<p>Here's one with multiple types of blocks:</p>
+<blockquote>
+<p>This is a quoted paragraph.</p>
+<ul>
+<li>This is a list item of a quoted list.</li>
+<li>This is another list item.</li>
+</ul>
+<blockquote>
+<p>This is a nested quote block.</p>
+</blockquote>
+</blockquote>

tests/data/compound_blockquote.md

@@ -0,0 +1,14 @@
+Here's one with multiple paragraphs:
+
+> This is line one.
+>
+> This is line two.
+
+Here's one with multiple types of blocks:
+
+> This is a quoted paragraph.
+> 
+> - This is a list item of a quoted list.
+> - This is another list item.
+>
+> > This is a nested quote block.

tests/data/emphasis.html

@@ -3,6 +3,5 @@
 <p>Here's <strong>a strong one</strong>. </p>
 <p>Here's <em>an emphasis that uses underscores</em>. </p>
 <p>Here's <strong>a strong emphasis that uses underscores</strong>.</p>
-<p>This is _ not an emphasis _ neither is * that * .</p>
+<p>This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _.</p>
 <p>Empty emphasis ** is not __ an emphasis.</p>
-<p>Three asterisks are an emphasized asterisk <em>*</em> .</p>

tests/data/emphasis.md

@@ -8,8 +8,6 @@ Here's _an emphasis that uses underscores_.
 
 Here's __a strong emphasis that uses underscores__.
 
-This is _ not an emphasis _ neither is * that * .
+This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _.
 
 Empty emphasis ** is not __ an emphasis.
-
-Three asterisks are an emphasized asterisk *** .

tests/data/horizontal_rule.html

@@ -0,0 +1,16 @@
+<p>Dashes:</p>
+<hr />
+<hr />
+<hr />
+<hr />
+<pre><code>---</code></pre>
+<hr />
+<hr />
+<hr />
+<hr />
+<pre><code>- - -</code></pre>
+<p>Asterisks:</p>
+<hr />
+<p>Underscores:</p>
+<hr />
+<p>Based on <a href="http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip">the original</a> test suite.</p>

tests/data/horizontal_rule.md

@@ -0,0 +1,31 @@
+Dashes:
+
+---
+
+ ---
+ 
+  ---
+
+   ---
+
+	---
+
+- - -
+
+ - - -
+ 
+  - - -
+
+   - - -
+
+	- - -
+
+Asterisks:
+
+***
+
+Underscores:
+
+___
+
+Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite.

tests/data/html.html

@@ -0,0 +1,15 @@
+<p>Self-closing tag:</p>
+<hr/>
+<p>Self-closing tag with attributes:</p>
+<hr style="background: #eaa" />
+<p>Bare element:</p>
+<div>content</div>
+<p>Element with attributes:</p>
+<a href="http://parsedown.org">link</a>
+<p>Nested elements:</p>
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/html.md

@@ -0,0 +1,24 @@
+Self-closing tag:
+
+<hr/>
+
+Self-closing tag with attributes:
+
+<hr style="background: #eaa" />
+
+Bare element:
+
+<div>content</div>
+
+Element with attributes:
+
+<a href="http://parsedown.org">link</a>
+
+Nested elements:
+
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/lazy_blockquote.html

@@ -0,0 +1,4 @@
+<blockquote>
+<p>line 1
+line 2</p>
+</blockquote>

tests/data/lazy_blockquote.md

@@ -0,0 +1,2 @@
+> line 1
+line 2

tests/data/lazy_list_item.html

@@ -0,0 +1,4 @@
+<ul>
+<li>li
+more text</li>
+</ul>

tests/data/lazy_list_item.md

@@ -0,0 +1,2 @@
+- li
+more text

tests/data/line_break.html

@@ -0,0 +1,2 @@
+<p>line<br />
+line</p>

tests/data/line_break.md

@@ -0,0 +1,2 @@
+line  
+line

tests/data/paragraph_blockquote.html

@@ -0,0 +1,4 @@
+<p>Here's a paragraph.</p>
+<blockquote>
+<p>a block quote that belongs to it.</p>
+</blockquote>

tests/data/paragraph_blockquote.md

@@ -0,0 +1,2 @@
+Here's a paragraph.
+> a block quote that belongs to it.

tests/data/reference_link.html

@@ -1,8 +1,11 @@
 <p>Here's a <a href="http://parsedown.org">reference link</a>.</p>
-<p>Here's <a href="http://parsedown.org">one</a> with an alternative syntax.</p>
 <p>Here's <a href="http://parsedown.org">one</a> on the next line.</p>
-<p>Here's <a href="http://parsedown.org">one</a> on 2 lines.</p>
 <p>Here's <a href="http://parsedown.org/tests/">one</a> with a different URL.</p>
 <p>Here's <a href="http://parsedown.org">one</a> with a semantic name.</p>
+<p>Here's <a href="http://parsedown.org">one</a> with definition name on the next line.</p>
 <p>Here's [one][404] with no definition.</p>
-<p>Here's an image: <img alt="Markdown Logo" src="https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png"></p>
+<p>Here's an image: <img alt="Markdown Logo" src="/md.png"></p>
+<p>Here's an <a href="http://google.com">implicit one</a>.</p>
+<p>Here's an <a href="http://google.com">implicit one</a> with an empty link definition.</p>
+<p>Here's a <a href="http://parsedown.org">multiline
+one</a> defined on 2 lines.</p>

tests/data/reference_link.md

@@ -2,28 +2,31 @@ Here's a [reference link][1].
 
 [1]: http://parsedown.org
 
-Here's [one] [2] with an alternative syntax.
+Here's [one][2] on the next line.
+[2]: http://parsedown.org
 
-[2] :http://parsedown.org
+Here's [one][3] with a different URL.
 
-Here's [one][3] on the next line.
+[3]: http://parsedown.org/tests/
-[3]: http://parsedown.org
 
-Here's [one][4] on 2 lines.
+Here's [one][website] with a semantic name.
 
-[4]:
+[website]: http://parsedown.org
-http://parsedown.org
 
-Here's [one][5] with a different URL.
+Here's [one]
-
+[website] with definition name on the next line.
-[5]: http://parsedown.org/tests/
-
-Here's [one][the website] with a semantic name.
-
-[the website]: http://parsedown.org
 
 Here's [one][404] with no definition.
 
 Here's an image: ![Markdown Logo][image]
 
-[image]: https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png
+[image]: /md.png
+
+Here's an [implicit one].
+
+[implicit one]: http://google.com
+
+Here's an [implicit one][] with an empty link definition.
+
+Here's a [multiline
+one][website] defined on 2 lines.

tests/data/setext_header.html

@@ -0,0 +1,5 @@
+<h1>h1</h1>
+<h2>h2</h2>
+<h2>single character</h2>
+<p>not a header</p>
+<hr />

tests/data/setext_header.md

@@ -0,0 +1,12 @@
+h1
+==
+
+h2
+--
+
+single character
+-
+
+not a header
+
+------------

tests/data/sparse_list.html

@@ -1,14 +1,16 @@
-<p>Here's a list where items are separated by empty lines:</p>
+<p>Here's a sparse list:</p>
 <ul>
 <li>
 <p>list item</p>
 </li>
 <li>another list item</li>
 </ul>
-<p>Here's an ordered one:</p>
+<p>Here's one with an indented list item:</p>
-<ol>
+<ul>
 <li>
-<p>item one</p>
+<p>li</p>
+<ul>
+<li>li</li>
+</ul>
 </li>
-<li>item two</li>
+</ul>
-</ol>

tests/data/sparse_list.md

@@ -1,11 +1,11 @@
-Here's a list where items are separated by empty lines:
+Here's a sparse list:
 
 - list item
 
 - another list item
 
-Here's an ordered one:
+Here's one with an indented list item:
 
-1. item one
+- li
 
-2. item two
+    - li

tests/data/special_characters.html

@@ -0,0 +1,8 @@
+<p>AT&amp;T has an ampersand in their name.</p>
+<p>AT&amp;T is another way to write it.</p>
+<p>This &amp; that.</p>
+<p>4 &lt; 5 and 6 > 5.</p>
+<p>Here's a <a href="http://example.com/?foo=1&amp;bar=2">link</a> with an ampersand in the URL.</p>
+<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
+<hr />
+<p>Based on <a href="http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip">the original</a> test suite.</p>

tests/data/special_characters.md

@@ -0,0 +1,17 @@
+AT&T has an ampersand in their name.
+
+AT&T is another way to write it.
+
+This & that.
+
+4 < 5 and 6 > 5.
+
+Here's a [link] [1] with an ampersand in the URL.
+
+Here's an inline [link](/script?foo=1&bar=2).
+
+[1]: http://example.com/?foo=1&bar=2
+
+---
+
+Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite.