remove redundant parse_inline_elements call

Better parsing of emphasis and strong elements

.gitignore

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

.travis.yml

@@ -0,0 +1,6 @@
+language: php
+
+php:
+  - 5.5
+  - 5.4
+  - 5.3

LICENSE.txt

@@ -1,21 +1,20 @@
-Copyright 2013 Emanuil Rusev
-http://erusev.com
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2013 Emanuil Rusev, erusev.com
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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);
@@ -80,7 +81,7 @@ class Parsedown
 		{
 			foreach ($matches as $matches)
 			{
-				$this->reference_map[$matches[1]] = $matches[2];
+				$this->reference_map[strtolower($matches[1])] = $matches[2];
 				
 				$text = str_replace($matches[0], '', $text);
 			}
@@ -88,7 +89,12 @@ class Parsedown
 		
 		# ~ 
 		
-		$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,378 +112,340 @@ class Parsedown
 	# Private Methods 
 	# 
 	
-	private function parse_blocks($text)
+	private function parse_block_elements(array $lines, $context = '')
 	{
-		# Divides text into blocks.
-		$blocks = preg_split('/\n\s*\n/', $text, -1, PREG_SPLIT_NO_EMPTY);
+		$elements = array();
 		
-		# Makes sure compound blocks get rendered.
-		$blocks []= NULL;
+		$element = array(
+			'type' => '',
+		);
 		
-		$markup = '';
-		
-		# Parses blocks.
-		
-		foreach ($blocks as $block)
+		foreach ($lines as $line)
 		{
-			if (isset($block) and $block[0] > 'A')
+			# Empty 
+			
+			if ($line === '')
 			{
-				$quick_block = $block;
+				$element['interrupted'] = true;
 				
-				unset($block);
+				$element['type'] === 'code' and $element['text'] .= "\n";
+				
+				continue;
 			}
 			
-			# List 
+			# Lazy Blockquote 
 			
-			if (isset($block) and preg_match('/^([ ]{0,3})(\d+[.]|[*+-])[ ]/', $block, $matches)) # list item
+			if ($element['type'] === 'blockquote' and ! isset($element['interrupted']))
 			{
-				if (isset($list)) # subsequent 
-				{
-					$list .= "\n\n".$block;
-				}
-				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+[.]');
-				}
+				$line = preg_replace('/^[ ]*>[ ]?/', '', $line);
 				
-				unset($block);
+				$element['lines'] []= $line;
+				
+				continue;
 			}
-			elseif (isset($list) and $block[0] === ' ') # list item block 
+			
+			# Lazy List Item 
+			
+			if ($element['type'] === 'li')
 			{
-				$list .= "\n\n".$block;
-				
-				unset($block);
-			}
-			elseif (isset($list))
-			{
-				$markup .= '<'.$list_type.'>'."\n";
-				
-				# Of the same type and indentation.
-				$list_items = preg_split('/^([ ]{'.$list_indentation.'})'.$list_marker_pattern.'[ ]/m', $list, -1, PREG_SPLIT_NO_EMPTY);
-				
-				foreach ($list_items as $list_item)
+				if (preg_match('/^([ ]{0,3})(\d+[.]|[*+-])[ ](.*)/', $line, $matches))
 				{
-					$markup .= '<li>';
-					
-					if (strpos($list_item, "\n\n")) # sparse 
+					if ($element['indentation'] !== $matches[1]) 
 					{
-						$list_item = trim($list_item, "\n");
-						
-						if (strpos($list_item, "\n\n"))
-						{
-							$list_item = preg_replace('/^[ ]{0,4}/m', '', $list_item);
-							$list_item = $this->parse_blocks($list_item);
-						}
-						else 
-						{
-							$list_item = $this->parse_lines($list_item);
-						}
-						
-						$markup .= "\n".$list_item;
+						$element['lines'] []= $line;
 					}
-					else # dense 
+					else 
 					{
-						$list_item = trim($list_item, "\n");
-
-						$list_item = strpos($list_item, "\n")
-							? $this->parse_lines($list_item)
-							: $this->parse_inline_elements($list_item);
+						unset($element['last']);
 						
-						$markup .= $list_item;
+						$elements []= $element;
+						
+						$element = array(
+							'type' => 'li',
+							'indentation' => $matches[1],
+							'last' => true,
+							'lines' => array(
+								preg_replace('/^[ ]{0,4}/', '', $matches[3]),
+							),
+						);
 					}
 					
-					$markup .= '</li>'."\n";
+					continue;
 				}
 				
-				$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))
+				if (isset($element['interrupted']))
 				{
-					$code_block .= "\n\n".$block;
+					if ($line[0] === ' ')
+					{
+						$element['lines'] []= '';
+						
+						$line = preg_replace('/^[ ]{0,4}/', '', $line);;
+						
+						$element['lines'] []= $line;
+						
+						continue;
+					}
 				}
 				else
 				{
-					$code_block = $block;
+					$line = preg_replace('/^[ ]{0,4}/', '', $line);;
+						
+					$element['lines'] []= $line;
+					
+					continue;
+				}
+			}
+			
+			# Quick Paragraph 
+			
+			if ($line[0] >= 'A' and $line['0'] !== '_')
+			{
+				goto paragraph; # trust me 
+			}
+			
+			# Setext Header (---) 
+			
+			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[-]+[ ]*$/', $line))
+			{
+				$element['type'] = 'h.';
+				$element['level'] = 2;
+				
+				continue;
+			}
+			
+			# Horizontal Rule  
+			
+			if (preg_match('/^[ ]{0,3}([-*_])([ ]{0,2}\1){2,}[ ]*$/', $line))
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'hr',
+				);
+				
+				continue;
+			}
+			
+			# List Item 
+			
+			if (preg_match('/^([ ]{0,3})(\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;
+			}
+			
+			# Code 
+			
+			if (preg_match('/^[ ]{4}(.*)/', $line, $matches))
+			{
+				if ($element['type'] === 'code')
+				{
+					$element['text'] .= "\n".$matches[1];
+				}
+				else
+				{
+					$elements []= $element;
+					
+					$element = array(
+						'type' => 'code', 
+						'text' => $matches[1],
+					);
 				}
 				
-				unset($block);
-			}
-			elseif (isset($code_block))
-			{
-				$code_block_text = preg_replace('/^[ ]{4}/m', '', $code_block);
-				$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);
+				continue;
 			}
 			
