Merge pull request #37 from hkdobrev/htmlspecialshars-utf8

Prior to PHP 5.4.0 the default encoding for `htmlentities()`
and `htmlspecialchars` is "ISO-8859-1". For PHP 5.4+ is "UTF-8".

This ensures always the right encoding is used no matter the PHP version
and the locale settings.

.coveralls.yml

@@ -1 +0,0 @@
-src_dir: .

.gitignore

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

.travis.yml

@@ -1,15 +1,7 @@
 language: php
 
 php:
+  - 5.5
   - 5.4
   - 5.3
-
-before_script:
-  - composer require satooshi/php-coveralls:dev-master
-  - mkdir -p build/logs
-
-script:
-  - phpunit --coverage-clover build/logs/clover.xml
-
-after_script:
-  - php vendor/bin/coveralls
+  - 5.2

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.

README.md

@@ -1,9 +1,8 @@
-## Parsedown PHP
+## Parsedown
 
-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.
+Fast, consistent and easy to use [Markdown][1] parser for PHP.
 
-[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
 
@@ -18,3 +17,5 @@ $result = Parsedown::instance()->parse($text);
 
 echo $result; # prints: <p>Hello <strong>Parsedown</strong>!</p>
 ```
+
+[1]: http://daringfireball.net/projects/markdown/

tests/Test.php

@@ -20,20 +20,31 @@ class Test extends PHPUnit_Framework_TestCase
 	{
 		$provider = array();
 
-		$DirectoryIterator = new DirectoryIterator(__DIR__ . '/' . self::provider_dir);
+		$path = dirname(__FILE__).'/';
+
+		$DirectoryIterator = new DirectoryIterator($path . '/' . self::provider_dir);
 
 		foreach ($DirectoryIterator as $Item)
 		{
-			if ($Item->isFile() and $Item->getExtension() === 'md')
+			if ($Item->isFile())
 			{
+				$filename = $Item->getFilename();
+
+				$extension = pathinfo($filename, PATHINFO_EXTENSION);
+
+				if ($extension !== 'md')
+					continue;
+
 				$basename = $Item->getBasename('.md');
 
-				$markdown = file_get_contents(__DIR__ . '/' . self::provider_dir . $basename . '.md');
+				$markdown = file_get_contents($path . '/' . self::provider_dir . $basename . '.md');
 
 				if (!$markdown)
 					continue;
 
-				$expected_markup = file_get_contents(__DIR__ . '/' . self::provider_dir . $basename . '.html');
+				$expected_markup = file_get_contents($path . '/' . 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);
 			}
@@ -42,4 +53,3 @@ class Test extends PHPUnit_Framework_TestCase
 		return $provider;
 	}
 }
-

tests/data/atx_heading.html

@@ -1,14 +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>This is a closed h1</h1>
-<h2>This is a closed h2</h2>
-<h3>This is a closed h3</h3>
-<h4>This is a closed h4</h4>
-<h5>This is a closed h5</h5>
-<h6>This is a closed h6</h6>
-<h1>This is an irregularly closed h1</h1>
-<h4>This is an irregularly closed h4</h4>
+<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,27 +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
 
-# This is a closed h1 #
-
-## This is a closed h2 ##
-
-### This is a closed h3 ###
-
-#### This is a closed h4 ####
-
-##### This is a closed h5 #####
-
-###### This is a closed h6 ######
-
-# This is an irregularly closed h1 ###
-
-#### This is an irregularly closed h4 ##
+# 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,25 +0,0 @@
-<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>
-</blockquote>

tests/data/blockquote.md

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

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

@@ -0,0 +1,9 @@
+<blockquote>
+<h2>header</h2>
+<p>paragraph</p>
+<ul>
+<li>li</li>
+</ul>
+<hr />
+<p>paragraph</p>
+</blockquote>

tests/data/compound_blockquote.md

@@ -0,0 +1,10 @@
+> header
+> ------
+>
+> paragraph
+>
+> - li
+>
+> ---
+>
+> 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/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,8 +1,6 @@
-<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 * that * .</p>
-<p>Empty emphasis ** is not __ an emphasis.</p>
-<p>Three asterisks are an emphasized asterisk <em>*</em> .</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>this_is_not_an_emphasis</p>
+<p>an empty emphasis __ ** is not an emphasis</p>

tests/data/emphasis.md

@@ -1,15 +1,10 @@
-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_. 
+this_is_not_an_emphasis
 
-Here's __a strong emphasis that uses underscores__.
-
-This is _ not an emphasis _ neither is * that * .
-
-Empty emphasis ** is not __ an emphasis.
-
-Three asterisks are an emphasized asterisk *** .
+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/fenced_code_block.html

@@ -0,0 +1,5 @@
+<pre><code>&lt;?php
+
+$message = 'fenced code block';
+echo $message;</code></pre>
+<pre><code>tilde</code></pre>

tests/data/fenced_code_block.md

@@ -0,0 +1,10 @@
+```
+<?php
+
+$message = 'fenced code block';
+echo $message;
+```
+
+~~~
+tilde
+~~~

tests/data/horizontal_rule.html

@@ -0,0 +1,5 @@
+<hr />
+<hr />
+<hr />
+<hr />
+<hr />

tests/data/horizontal_rule.md

@@ -0,0 +1,9 @@
+---
+
+- - -
+
+   - - -
+
+***
+
+___

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

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

@@ -0,0 +1,3 @@
+[link](http://example.com)
+
+[![MD Logo](http://parsedown.org/md.png)](http://example.com)

tests/data/lazy_blockquote.html

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

tests/data/lazy_blockquote.md

@@ -0,0 +1,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/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/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_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,8 +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 [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>

tests/data/reference_link.md

@@ -1,29 +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][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

tests/data/regular_list.html

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

tests/data/regular_list.md

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

tests/data/setext_header.html

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

tests/data/setext_header.md

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

tests/data/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,14 +1,15 @@
-<p>Here's a list where items are separated by empty lines:</p>
 <ul>
 <li>
-<p>list item</p>
+<p>li</p>
 </li>
-<li>another list item</li>
+<li>li</li>
 </ul>
-<p>Here's an ordered one:</p>
-<ol>
+<hr />
+<ul>
 <li>
-<p>item one</p>
+<p>li</p>
+<ul>
+<li>indented li</li>
+</ul>
 </li>
-<li>item two</li>
-</ol>
+</ul>

tests/data/sparse_list.md

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

tests/data/special_characters.html

@@ -0,0 +1,8 @@
+<p>AT&amp;T has an ampersand in their name</p>
+<pre><code>Let's play some cards ♠ ♣ ♥ ♦</code></pre>
+<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

@@ -0,0 +1,17 @@
+AT&T has an ampersand in their name
+
+    Let's play some cards ♠ ♣ ♥ ♦
+
+AT&T is another way to write it
+
+this & that
+
+4 < 5 and 6 > 5
+
+<http://example.com/autolink?a=1&b=2> 
+
+[inline link](/script?a=1&b=2)
+
+[reference link][1]
+
+[1]: http://example.com/?a=1&b=2

tests/data/strikethrough.html

@@ -0,0 +1,3 @@
+<p><del>strikethrough</del></p>
+<p>in the <del>middle</del> of a sentence</p>
+<p>in the middle of a w<del>or</del>d</p>

tests/data/strikethrough.md

@@ -0,0 +1,5 @@
+~~strikethrough~~
+
+in the ~~middle~~ of a sentence
+
+in the middle of a w~~or~~d

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

@@ -0,0 +1 @@
+<p>Here's an autolink <a href="http://example.com">http://example.com</a>.</p>

tests/data/url_autolinking.md

@@ -0,0 +1 @@
+Here's an autolink http://example.com.

tests/data/whitespace.html

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

tests/data/whitespace.md

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