escape sequences with double digit codes do not get decoded properly

Allow multi-line emphasis. Fix #28.

.travis.yml

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

Parsedown.php

@@ -66,7 +66,7 @@ class Parsedown
 			{
 				if (strpos($text, $escape_sequence) !== FALSE)
 				{
-					$code = "\x1A".'\\'.$index;
+					$code = "\x1A".'\\'.$index.';';
 
 					$text = str_replace($escape_sequence, $code, $text);
 
@@ -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);
@@ -217,18 +205,28 @@ 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;
 			}
 
-			# Code 
+			# Code Block
 
 			if ($line[0] === ' ' and preg_match('/^[ ]{4}(.*)/', $line, $matches))
 			{
+				if (trim($line) === '')
+				{
+					continue;
+				}
+
 				if ($element['type'] === 'code')
 				{
-					isset($element['interrupted']) and $element['text'] .= "\n";
+					if (isset($element['interrupted']))
+					{
+						$element['text'] .= "\n";
+
+						unset ($element['interrupted']);
+					}
 
 					$element['text'] .= "\n".$matches[1];
 				}
@@ -284,7 +282,24 @@ class Parsedown
 
 			# ~
 
-			$pure_line = ltrim($line);
+			$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
 
@@ -555,11 +570,13 @@ 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 = $this->escape_special_characters($matches[4]);
+				$url = $matches[4];
+
+				strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
 
 				if ($matches[1]) # image
 				{
@@ -599,7 +616,8 @@ class Parsedown
 				if (isset($this->reference_map[$link_definition]))
 				{
 					$url = $this->reference_map[$link_definition];
-					$url = $this->escape_special_characters($url);
+
+					strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
 
 					if ($matches[1]) # image
 					{
@@ -631,7 +649,9 @@ class Parsedown
 		{
 			foreach ($matches as $matches)
 			{
-				$url = $this->escape_special_characters($matches[1]);
+				$url = $matches[1];
+
+				strpos($url, '&') !== FALSE and $url = preg_replace('/&(?!#?\w+;)/', '&amp;', $url);
 
 				$element = '<a href=":href">:text</a>';
 				$element = str_replace(':text', $url, $element);
@@ -651,33 +671,25 @@ class Parsedown
 
 		# ~
 
-		$text = $this->escape_special_characters($text);
+		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);
-			$text = preg_replace('/_(?=\S)(.+?)(?<=\S)_/', '<em>$1</em>', $text);
+			$text = preg_replace('/__(?=\S)(.+?)(?<=\S)__(?!_)/s', '<strong>$1</strong>', $text);
+			$text = preg_replace('/_(?=\S)(.+?)(?<=\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 = preg_replace('/\*\*(?=\S)(.+?)(?<=\S)\*\*(?!\*)/s', '<strong>$1</strong>', $text);
+			$text = preg_replace('/\*(?=\S)(.+?)(?<=\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;
-	}
 }

README.md

@@ -1,9 +1,8 @@
 ## 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.
+Parsedown PHP is a parser for Markdown. It reads Markdown the way people do. First, it breaks texts into lines. Then, it looks at how these lines start and relate to each other. Finally, it looks for special characters to identify inline elements. As a result, Parsedown PHP is (very) fast and consistent.
 
-[Explorer (demo)](http://parsedown.org/explorer/)  
-[Tests](http://parsedown.org/tests/)
+[Home](http://parsedown.org) · [Demo](http://parsedown.org/explorer/) · [Tests](http://parsedown.org/tests/)
 
 ### Installation
 

tests/data/atx_heading.html

@@ -1,6 +1,7 @@
-<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>
+<h1>h1</h1>
+<h2>h2</h2>
+<h3>h3</h3>
+<h4>h4</h4>
+<h5>h5</h5>
+<h6>h6</h6>
+<h1>closed h1</h1>

tests/data/atx_heading.md

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

tests/data/block-level_html.html

@@ -0,0 +1,9 @@
+<div>content</div>
+<hr style="background: #eaa;" />
+<p>nested elements:</p>
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/block-level_html.md

@@ -0,0 +1,12 @@
+<div>content</div>
+
+<hr style="background: #eaa;" />
+
+nested elements:
+
+<div>
+parent
+<div>
+child
+</div>
+</div>

tests/data/blockquote.html

@@ -1,13 +0,0 @@
-<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

@@ -1,12 +0,0 @@
-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

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

tests/data/closed_atx_heading.md

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

tests/data/code_block.html

@@ -1,9 +1,8 @@
-<p>Here's a regular 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>
+<hr />
+<pre><code>&gt; not a quote 
+- not a list item
+[not a reference]: http://foo.com</code></pre>

tests/data/code_block.md

@@ -1,13 +1,11 @@
-Here's a regular code block:
-
     <?php
     
-    echo 'Hello World!'; 
+    $message = 'Hello World!'; 
+    echo $message;
 
-	?>
+---
 
-Here's one that holds a list:
-
-    - list item
-    - another list item
+    > not a quote 
+    - not a list item
+    [not a reference]: http://foo.com
     

tests/data/code_span.html

@@ -1 +1 @@
-<p>This is a <code>code span</code>.</p>
+<p>a <code>code span</code></p>

tests/data/code_span.md

@@ -1 +1 @@
-This is a `code span`.
+a `code span`

tests/data/compound_blockquote.html

@@ -1,16 +1,9 @@
-<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>
+<h2>header</h2>
+<p>paragraph</p>
 <ul>
-<li>This is a list item of a quoted list.</li>
-<li>This is another list item.</li>
+<li>li</li>
 </ul>
-<blockquote>
-<p>This is a nested quote block.</p>
-</blockquote>
+<hr />
+<p>paragraph</p>
 </blockquote>

tests/data/compound_blockquote.md

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

tests/data/compound_list.html

@@ -1,13 +1,12 @@
-<p>Here's a compound list:</p>
 <ul>
 <li>
-<p>This is the first paragraph of the list item.</p>
-<p>This is the second one.</p>
+<p>paragraph</p>
+<p>paragraph</p>
 </li>
 <li>
-<p>This is another list item.</p>
+<p>paragraph</p>
 <blockquote>
-<p>This is a quote block that belongs to it.</p>
+<p>quote</p>
 </blockquote>
 </li>
 </ul>

tests/data/compound_list.md

@@ -1,10 +1,7 @@
-Here's a compound list:
+- paragraph
 
-- This is the first paragraph of the list item.
+  paragraph
 
-  This is the second one.
-
-- This is another list item.
-
-  > This is a quote block that belongs to it.
+- paragraph
 
+  > quote

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

@@ -0,0 +1,5 @@
+<p><strong><em>em strong</em></strong></p>
+<p><strong><em>one</em> at the start</strong></p>
+<p><strong>one at the <em>end</em></strong></p>
+<p><strong>one <em>in the</em> middle</strong></p>
+<p><strong>one with <em>asterisks</em></strong></p>

tests/data/em_strong.md

@@ -0,0 +1,9 @@
+___em strong___
+
+___one_ at the start__
+
+__one at the _end___
+
+__one _in the_ middle__
+
+**one with *asterisks***

tests/data/emphasis.html

@@ -1,7 +1,5 @@
-<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>
+<p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p>
+<p><em>multiline
+emphasis</em></p>
+<p>_ this _ is not an emphasis, neither is _ this_, _this _, or _this*</p>
+<p>an empty emphasis __ ** is not an emphasis</p>

tests/data/emphasis.md

@@ -1,13 +1,8 @@
-Here's *an emphasis*.
+_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
 
-A short emphasis _a_ *b* .
+_multiline
+emphasis_
 
-Here's **a strong one**. 
+_ this _ is not an emphasis, neither is _ this_, _this _, or _this*
 
-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.
+an empty emphasis __ ** is not an emphasis

tests/data/escaping.html

@@ -1,6 +1,4 @@
-<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>escaped *emphasis*.</p>
+<p><code>escaped \*emphasis\* in a code span</code></p>
+<pre><code>escaped \*emphasis\* in a code block</code></pre>
+<p>\ ` * _ { } [ ] ( ) > # + - . !</p>

tests/data/escaping.md

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

tests/data/horizontal_rule.html

@@ -1,16 +1,5 @@
-<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

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

tests/data/html.html

@@ -1,15 +0,0 @@
-<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

@@ -1,24 +0,0 @@
-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/image_reference.html

@@ -0,0 +1 @@
+<p><img alt="Markdown Logo" src="/md.png"></p>

tests/data/image_reference.md

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

tests/data/implicit_reference.html

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

tests/data/implicit_reference.md

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

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><a href="http://example.com">link</a></p>
+<p><a href="http://example.com"><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).
+[link](http://example.com)
 
-Here's an image link: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/).
+[![MD Logo](http://parsedown.org/md.png)](http://example.com)

tests/data/lazy_blockquote.html

@@ -1,4 +1,4 @@
 <blockquote>
-<p>line 1
-line 2</p>
+<p>quote
+the rest of it</p>
 </blockquote>

tests/data/lazy_blockquote.md

@@ -1,2 +1,2 @@
-> line 1
-line 2
+> quote
+the rest of it

tests/data/lazy_list.html

@@ -0,0 +1,4 @@
+<ul>
+<li>li
+the rest of it</li>
+</ul>

tests/data/lazy_list.md

@@ -0,0 +1,2 @@
+- li
+the rest of it

tests/data/lazy_list_item.html

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

tests/data/lazy_list_item.md

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

tests/data/ordered_list.html

@@ -1,16 +1,13 @@
-<p>Here's a regular ordered list:</p>
-<ol>
-<li>one</li>
-<li>two</li>
-<li>three</li>
-</ol>
-<p>Here's one with repeating numbers:</p>
 <ol>
 <li>one</li>
 <li>two</li>
 </ol>
-<p>Here's one with large numbers:</p>
+<p>repeating numbers:</p>
 <ol>
 <li>one</li>
 <li>two</li>
 </ol>
+<p>large numbers:</p>
+<ol>
+<li>one</li>
+</ol>

tests/data/ordered_list.md

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

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 +0,0 @@
-<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,43 +0,0 @@
-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_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/simple_blockquote.html

@@ -0,0 +1,11 @@
+<blockquote>
+<p>quote</p>
+</blockquote>
+<p>indented:</p>
+<blockquote>
+<p>quote</p>
+</blockquote>
+<p>no space after <code>&gt;</code>:</p>
+<blockquote>
+<p>quote</p>
+</blockquote>

tests/data/simple_blockquote.md

@@ -0,0 +1,7 @@
+> quote
+
+indented:
+   > quote
+
+no space after `>`:
+>quote

tests/data/span-level_html.html

@@ -0,0 +1,3 @@
+<p>an <b>important</b> <a href=''>link</a></p>
+<p>broken<br/>
+line</p>

tests/data/span-level_html.md

@@ -0,0 +1,4 @@
+an <b>important</b> <a href=''>link</a>
+
+broken<br/>
+line

tests/data/sparse_list.html

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

tests/data/sparse_list.md

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

tests/data/special_characters.html

@@ -1,8 +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 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>
+<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><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a> </p>
+<p><a href="/script?a=1&amp;b=2">inline link</a></p>
+<p><a href="http://example.com/?a=1&amp;b=2">reference link</a></p>

tests/data/special_characters.md

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

tests/data/text_reference.html

@@ -0,0 +1,6 @@
+<p><a href="http://example.com">reference link</a></p>
+<p><a href="http://example.com">one</a> with a semantic name</p>
+<p>[one][404] with no definition</p>
+<p><a href="http://example.com">multiline
+one</a> defined on 2 lines</p>
+<p><a href="http://example.com">one</a> with an upper case label</p>

tests/data/text_reference.md

@@ -0,0 +1,16 @@
+[reference link][1]
+
+[1]: http://example.com
+
+[one][website] with a semantic name
+
+[website]: http://example.com
+
+[one][404] with no definition
+
+[multiline
+one][website] defined on 2 lines
+
+[one][label] with an upper case label
+
+[LABEL]: http://example.com

tests/data/unordered_list.html

@@ -1,20 +1,10 @@
-<p>Here's a regular unordered list:</p>
 <ul>
-<li>list item</li>
-<li>another list item</li>
-<li>3rd list item</li>
+<li>li</li>
+<li>li</li>
 </ul>
-<p>Here's one with a variety of markers:</p>
+<p>mixed markers:</p>
 <ul>
-<li>hyphen</li>
-<li>plus</li>
-<li>asterisk</li>
+<li>li</li>
+<li>li</li>
+<li>li</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 +1,8 @@
-Here's a regular unordered list:
+- li
+- li
 
-- list item
-- another list item
-- 3rd list item
+mixed markers:
 
-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
+* li
++ li
+- li

tests/data/whitespace.html

@@ -0,0 +1 @@
+<pre><code>code</code></pre>

tests/data/whitespace.md

@@ -0,0 +1,5 @@
+    
+
+    code
+
+