-			# Atx Heading 
+			# Atx Header (#)
 			
-			if (isset($block) and $block[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $block, $matches))
+			if ($line[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $line, $matches))
 			{
+				$elements []= $element;
+				
 				$level = strlen($matches[1]);
 				
-				$heading = $this->parse_inline_elements($matches[2]);
-				
-				$markup .= '<h'.$level.'>'.$heading.'</h'.$level.'>'."\n";
+				$element = array(
+					'type' => 'h.', 
+					'text' => $matches[2], 
+					'level' => $level,
+				);
 				
 				continue;
 			}
 			
-			# Quote Block 
+			# Blockquote 
 			
-			if (isset($block) and preg_match('/^[ ]{0,3}>/', $block))
+			if (preg_match('/^[ ]*>[ ]?(.*)/', $line, $matches))
 			{
-				$block = preg_replace('/^[ ]{0,3}>[ ]?/m', '', $block);
-				$block = $this->parse_blocks($block);
-				
-				$markup .= '<blockquote>'."\n".$block.'</blockquote>'."\n";
+				if ($element['type'] === 'blockquote')
+				{
+					if (isset($element['interrupted']))
+					{
+						$element['lines'] []= '';
+						
+						unset($element['interrupted']);
+					}
+					
+					$element['lines'] []= $matches[1];
+				}
+				else
+				{
+					$elements []= $element;
+					
+					$element = array(
+						'type' => 'blockquote',
+						'lines' => array(
+							$matches[1],
+						),
+					);
+				}
 				
 				continue;
 			}
 			
-			# Horizontal Line 
+			# Setext Header (===) 
 			
