add 5.2 to PHP versions to test against

.travis.yml

@@ -4,3 +4,8 @@ php:
   - 5.5
   - 5.4
   - 5.3
+  - 5.2
+
+matrix:
+  allow_failures:
+    - php: 5.2

Parsedown.php

@@ -75,18 +75,6 @@ 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[strtolower($matches[1])] = $matches[2];
-				
-				$text = str_replace($matches[0], '', $text);
-			}
-		}
-		
 		# ~
 
 		$text = preg_replace('/\n\s*\n/', "\n\n", $text);
@@ -122,14 +110,33 @@ class Parsedown
 
 		foreach ($lines as $line)
 		{
+			# Block-Level HTML
+
+			if ($element['type'] === 'block' and ! isset($element['closed']))
+			{
+				if (preg_match('{<'.$element['subtype'].'>$}', $line)) # <open>
+				{
+					$element['depth']++;
+				}
+
+				if (preg_match('{</'.$element['subtype'].'>$}', $line)) # </close>
+				{
+					$element['depth'] > 0
+						? $element['depth']--
+						: $element['closed'] = true;
+				}
+
+				$element['text'] .= "\n".$line;
+
+				continue;
+			}
+
 			# Empty
 
 			if ($line === '')
 			{
 				$element['interrupted'] = true;
 
-				$element['type'] === 'code' and $element['text'] .= "\n";
-				
 				continue;
 			}
 
@@ -198,59 +205,29 @@ class Parsedown
 
 			# Quick Paragraph
 
-			if ($line[0] >= 'A' and $line['0'] !== '_')
+			if ($line[0] >= 'a' or $line[0] >= 'A' and $line[0] <= 'Z')
 			{
-				goto paragraph; # trust me 
+				goto paragraph;
 			}
 
-			# Setext Header (---) 
+			# Code Block
 
-			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[-]+[ ]*$/', $line))
+			if ($line[0] === ' ' and preg_match('/^[ ]{4}(.*)/', $line, $matches))
+			{
+				if (trim($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')
 				{
+					if (isset($element['interrupted']))
+					{
+						$element['text'] .= "\n";
+
+						unset ($element['interrupted']);
+					}
+
 					$element['text'] .= "\n".$matches[1];
 				}
 				else
@@ -266,6 +243,16 @@ class Parsedown
 				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))
@@ -283,9 +270,40 @@ class Parsedown
 				continue;
 			}
 
+			# Setext Header (===)
+
+			if ($line[0] === '=' and $element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
+			{
+				$element['type'] = 'h.';
+				$element['level'] = 1;
+
+				continue;
+			}
+
+			# ~
+
+			$pure_line = $line[0] !== ' ' ? $line : ltrim($line);
+
+			if ($pure_line === '')
+			{
+				continue;
+			}
+
+			# Link Reference
+
+			if ($pure_line[0] === '[' and preg_match('/^\[(.+?)\]:[ ]*([^ ]+)/', $pure_line, $matches))
+			{
+				$label = strtolower($matches[1]);
+				$url = trim($matches[2], '<>');
+
+				$this->reference_map[$label] = $url;
+
+				continue;
+			}
+
 			# Blockquote
 
-			if (preg_match('/^[ ]*>[ ]?(.*)/', $line, $matches))
+			if ($pure_line[0] === '>' and preg_match('/^>[ ]?(.*)/', $pure_line, $matches))
 			{
 				if ($element['type'] === 'blockquote')
 				{
@@ -313,12 +331,71 @@ class Parsedown
 				continue;
 			}
 
-			# Setext Header (===) 
+			# HTML
 
-			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
+			if ($pure_line[0] === '<')
 			{
-				$element['type'] = 'h.';
-				$element['level'] = 1;
+				# Block-Level HTML <self-closing/>
+
+				if (preg_match('{^<.+?/>$}', $pure_line))
+				{
+					$elements []= $element;
+
+					$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;
 			}
@@ -415,9 +492,7 @@ class Parsedown
 
 				case 'code':
 
-					$text = rtrim($element['text'], "\n");
-					
-					$text = htmlentities($text, ENT_NOQUOTES);
+					$text = htmlentities($element['text'], ENT_NOQUOTES);
 
 					strpos($text, "\x1A\\") !== FALSE and $text = strtr($text, $this->escape_sequence_map);
 
@@ -446,6 +521,10 @@ class Parsedown
 					$markup .= '<hr />'."\n";
 
 					break;
+
+				default:
+
+					$markup .= $element['text']."\n";
 			}
 		}
 
@@ -491,19 +570,23 @@ class Parsedown
 
 		# Inline Link / Image
 
-		if (strpos($text, '](') !== FALSE and preg_match_all('/(!?)(\[((?:[^][]+|(?2))*)\])\((.*?)\)/', $text, $matches, PREG_SET_ORDER)) # inline 
+		if (strpos($text, '](') !== FALSE and preg_match_all('/(!?)(\[((?:[^\[\]]|(?2))*)\])\((.*?)\)/', $text, $matches, PREG_SET_ORDER)) # inline
 		{
 			foreach ($matches as $matches)
 			{
+				$url = $matches[4];
+
+				strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
+
 				if ($matches[1]) # image
 				{
-					$element = '<img alt="'.$matches[3].'" src="'.$matches[4].'">';
+					$element = '<img alt="'.$matches[3].'" src="'.$url.'">';
 				}
 				else
 				{
 					$element_text = $this->parse_inline_elements($matches[3]);
 
-					$element = '<a href="'.$matches[4].'">'.$element_text.'</a>';
+					$element = '<a href="'.$url.'">'.$element_text.'</a>';
 				}
 
 				# ~
@@ -534,6 +617,8 @@ class Parsedown
 				{
 					$url = $this->reference_map[$link_definition];
 
+					strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
+
 					if ($matches[1]) # image
 					{
 						$element = '<img alt="'.$matches[2].'" src="'.$url.'">';
@@ -558,13 +643,19 @@ class Parsedown
 			}
 		}
 
+		# Automatic Links
+
 		if (strpos($text, '<') !== FALSE and preg_match_all('/<((https?|ftp|dict):[^\^\s]+?)>/i', $text, $matches, PREG_SET_ORDER))
 		{
 			foreach ($matches as $matches)
 			{
+				$url = $matches[1];
+
+				strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
+
 				$element = '<a href=":href">:text</a>';
-				$element = str_replace(':text', $matches[1], $element);
-				$element = str_replace(':href', $matches[1], $element);
+				$element = str_replace(':text', $url, $element);
+				$element = str_replace(':href', $url, $element);
 
 				# ~
 
@@ -578,6 +669,13 @@ class Parsedown
 			}
 		}
 
+		# ~
+
+		strpos($text, '&') !== FALSE and $text = preg_replace('/&(?!#?\w+;)/', '&amp;', $text);
+		strpos($text, '<') !== FALSE and $text = preg_replace('/<(?!\/?\w.*?>)/', '&lt;', $text);
+
+		# ~
+
 		if (strpos($text, '_') !== FALSE)
 		{
 			$text = preg_replace('/__(?=\S)(.+?)(?<=\S)__/', '<strong>$1</strong>', $text);
@@ -595,4 +693,3 @@ class Parsedown
 		return $text;
 	}
 }
-

tests/data/blockquote.html

@@ -1,8 +1,4 @@
-<p>Here's a regular blockquote:</p>
-<blockquote>
-<p>blockquote</p>
-</blockquote>
-<p>Here's one with no space after the ">":</p>
+<p>Here's a blockquote:</p>
 <blockquote>
 <p>blockquote</p>
 </blockquote>

tests/data/blockquote.md

@@ -1,8 +1,4 @@
-Here's a regular blockquote:
-
-> blockquote
-
-Here's one with no space after the ">":
+Here's a blockquote:
 
 > blockquote
 

tests/data/blockquote_-_lazy.html

@@ -0,0 +1,11 @@
+<p>Here's a lazy blockquote:</p>
+<blockquote>
+<p>line
+line</p>
+</blockquote>
+<p>Here's one with multiple lines:</p>
+<blockquote>
+<p>line
+line
+line</p>
+</blockquote>

tests/data/blockquote_-_lazy.md

@@ -0,0 +1,10 @@
+Here's a lazy blockquote:
+
+> line
+line
+
+Here's one with multiple lines:
+
+> line
+line
+line

tests/data/blockquote_-_whitespace.html

@@ -0,0 +1,12 @@
+<p>Here's a blockquote with no space after the ">":</p>
+<blockquote>
+<p>blockquote</p>
+</blockquote>
+<p>Here's a blockquote with leading space:</p>
+<blockquote>
+<p>blockquote</p>
+</blockquote>
+<p>Here's a blockquote on the next line:</p>
+<blockquote>
+<p>blockquote</p>
+</blockquote>

tests/data/blockquote_-_whitespace.md

@@ -0,0 +1,10 @@
+Here's a blockquote with no space after the ">":
+
+>blockquote
+
+Here's a blockquote with leading space:
+
+   > blockquote
+
+Here's a blockquote on the next line:
+> blockquote

tests/data/code_block.html

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

tests/data/code_block.md

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

tests/data/dense_list.html

@@ -1,24 +0,0 @@
-<p>Here's a regular list:</p>
-<ul>
-<li>list item</li>
-<li>another list item</li>
-<li>3rd list item</li>
-</ul>
-<p>Here's one with white space around items:</p>
-<ul>
-<li>list item  </li>
-<li>another list item  </li>
-</ul>
-<p>Here's one with too much space before items:</p>
-<pre><code>- list item
-- another list item</code></pre>
-<p>Here's one with no space after markers:</p>
-<p>-list item
--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

@@ -1,27 +0,0 @@
-Here's a regular list:
-
-- list item
-- another list item
-- 3rd list item
-
-Here's one with white space around items:
-
-  - list item  
-  - another list item  
-
-Here's one with too much space before items:
-
-    - list item
-    - another list item
-
-Here's one with no space after markers:
-
--list item
--another list item
-
-Here's one where items contain line breaks:
-
-- list
-item
-- another
-list item

tests/data/emphasis.html

@@ -1,7 +1,7 @@
 <p>Here's <em>an emphasis</em>.</p>
-<p>A short emphasis <em>a</em> <em>b</em> .</p>
+<p>A short one <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>
+<p>Here's <em>one that uses underscores</em>. </p>
+<p>Here's <strong>a strong one that uses underscores</strong>.</p>
+<p>This is not _ one _ neither is * this * neither is _ this_ neither is _this _.</p>
+<p>An empty emphasis ** is not __ an emphasis.</p>

tests/data/emphasis.md

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

tests/data/escaping.html

@@ -1,6 +1,2 @@
-<p>Here's an <em>emphasis</em> and here's an escaped *emphasis*. Here are also an escaped `code span`, escaped [inline link](http://example.com).</p>
-<p>Here's <code>an escaped \*emphasis\* inside of a code span</code>.</p>
-<p>Here's one inside of a code block:</p>
-<pre><code>An escaped \*emphasis\*.</code></pre>
-<p>Finally, an escaped reference:</p>
-<p>[1]: http://example.com</p>
+<p>Here's an <em>emphasis</em> and here's an escaped *emphasis*. Here are also an escaped `code span`, an escaped [inline link](http://example.com) and an escaped <code>\*emphasis\*</code> inside of a code span.</p>
+<pre><code>An escaped \*emphasis\* inside of a code block.</code></pre>

tests/data/escaping.md

@@ -1,11 +1,3 @@
-Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, escaped \[inline link](http://example.com).
+Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, an escaped \[inline link](http://example.com) and an escaped `\*emphasis\*` inside of a code span.
 
-Here's `an escaped \*emphasis\* inside of a code span`.
-
-Here's one inside of a code block:
-
-    An escaped \*emphasis\*.
-
-Finally, an escaped reference:
-
-\[1]: http://example.com
+    An escaped \*emphasis\* inside of a code block.

tests/data/horizontal_rule.html

@@ -2,15 +2,9 @@
 <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>
+<p>On the next line:</p>
+<hr />

tests/data/horizontal_rule.md

@@ -1,19 +1,5 @@
 Dashes:
 
----
-
- ---
- 
-  ---
-
-   ---
-
-	---
-
-- - -
-
- - - -
- 
 ---
 
 - - -
@@ -28,4 +14,5 @@ Underscores:
 
 ___
 
-Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite.
+On the next line:
+___

tests/data/html.html

@@ -0,0 +1,15 @@
+<p>A self-closing tag:</p>
+<hr/>
+<p>One with attributes:</p>
+<hr style="background: #eaa" />
+<p>A bare element:</p>
+<div>content</div>
+<p>One with attributes:</p>
+<a href="http://example.com">link</a>
+<p>Nested elements:</p>
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/html.md

@@ -0,0 +1,24 @@
+A self-closing tag:
+
+<hr/>
+
+One with attributes:
+
+<hr style="background: #eaa" />
+
+A bare element:
+
+<div>content</div>
+
+One with attributes:
+
+<a href="http://example.com">link</a>
+
+Nested elements:
+
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/inline_link.html

@@ -1,2 +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>
+<p>Here's a <a href="http://example.com">link</a>.</p>
+<p>Here's one that is based on an image: <a href="http://daringfireball.net/projects/markdown/"><img alt="MD Logo" src="http://parsedown.org/md.png"></a>.</p>

tests/data/inline_link.md

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

tests/data/lazy_blockquote.html

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

tests/data/lazy_blockquote.md

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

tests/data/list.html

@@ -0,0 +1,5 @@
+<p>Here's a list:</p>
+<ul>
+<li>li</li>
+<li>li</li>
+</ul>

tests/data/list.md

@@ -0,0 +1,4 @@
+Here's a list:
+
+- li
+- li

tests/data/list_-_compound.md

@@ -7,4 +7,3 @@ Here's a compound list:
 - This is another list item.
 
   > This is a quote block that belongs to it.
-

tests/data/list_-_ordered.html

@@ -2,7 +2,6 @@
 <ol>
 <li>one</li>
 <li>two</li>
-<li>three</li>
 </ol>
 <p>Here's one with repeating numbers:</p>
 <ol>
@@ -12,5 +11,4 @@
 <p>Here's one with large numbers:</p>
 <ol>
 <li>one</li>
-<li>two</li>
 </ol>

tests/data/list_-_ordered.md

@@ -2,7 +2,6 @@ Here's a regular ordered list:
 
 1. one
 2. two
-3. three
 
 Here's one with repeating numbers:
 
@@ -12,5 +11,3 @@ Here's one with repeating numbers:
 Here's one with large numbers:
 
 123. one
-123. two
-

tests/data/list_-_sparse.html

@@ -0,0 +1,16 @@
+<p>Here's a sparse list:</p>
+<ul>
+<li>
+<p>list item</p>
+</li>
+<li>another list item</li>
+</ul>
+<p>Here's one with an indented list item:</p>
+<ul>
+<li>
+<p>li</p>
+<ul>
+<li>li</li>
+</ul>
+</li>
+</ul>

tests/data/list_-_sparse.md

@@ -0,0 +1,11 @@
+Here's a sparse list:
+
+- list item
+
+- another list item
+
+Here's one with an indented list item:
+
+- li
+
+    - li

tests/data/list_-_unordered.html

@@ -0,0 +1,11 @@
+<p>Here's an unordered list:</p>
+<ul>
+<li>li</li>
+<li>li</li>
+</ul>
+<p>Here's one with mixed markers:</p>
+<ul>
+<li>li</li>
+<li>li</li>
+<li>li</li>
+</ul>

tests/data/list_-_unordered.md

@@ -0,0 +1,10 @@
+Here's an unordered list:
+
+- li
+- li
+
+Here's one with mixed markers:
+
+- li
++ li
+* li

tests/data/list_-_whitespace.html

@@ -0,0 +1,5 @@
+<p>Here's one with white space around items:</p>
+<ul>
+<li>li  </li>
+<li>li  </li>
+</ul>

tests/data/list_-_whitespace.md

@@ -0,0 +1,4 @@
+Here's one with white space around items:
+
+  - li  
+  - li  

tests/data/paragraph_blockquote.html

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

tests/data/paragraph_blockquote.md

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

tests/data/paragraph_list.html

@@ -1,5 +0,0 @@
-<p>Here's a list that's "inside" a paragraph:</p>
-<ul>
-<li>list item</li>
-<li>another list item</li>
-</ul>

tests/data/paragraph_list.md

@@ -1,4 +0,0 @@
-Here's a list that's "inside" a paragraph:
-- list item
-- another list item
-

tests/data/quote_block.html

@@ -1,20 +0,0 @@
-<p>Here's a regular quote block:</p>
-<blockquote>
-<p>Some quoted text.
-Here goes some more.</p>
-</blockquote>
-<p>Here's one with space before lines:</p>
-<blockquote>
-<p>Some quoted text.
-Here goes some more.</p>
-</blockquote>
-<p>Here's one with no space after >:</p>
-<blockquote>
-<p>Some quoted text.
-Here goes some more.</p>
-</blockquote>
-<p>Here's one with no > on the second line:</p>
-<blockquote>
-<p>Some quoted text.
-Here goes some more.</p>
-</blockquote>

tests/data/quote_block.md

@@ -1,19 +0,0 @@
-Here's a regular quote block:
-
-> Some quoted text.
-> Here goes some more.
-
-Here's one with space before lines:
-
-   > Some quoted text.
-   > Here goes some more.
-
-Here's one with no space after >:
-
->Some quoted text.
->Here goes some more.
-
-Here's one with no > on the second line:
-
-> Some quoted text.
-Here goes some more.

tests/data/reference_link.html

@@ -1,14 +1,7 @@
-<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 a <a href="http://example.com">reference link</a>.</p>
+<p>Here's <a href="http://example.com">one</a> with a semantic name.</p>
+<p>Here's <a href="http://example.com">one</a> with an upper case label definition.</p>
+<p>Here's <a href="http://example.com">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
+<p>Here's a <a href="http://example.com">multiline
 one</a> defined on 2 lines.</p>

tests/data/reference_link.md

@@ -1,43 +1,19 @@
 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/
+[1]: http://example.com
 
 Here's [one][website] with a semantic name.
 
-[website]: http://parsedown.org
+[website]: http://example.com
+
+Here's [one][case] with an upper case label definition.
+
+[CASE]: http://example.com
 
 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/reference_link_-_image.html

@@ -0,0 +1 @@
+<p>Here's an image: <img alt="Markdown Logo" src="/md.png"></p>

tests/data/reference_link_-_image.md

@@ -0,0 +1,3 @@
+Here's an image: ![Markdown Logo][image]
+
+[image]: /md.png

tests/data/reference_link_-_implicit.html

@@ -0,0 +1,2 @@
+<p>Here's an <a href="http://example.com">implicit</a> reference link.</p>
+<p>Here's an <a href="http://example.com">implicit</a> one with an empty link definition.</p>

tests/data/reference_link_-_implicit.md

@@ -0,0 +1,5 @@
+Here's an [implicit] reference link.
+
+[implicit]: http://example.com
+
+Here's an [implicit][] one with an empty link definition.

tests/data/reference_link_-_whitespace.html

@@ -0,0 +1 @@
+<p>Here's a <a href="http://example.com">reference link</a> with a definition on the next line.</p>

tests/data/reference_link_-_whitespace.md

@@ -0,0 +1,2 @@
+Here's a [reference link][2] with a definition on the next line.
+[2]: http://example.com

tests/data/setext_heading.html

@@ -1,6 +0,0 @@
-<h1>Heading 1</h1>
-<h2>Heading 2</h2>
-<h2>Block Heading</h2>
-<p>This is the rest of the block.</p>
-<h1>Single "="</h1>
-<h2>Single "-"</h2>

tests/data/setext_heading.md

@@ -1,16 +0,0 @@
-Heading 1
-=========
-
-Heading 2
----------
-
-Block Heading
--------------
-This is the rest of the block.
-
-Single "="
-=
-
-Single "-"
--
-

tests/data/span_level_html.html

@@ -0,0 +1 @@
+<p>Here's an <b>important</b> <a href=''>link</a>.</p>

tests/data/span_level_html.md

@@ -0,0 +1 @@
+Here's an <b>important</b> <a href=''>link</a>.

tests/data/sparse_list.html

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

tests/data/sparse_list.md

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

tests/data/special_characters.html

@@ -0,0 +1,7 @@
+<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 an autolink <a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>
+<p>Here's an inline <a href="/script?a=1&amp;b=2">link</a>.</p>
+<p>Here's a reference <a href="http://example.com/?a=1&amp;b=2">link</a> with an ampersand in the URL.</p>

tests/data/special_characters.md

@@ -0,0 +1,15 @@
+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 an autolink <http://example.com/autolink?a=1&b=2>
+
+Here's an inline [link](/script?a=1&b=2).
+
+Here's a reference [link] [1] with an ampersand in the URL.
+
+[1]: http://example.com/?a=1&b=2

tests/data/unordered_list.html

@@ -1,20 +0,0 @@
-<p>Here's a regular unordered list:</p>
-<ul>
-<li>list item</li>
-<li>another list item</li>
-<li>3rd list item</li>
-</ul>
-<p>Here's one with a variety of markers:</p>
-<ul>
-<li>hyphen</li>
-<li>plus</li>
-<li>asterisk</li>
-</ul>
-<p>Here's one with white space around items:</p>
-<ul>
-<li>list item  </li>
-<li>another list item  </li>
-</ul>
-<p>Here's one with no space after markers:</p>
-<p>-list item
--another list item</p>

tests/data/unordered_list.md

@@ -1,21 +0,0 @@
-Here's a regular unordered list:
-
-- list item
-- another list item
-- 3rd list item
-
-Here's one with a variety of markers:
-
-- hyphen
-+ plus
-* asterisk
-
-Here's one with white space around items:
-
-  - list item  
-  - another list item  
-
-Here's one with no space after markers:
-
--list item
--another list item

tests/data/whitespace.html

@@ -0,0 +1 @@
+<pre><code>This text starts with a line that consists of 4 spaces and it ends with one. This is a code block to make sure that leading spaces don't get trimmed.</code></pre>

tests/data/whitespace.md

@@ -0,0 +1,5 @@
+    
+
+    This text starts with a line that consists of 4 spaces and it ends with one. This is a code block to make sure that leading spaces don't get trimmed.
+
+