-			if (isset($block) and preg_match('/^[ ]{0,3}([-*_])([ ]{0,2}\1){2,}$/', $block))
+			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
 			{
-				$markup .= '<hr />'."\n";
+				$element['type'] = 'h.';
+				$element['level'] = 1;
 				
 				continue;
 			}
 			
 			# ~ 
 			
-			if (isset($quick_block))
+			paragraph:
+			
+			if ($element['type'] === 'p')
 			{
-				$block = $quick_block;
-				
-				unset ($quick_block);
+				if (isset($element['interrupted']))
+				{
+					$elements []= $element;
+					
+					$element['text'] = $line;
+					
+					unset($element['interrupted']);
+				}
+				else
+				{
+					$element['text'] .= "\n".$line;
+				}
 			}
-			
-			# 
-			# Paragraph 
-			
-			if (isset($block))
+			else
 			{
-				if (strpos($block, "\n"))
-				{
-					$markup .= $this->parse_lines($block);
-				}
-				else 
-				{
-					$element_text = $this->parse_inline_elements($block);
-					$element = '<p>'.$element_text.'</p>'."\n";
-
-					$markup .= $element;
-				}
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'p', 
+					'text' => $line,
+				);
 			}
 		}
 		
-		return $markup;
-	}
-	
-	private function parse_lines($text)
-	{
-		$text = trim($text, "\n");
+		$elements []= $element;
 		
-		$lines = explode("\n", $text);
+		array_shift($elements);
 		
-		$lines []= NULL;
+		# 
+		# ~ 
+		# 
 		
 		$markup = '';
 		
-		foreach ($lines as $line)
+		foreach ($elements as $index => $element)
 		{
-			if (isset($line) and $line === '')
+			switch ($element['type'])
 			{
-				unset($line);
-			}
-			
-			# Paragraph 
-			
-			if (isset($line) and $line[0] > 'A')
-			{
-				$quick_line = $line;
-				
-				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)
+				case 'li':
+					
+					if (isset($element['ordered'])) # first
 					{
-						# Adds last list item to the list.
-						$list []= $list_item;
+						$list_type = $element['ordered'] ? 'ol' : 'ul';
 						
-						# Creates a separate list item.
-						$list_item = $matches[3];
+						$markup .= '<'.$list_type.'>'."\n";
+					}
+					
+					if (isset($element['interrupted']) and ! isset($element['last']))
+					{
+						$element['lines'] []= '';
+					}
+					
+					$text = $this->parse_block_elements($element['lines'], 'li');
+					
+					$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($element['interrupted']))
+						{
+							$markup .= "\n".'<p>'.$text.'</p>'."\n";
+						}
+						else 
+						{
+							$markup .= $text;
+						}
 					}
 					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 .= '<p>'.$text.'</p>'."\n";
 					}
 					
-					$markup .= '</'.$list_type.'>'."\n";
+					break;
+				
+				case 'code':
 					
-					unset($list);
-				}
-			}
-			
-			# Quote Block 
-			
-			if (isset($line) and preg_match('/^[ ]*>[ ]?(.*)/', $line, $matches))
-			{
-				if (isset($quote))
-				{
-					$quote .= "\n".$matches[1];
-				}
-				else 
-				{
-					$quote = $matches[1];
-				}
-				
-				unset($line);
-			}
-			else 
-			{
-				if (isset($quote))
-				{
-					$quote = $this->parse_blocks($quote);
+					$text = rtrim($element['text'], "\n");
 					
-					$markup .= '<blockquote>'."\n".$quote.'</blockquote>'."\n";
+					$text = htmlentities($text, ENT_NOQUOTES);
 					
-					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))
-					{
-						$atx_heading_level = $index + 1;
-						
-						$markup .= '<h'.$atx_heading_level.'>'.$paragraph.'</h'.$atx_heading_level.'>'."\n";
-						
-						unset($paragraph);
-						unset($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))
-				{
-					$element_text = $this->parse_inline_elements($paragraph);
+					strpos($text, "\x1A\\") !== FALSE and $text = strtr($text, $this->escape_sequence_map);
 					
-					$markup .= '<p>'.$element_text.'</p>'."\n";
+					$markup .= '<pre><code>'.$text.'</code></pre>'."\n";
 					
-					unset($paragraph);
-				}
+					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;
 			}
 		}
 		
@@ -521,16 +489,51 @@ 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))
+				if ($matches[1]) # image 
 				{
-					$url = $this->reference_map[$matches[3]];
+					$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>';
+				}
+				
+				# ~ 
 
+				$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];
+					
 					if ($matches[1]) # image 
 					{
 						$element = '<img alt="'.$matches[2].'" src="'.$url.'">';
@@ -555,37 +558,6 @@ class Parsedown
 			}
 		}
 		
-		# Inline Link / Image 
-		
-		if (strpos($text, ']') !== FALSE and preg_match_all('/(!?)\[(.*?)\][ ]?\((.*?)\)/', $text, $matches, PREG_SET_ORDER)) # inline 
-		{
-			foreach ($matches as $matches)
-			{
-				if ($matches[1]) # image 
-				{
-					$element = '<img alt="'.$matches[2].'" src="'.$matches[3].'">';
-				}
-				else 
-				{
-					$element_text = $this->parse_inline_elements($matches[2]);
-					
-					$element = '<a href="'.$matches[3].'">'.$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)
@@ -606,16 +578,16 @@ class Parsedown
 			}
 		}
 		
-		if (strpos($text, '*') !== FALSE)
-		{
-			$text = preg_replace('/\*{2}(.*?)\*{2}/', '<strong>$1</strong>', $text);
-			$text = preg_replace('/\*(.*?)\*/', '<em>$1</em>', $text);
-		}
-		
 		if (strpos($text, '_') !== FALSE)
 		{
-			$text = preg_replace('/_{2}(\S.*?\S)_{2}/', '<strong>$1</strong>', $text);
-			$text = preg_replace('/_(\S.*?\S)_/', '<em>$1</em>', $text);
+			$text = preg_replace('/__(?=\S)(.+?)(?<=\S)__/', '<strong>$1</strong>', $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);

README.md

@@ -1,4 +1,20 @@
-Parsedown is a parser for Markdown. It parses Markdown text the way people do. First, it divides texts into blocks. Then it looks at how these blocks start and how they relate to each other. Finally, it looks for special characters to identify inline elements. As a result, Parsedown is (super) fast, predictable and its (open) source code - easy to read.
+## Parsedown PHP
+
+Parsedown is a parser for Markdown. It parses Markdown text the way people do. First, it divides texts into blocks. Then it looks at how these blocks start and how they relate to each other. Finally, it looks for special characters to identify inline elements. As a result, Parsedown is (super) fast, consistent and clean.
 
 [Explorer (demo)](http://parsedown.org/explorer/)  
-[Tests](http://parsedown.org/tests/)  
+[Tests](http://parsedown.org/tests/)
+
+### Installation
+
+Include `Parsedown.php` or install [the composer package](https://packagist.org/packages/erusev/parsedown).
+
+### Example
+
+```php
+$text = 'Hello **Parsedown**!';
+
+$result = Parsedown::instance()->parse($text);
+
+echo $result; # prints: <p>Hello <strong>Parsedown</strong>!</p>
+```

phpunit.xml.dist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true">
+	<testsuites>
+		<testsuite>
+			<file>tests/Test.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>

tests/.htaccess

@@ -1,7 +0,0 @@
-RewriteEngine on
-RewriteBase /
-
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-
-RewriteRule ^(.*)$ tests/index.php?$1 [L]

tests/Test.php

@@ -0,0 +1,47 @@
+<?php
+
+include 'Parsedown.php';
+
+class Test extends PHPUnit_Framework_TestCase
+{
+	const provider_dir = 'data/';
+	
+	/**
+	 * @dataProvider provider
+	 */
+	function test_($markdown, $expected_markup)
+	{
+		$actual_markup = Parsedown::instance()->parse($markdown);
+
+		$this->assertEquals($expected_markup, $actual_markup);
+	}
+	
+	function provider()
+	{
+		$provider = array();
+		
+		$DirectoryIterator = new DirectoryIterator(__DIR__ . '/' . self::provider_dir);
+		
+		foreach ($DirectoryIterator as $Item)
+		{
+			if ($Item->isFile() and $Item->getExtension() === 'md')
+			{
+				$basename = $Item->getBasename('.md');
+				
+				$markdown = file_get_contents(__DIR__ . '/' . self::provider_dir . $basename . '.md');
+				
+				if (!$markdown)
+					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);
+			}
+		}
+		
+		return $provider;
+	}
+}
+

tests/data/atx_heading.html

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

tests/data/atx_heading.md

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

tests/data/blockquote.html

@@ -0,0 +1,13 @@
+<p>Here's a regular blockquote:</p>
+<blockquote>
+<p>blockquote</p>
+</blockquote>
+<p>Here's one with no space after the ">":</p>
+<blockquote>
+<p>blockquote</p>
+</blockquote>
+<p>Here's one on multiple lines:</p>
+<blockquote>
+<p>line 1
+line 2</p>
+</blockquote>

tests/data/blockquote.md

@@ -0,0 +1,12 @@
+Here's a regular blockquote:
+
+> blockquote
+
+Here's one with no space after the ">":
+
+>blockquote
+
+Here's one on multiple lines:
+
+> line 1
+> line 2

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/compound_blockquote.html

@@ -1,25 +1,16 @@
-<p>Here's a regular blockquote:</p>
-<blockquote>
-<p>This is a blockquote.</p>
-</blockquote>
-<p>Here's one with no space after the ">":</p>
-<blockquote>
-<p>This is a blockquote.</p>
-</blockquote>
-<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>
-<p>This is another paragraph.</p>
+<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

@@ -1,24 +1,14 @@
-Here's a regular blockquote:
-
-> This is a blockquote.
-
-Here's one with no space after the ">":
-
->This is a blockquote.
-
-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.
-> 
-> This is another paragraph.
+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/dense_list.html

@@ -14,4 +14,11 @@
 - another list item</code></pre>
 <p>Here's one with no space after markers:</p>
 <p>-list item
--another list item</p>
+-another list item</p>
+<p>Here's one where items contain line breaks:</p>
+<ul>
+<li>list
+item</li>
+<li>another
+list item</li>
+</ul>

tests/data/dense_list.md

@@ -17,4 +17,11 @@ Here's one with too much space before items:
 Here's one with no space after markers:
 
 -list item
--another list item
+-another list item
+
+Here's one where items contain line breaks:
+
+- list
+item
+- another
+list item

tests/data/emphasis.html

@@ -1,5 +1,7 @@
-<p>Here's <em>an emphasis</em>.</p>
-<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 _.</p>
+<p>Here's <em>an emphasis</em>.</p>
+<p>A short emphasis <em>a</em> <em>b</em> .</p>
+<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 * this * neither is _ this_ neither is _this _.</p>
+<p>Empty emphasis ** is not __ an emphasis.</p>

tests/data/emphasis.md

@@ -0,0 +1,13 @@
+Here's *an emphasis*.
+
+A short emphasis _a_ *b* .
+
+Here's **a strong one**. 
+
+Here's _an emphasis that uses underscores_. 
+
+Here's __a strong emphasis that uses underscores__.
+
+This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _.
+
+Empty emphasis ** is not __ an emphasis.

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/inline_link.html

@@ -0,0 +1,2 @@
+<p>Here's a <a href="http://parsedown.org">link</a>.</p>
+<p>Here's an image link: <a href="http://daringfireball.net/projects/markdown/"><img alt="MD Logo" src="http://parsedown.org/md.png"></a>.</p>

tests/data/inline_link.md

@@ -0,0 +1,3 @@
+Here's a [link](http://parsedown.org).
+
+Here's an image link: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/).

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,14 @@
-<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 [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 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="/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>.</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

@@ -1,29 +1,43 @@
-Here's a [reference link][1].
-
-[1]: http://parsedown.org
-
-Here's [one] [2] with an alternative syntax.
-
-[2] :http://parsedown.org
-
-Here's [one][3] on the next line.
-[3]: http://parsedown.org
-
-Here's [one][4] on 2 lines.
-
-[4]:
-http://parsedown.org
-
-Here's [one][5] with a different URL.
-
-[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
+Here's a [reference link][1].
+
+[1]: http://parsedown.org
+
+Here's [one] [2] with an alternative syntax.
+
+[2] :http://parsedown.org
+
+Here's [one][3] on the next line.
+[3]: http://parsedown.org
+
+Here's [one][4] on 2 lines.
+
+[4]:
+http://parsedown.org
+
+Here's [one][5] with a different URL.
+
+[5]: http://parsedown.org/tests/
+
+Here's [one][website] with a semantic name.
+
+[website]: http://parsedown.org
+
+Here's [one]
+[website] with definition name on the next line.
+
+Here's [one][404] with no definition.
+
+Here's an image: ![Markdown Logo][image]
+
+[image]: /md.png
+
+Here's an [implicit one].
+
+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/index.css

@@ -1,51 +0,0 @@
-
-
-.page {
-	margin: 0 auto; 
-	width: 640px;
-}
-
-.header {
-	background: #555;
-	color: #fff;
-}
-
-.odd {
-	background: #fff;	
-}
-
-.even {
-	background: #eee;
-}
-
-div.fail {
-	background: #f55;
-}
-
-div.pass {
-	background: #595;
-}
-
-span.fail {
-	color: #d55;
-}
-
-span.pass {
-	color: #595;
-}
-
-/* ~ */
-
-p {
-	margin: 10px 0;
-}
-
-th {
-	font-weight: normal;
-	text-align: left;
-}
-
-th, td {
-	border-bottom: 1px solid #ddd;
-	padding: 5px 10px;
-}

tests/index.php

@@ -1,12 +0,0 @@
-<?php 
-
-include '../Parsedown.php';
-
-$page = $_SERVER['QUERY_STRING']
-	? 'test'
-	: 'index';
-
-$dir = 'tests/';
-
-include $page.'_controller.php';
-include $page.'_view.php';

tests/index_controller.php

@@ -1,46 +0,0 @@
-<?php 
-				
-$DirectoryIterator = new DirectoryIterator($dir);
-
-$failed_test_count = 0;
-
-foreach ($DirectoryIterator as $Item) 
-{
-	if ($Item->isFile() and $Item->getBasename() != '.DS_Store')
-	{
-		if ($Item->getExtension() === 'md')
-		{
-			$basename = $Item->getBasename('.md');
-
-			$markdown = file_get_contents($dir.$basename.'.md');
-			$expected_markup = file_get_contents($dir.$basename.'.html');
-
-			if ( ! $markdown)
-				continue;
-			
-			$Parsedown = Parsedown::instance();
-
-			$start = microtime(true);
-
-			$actual_markup = $Parsedown->parse($markdown);
-
-			$time = microtime(true) - $start;
-			$time = $time * 1000; # ms?
-			$time = round($time, 2);
-
-			$result = $expected_markup === $actual_markup
-				? 'pass'
-				: 'fail';
-
-			$result === 'fail' and $failed_test_count ++;
-			
-			$Tests []= array(
-				'basename' => $basename,
-				'name' => str_replace('_', ' ', $basename),
-				'result' => $result,
-				'time' => $time,
-			);
-		}
-	}
-}
-

tests/index_view.php

@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-
-<!-- (c) 2009 - 2013 Emanuil Rusev, All rights reserved. -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-	<head>
-		
-		<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-		
-		<link href="reset.css" rel="stylesheet" type="text/css" />
-		<link href="index.css" rel="stylesheet" type="text/css" />
-		
-		<title>Parsedown Test</title>
-		
-	</head>
-	
-	<body>
-		
-		<div style="padding: 50px; width: 500px;">
-			
-			<h1 style="margin: 0;"><a href="/">Parsedown PHP</a> » Tests</h1>
-			
-			<br/>
-			
-			<table>
-
-				<tr class="header">
-					<th style="width: 480px;">Test</th>
-					<th style="text-align: right; width: 120px">Time</th>
-				</tr>
-
-				<?php foreach ($Tests as $index => $Test): ?>
-				<tr class="<?= $index % 2 ? 'even' : 'odd' ?>">
-					<td><a href="/tests/<?= $Test['basename'] ?>"><?= $Test['name'] ?></a> - <span class="<?= $Test['result'] ?>"><?= $Test['result'] ?></span></td>
-					<td style="text-align: right;"><?= $Test['time'] ?> ms</td>
-				</tr>
-				<?php endforeach ?>
-
-			</table>
-			
-			<div class="<?= $failed_test_count ? 'fail' : 'pass' ?>" style="border-top: 1px solid #555; color: #fff; margin-top: 1px; padding:5px 10px;">
-				<?php if ($failed_test_count): ?>
-				<?= $failed_test_count ?> tests failed.
-				<?php else: ?>
-				All <?= count($Tests) ?> tests passed.
-				<?php endif ?>
-			</div>
-		
-		</div>
-			
-	</body>
-	
-</html>

tests/reset.css

@@ -1,108 +0,0 @@
-/*
- *
- * 
- *
- */
-
-a {
-	color: #159;
-	outline: none;
-	text-decoration: none;
-}
-
-a img {
-	border: none;
-}
-
-abbr {
-	border-bottom: 1px solid #ddd;
-	cursor: help;
-	padding: 2px 3px;
-}
-
-body {
-	background: #ddd;
-	color: #333;
-	font-family: Verdana, Sans-serif;
-	font-size: 14px;
-	height: 100%;
-	line-height: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-blockquote {
-	background: #eee;
-	margin: 0 0 10px 0;
-	padding: 10px 10px 1px 10px;
-}
-
-form {
-	margin: 0;
-	padding: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-weight: normal;
-	letter-spacing: 1px;
-	margin: 20px 0;
-}
-
-h1 {
-	line-height: 30px; 
-}
-
-html {
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	overflow-y: scroll;
-}
-
-img {
-	outline: none;
-}
-
-input {
-	font-family: Verdana, Sans-serif;
-	font-size: 14px;
-	line-height: 20px;
-	margin: 0;
-}
-
-object {
-	outline: none;
-}
-
-p {
-	margin-top: 0;
-	margin-bottom: 10px;
-}
-
-select {
-	font-family: Verdana, Sans-serif;
-	font-size: 14px;
-	/* Makes for the same height as <input>. */
-	height: 40px;
-	margin: 0;
-}
-
-table {
-	border-spacing: 0;
-}
-
-textarea {
-	background: #fff;
-	font-family: Verdana, Sans-serif;
-	font-size: 14px;
-	line-height: 20px;
-	margin: 0;
-	padding: 9px;
-	width: 280px;
-}
-
-ul {
-	list-style-type: square;
-}
-

tests/test.css

@@ -1,58 +0,0 @@
-/*
- *
- * ...
- * 
- */
-
-tr.header td {
-	background: #333;
-	color: #fff;
-	padding: 20px;
-}
-
-tr.header a {
-	color: #fff;
-	text-decoration: underline;
-}
-
-tr.body td {
-	background: #fff;
-	padding: 20px;
-	width: 35%;
-}
-
-tr.footer td {
-	background: #fff;
-	border-top: 1px solid #999;
-	padding: 10px 20px;
-}
-
-/* ~ */
-
-tr.fail td {
-	background: #f55;
-}
-
-tr.pass td {
-	background: #5d5;
-}
-
-/* ~ */
-
-code {
-	font-family: Source Code Pro, Monaco, monospace;
-}
-
-pre {
-	margin: 0;
-	white-space: -moz-pre-wrap; /* Mozilla, supported since 1999 */
-	white-space: -pre-wrap; /* Opera */
-	white-space: -o-pre-wrap; /* Opera */
-	white-space: pre-wrap; /* CSS3 - Text module (Candidate Recommendation) http://www.w3.org/TR/css3-text/#white-space */
-	word-wrap: break-word; /* IE 5.5+ */
-}
-
-span.tag {
-	color: #b19;
-}
-

tests/test_controller.php

@@ -1,27 +0,0 @@
-<?php
-
-$test = $_SERVER['QUERY_STRING'];
-
-preg_match('/^\w+$/', $test) or die('illegal test name');
-
-$md_file = $dir.$test.'.md';
-$mu_file = $dir.$test.'.html';
-
-file_exists($md_file) or die("$md_file not found");
-file_exists($mu_file) or die("$mu_file not found");
-
-$md = file_get_contents($md_file);
-
-$expected_mu = file_get_contents($mu_file);
-$actual_mu = Parsedown::instance()->parse($md);
-
-$result = $expected_mu === $actual_mu
-	? 'pass'
-	: 'fail';
-
-$md = htmlentities($md, ENT_NOQUOTES);
-$expected_mu = htmlentities($expected_mu, ENT_NOQUOTES);
-$actual_mu = htmlentities($actual_mu, ENT_NOQUOTES);
-
-$name = str_replace('_', ' ', $test);
-$name = ucwords($name);

tests/test_view.php

@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-
-<!-- (c) 2009 - 2013 Emanuil Rusev, All rights reserved. -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-	<head>
-		
-		<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-		
-		<link href="reset.css" rel="stylesheet" type="text/css" />
-		<link href="test.css" rel="stylesheet" type="text/css" />
-		
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/prettify/r224/prettify.js" type="text/javascript"></script>
-		<script src="http://code.jquery.com/jquery-2.0.0.min.js" type="text/javascript"></script>
-		
-		<title><?= $name ?> &laquo; Parsedown Test</title>
-		
-	</head>
-	
-	<body onload="prettyPrint();">
-		
-		<table style="width: 100%; height: 100%;">
-			<tr class="<?= $result ?>">
-				<td colspan="3"></td>
-			</tr>
-			<tr class="header">
-				<td colspan="2"><a href="/">Parsedown PHP</a> » <a href=".">Tests</a> » <?= $name ?></td>
-				<td style="text-align: right;">
-					<form action="http://parsedown.org<?= $_SERVER['SERVER_NAME'] === 'parsedown.org.local' ? '.local' : '' ?>/explorer/" method="post">
-						<input type="hidden" name="text" />
-						<a id="explorer" href="">Open in Explorer</a>
-					</form>
-				</td>
-			</tr>
-			<tr class="body" style="height: 100%; vertical-align: top;">
-				<td style="background: #eee; width: 30%;">
-					<pre id="md" style="word-wrap: break-word;"><?= $md ?></pre>
-				</td>
-				<td><pre class="prettyprint"><code><?= $expected_mu ?></code></pre></td>
-				<td><pre class="prettyprint"><code><?= $actual_mu ?></code></pre></td>
-			</tr>
-			<tr class="footer">
-				<td style="background: #eee;">Markdown</td>
-				<td>Expected Markup</td>
-				<td>Actual Markup</td>
-			</tr>
-		</table>
-		
-		<script type="text/javascript">
-			
-			$('#explorer').click(function(e) {
-				$('input[name=text]').val($('#md').text());
-				$('form').submit();
-				return false;
-			});
-			
-		</script>
-		
-	</body>
-	
-</html>

tests/tests/atx_heading.html

@@ -1,2 +0,0 @@
-<h1>This is an h1</h1>
-<h2>This is an h2</h2>

tests/tests/atx_heading.md

@@ -1,3 +0,0 @@
-# This is an h1
-
-## This is an h2

tests/tests/emphasis.md

@@ -1,9 +0,0 @@
-Here's *an emphasis*.
-
-Here's **a strong one**. 
-
-Here's _an emphasis that uses underscores_. 
-
-Here's __a strong emphasis that uses underscores__.
-
-This is _ not an emphasis _.