improve consistency of list item

some edge case tests for the code tag

.gitignore

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

.travis.yml

@@ -0,0 +1,8 @@
+language: php
+
+php:
+  - 5.5
+  - 5.4
+  - 5.3
+  - 5.2
+  - hhvm

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+Do create pull requests that:
+
+* resolve an issue
+* optimise an existing feature or text
+
+Do NOT create pull requests that:
+
+* introduce a feature or text
+* change the currently used coding style
+
+Pull requests should do only ONE thing. If a pull request contains unrelated updates, they should be submitted as separate pull requests.
+
+By contributing to the project, you grant to the creator of the project a perpetual, worldwide, no-charge, irrevocable license to use, reproduce and distribute your contributions and derivative works.
+
+You also warrant that you are the sole owner of your contributions and that they are your original works of authorship.

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,4 +1,31 @@
-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
 
-[Explorer (demo)](http://parsedown.org/explorer/)  
-[Tests](http://parsedown.org/tests/)  
+Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
+
+***
+
+[ [demo](http://parsedown.org/demo) ] [ [tests](http://parsedown.org/tests/) ]
+
+***
+
+### Features
+
+* [fast](http://parsedown.org/speed)
+* [consistent](http://parsedown.org/consistency)
+* [GitHub Flavored](https://help.github.com/articles/github-flavored-markdown)
+* [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5 and [hhvm](http://www.hhvm.com/)
+* friendly to international input
+
+### 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 <em>Parsedown</em>!</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,55 @@
+<?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();
+
+		$path = dirname(__FILE__).'/';
+
+		$DirectoryIterator = new DirectoryIterator($path . '/' . self::provider_dir);
+
+		foreach ($DirectoryIterator as $Item)
+		{
+			if ($Item->isFile())
+			{
+				$filename = $Item->getFilename();
+
+				$extension = pathinfo($filename, PATHINFO_EXTENSION);
+
+				if ($extension !== 'md')
+					continue;
+
+				$basename = $Item->getBasename('.md');
+
+				$markdown = file_get_contents($path . '/' . self::provider_dir . $basename . '.md');
+
+				if (!$markdown)
+					continue;
+
+				$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);
+			}
+		}
+
+		return $provider;
+	}
+}

tests/data/atx_heading.html

@@ -0,0 +1,8 @@
+<h1>h1</h1>
+<h2>h2</h2>
+<h3>h3</h3>
+<h4>h4</h4>
+<h5>h5</h5>
+<h6>h6</h6>
+<h1>closed h1</h1>
+<p>#</p>

tests/data/atx_heading.md

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

tests/data/block-level_html.html

@@ -0,0 +1,5 @@
+<div>_content_</div>
+<p>sparse:</p>
+<div>
+_content_
+</div>

tests/data/block-level_html.md

@@ -0,0 +1,7 @@
+<div>_content_</div>
+
+sparse:
+
+<div>
+_content_
+</div>

tests/data/code_block.html

@@ -0,0 +1,8 @@
+<pre><code>&lt;?php
+
+$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

@@ -0,0 +1,11 @@
+    <?php
+    
+    $message = 'Hello World!'; 
+    echo $message;
+
+---
+
+    > not a quote 
+    - not a list item
+    [not a reference]: http://foo.com
+    

tests/data/code_span.html

@@ -0,0 +1,3 @@
+<p>a <code>code span</code></p>
+<p><code>this is also a codespan</code> trailing text</p>
+<p><code>and look at this one!</code></p>

tests/data/code_span.md

@@ -0,0 +1,5 @@
+a `code span`
+
+`this is also a codespan` trailing text
+
+`and look at this one!`

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_emphasis.html

@@ -0,0 +1,2 @@
+<p><em><code>code</code></em> <strong><code>code</code></strong></p>
+<p><em><code>code</code><strong><code>code</code></strong><code>code</code></em></p>

tests/data/compound_emphasis.md

@@ -0,0 +1,4 @@
+_`code`_ __`code`__
+
+*`code`**`code`**`code`*
+

tests/data/compound_list.html

@@ -0,0 +1,12 @@
+<ul>
+<li>
+<p>paragraph</p>
+<p>paragraph</p>
+</li>
+<li>
+<p>paragraph</p>
+<blockquote>
+<p>quote</p>
+</blockquote>
+</li>
+</ul>

tests/data/compound_list.md

@@ -0,0 +1,7 @@
+- paragraph
+
+  paragraph
+
+- paragraph
+
+  > quote

tests/data/deeply_nested_list.html

@@ -0,0 +1,18 @@
+<ul>
+<li>li
+<ul>
+<li>li
+<ul>
+<li>li
+<ul>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>

tests/data/deeply_nested_list.md

@@ -0,0 +1,7 @@
+- li
+  - li
+    - li
+      - li
+    - li
+  - li
+- li

tests/data/em_strong.html

@@ -0,0 +1,8 @@
+<p><strong><em>em strong</em></strong></p>
+<p><strong><em>em strong</em> strong</strong></p>
+<p><strong>strong <em>em strong</em></strong></p>
+<p><strong>strong <em>em strong</em> strong</strong></p>
+<p><strong><em>em strong</em></strong></p>
+<p><strong><em>em strong</em> strong</strong></p>
+<p><strong>strong <em>em strong</em></strong></p>
+<p><strong>strong <em>em strong</em> strong</strong></p>

tests/data/em_strong.md

@@ -0,0 +1,15 @@
+___em strong___
+
+___em strong_ strong__
+
+__strong _em strong___
+
+__strong _em strong_ strong__
+
+***em strong***
+
+***em strong* strong**
+
+**strong *em strong***
+
+**strong *em strong* strong**

tests/data/email.html

@@ -0,0 +1 @@
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>

tests/data/email.md

@@ -0,0 +1 @@
+my email is <me@example.com>

tests/data/emphasis.html

@@ -0,0 +1,8 @@
+<p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p>
+<p><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p>
+<p><em>line
+line
+line</em></p>
+<p>this_is_not_an_emphasis</p>
+<p>an empty emphasis __ ** is not an emphasis</p>
+<p>*mixed *<em>double and</em> single asterisk** spans</p>

tests/data/emphasis.md

@@ -0,0 +1,13 @@
+_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
+
+**strong** and *em* and **strong** and *em*
+
+_line
+line
+line_
+
+this_is_not_an_emphasis
+
+an empty emphasis __ ** is not an emphasis
+
+*mixed **double and* single asterisk** spans

tests/data/escaping.html

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

@@ -0,0 +1,7 @@
+escaped \*emphasis\*.
+
+`escaped \*emphasis\* in a code span`
+
+    escaped \*emphasis\* in a code block
+
+\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \!

tests/data/fenced_code_block.html

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

tests/data/fenced_code_block.md

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

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

@@ -0,0 +1 @@
+<p>&amp; &copy; &#123;</p>

tests/data/html_entity.md

@@ -0,0 +1 @@
+& © {

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

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

tests/data/image_title.md

@@ -0,0 +1 @@
+![alt](/md.png "title")

tests/data/implicit_reference.html

@@ -0,0 +1,3 @@
+<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>
+<p>an <a href="http://example.com" title="Example">explicit</a> reference link with a title</p>

tests/data/implicit_reference.md

@@ -0,0 +1,9 @@
+an [implicit] reference link
+
+[implicit]: http://example.com
+
+an [implicit][] reference link with an empty link definition
+
+an [explicit][example] reference link with a title
+
+[example]: http://example.com "Example"

tests/data/inline_link.html

@@ -0,0 +1,4 @@
+<p><a href="http://example.com">link</a> and <a href="/tests/">another link</a></p>
+<p><a href="http://example.com"><code>link</code></a></p>
+<p><a href="http://example.com"><img alt="MD Logo" src="http://parsedown.org/md.png" /></a></p>
+<p><a href="http://example.com"><img alt="MD Logo" src="http://parsedown.org/md.png" /> and text</a></p>

tests/data/inline_link.md

@@ -0,0 +1,7 @@
+[link](http://example.com) and [another link](/tests/)
+
+[`link`](http://example.com)
+
+[![MD Logo](http://parsedown.org/md.png)](http://example.com)
+
+[![MD Logo](http://parsedown.org/md.png) and text](http://example.com)

tests/data/inline_title.html

@@ -0,0 +1 @@
+<p><a href="http://example.com" title="Example">single quotes</a> and <a href="http://example.com" title="Example">double quotes</a></p>

tests/data/inline_title.md

@@ -0,0 +1 @@
+[single quotes](http://example.com 'Example') and [double quotes](http://example.com "Example")

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

@@ -0,0 +1,7 @@
+<ul>
+<li>
+<p>li</p>
+<p>line
+line</p>
+</li>
+</ul>

tests/data/multiline_list_paragraph.md

@@ -0,0 +1,4 @@
+- li
+
+  line
+  line

tests/data/nested_block-level_html.html

@@ -0,0 +1,10 @@
+<div>
+_parent_
+<div>
+_child_
+</div>
+<pre>
+_adopted child_
+</pre>
+</div>
+<p><em>outside</em></p>

tests/data/nested_block-level_html.md

@@ -0,0 +1,11 @@
+<div>
+_parent_
+<div>
+_child_
+</div>
+<pre>
+_adopted child_
+</pre>
+</div>
+
+_outside_

tests/data/ordered_list.html

@@ -0,0 +1,13 @@
+<ol>
+<li>one</li>
+<li>two</li>
+</ol>
+<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

@@ -0,0 +1,11 @@
+1. one
+2. two
+
+repeating numbers:
+
+1. one
+1. two
+
+large numbers:
+
+123. one

tests/data/paragraph_list.html

@@ -0,0 +1,12 @@
+<p>paragraph</p>
+<ul>
+<li>li</li>
+<li>li</li>
+</ul>
+<p>paragraph</p>
+<ul>
+<li>
+<p>li</p>
+</li>
+<li>li</li>
+</ul>

tests/data/paragraph_list.md

@@ -0,0 +1,9 @@
+paragraph
+- li
+- li
+
+paragraph
+
+   * li
+   
+   * li

tests/data/reference_title.html

@@ -0,0 +1 @@
+<p><a href="http://example.com" title="Title">single quotes</a> and <a href="http://example.com" title="Title">double quotes</a></p>

tests/data/reference_title.md

@@ -0,0 +1 @@
+[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")

tests/data/self-closing_block-level_html.html

@@ -0,0 +1,4 @@
+<hr />
+<p>attributes:</p>
+<hr style="background: #9bd;" />
+<p>...</p>

tests/data/self-closing_block-level_html.md

@@ -0,0 +1,7 @@
+<hr />
+
+attributes:
+
+<hr style="background: #9bd;" />
+
+...

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/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,4 @@
+<p>an <b>important</b> <a href=''>link</a></p>
+<p>broken<br/>
+line</p>
+<p><b>inline tag</b> at the beginning</p>

tests/data/span-level_html.md

@@ -0,0 +1,6 @@
+an <b>important</b> <a href=''>link</a>
+
+broken<br/>
+line
+
+<b>inline tag</b> at the beginning

tests/data/sparse_dense_list.html

@@ -0,0 +1,7 @@
+<ul>
+<li>
+<p>li</p>
+</li>
+<li>li</li>
+<li>li</li>
+</ul>

tests/data/sparse_dense_list.md

@@ -0,0 +1,4 @@
+- li
+
+- li
+- li

tests/data/sparse_list.html

@@ -0,0 +1,15 @@
+<ul>
+<li>
+<p>li</p>
+</li>
+<li>li</li>
+</ul>
+<hr />
+<ul>
+<li>
+<p>li</p>
+<ul>
+<li>indented li</li>
+</ul>
+</li>
+</ul>

tests/data/sparse_list.md

@@ -0,0 +1,9 @@
+- li
+
+- li
+
+---
+
+- li
+
+    - indented li

tests/data/special_characters.html

@@ -0,0 +1,6 @@
+<p>AT&amp;T has an ampersand in their name</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,13 @@
+AT&T has an ampersand in their name
+
+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>here's <del>one</del> followed by <del>another one</del></p>
+<p>~~ this ~~ is not one neither is ~this~</p>

tests/data/strikethrough.md

@@ -0,0 +1,5 @@
+~~strikethrough~~
+
+here's ~~one~~ followed by ~~another one~~
+
+~~ this ~~ is not one neither is ~this~

tests/data/strong_em.html

@@ -0,0 +1,6 @@
+<p><em>em <strong>strong em</strong></em></p>
+<p><em><strong>strong em</strong> em</em></p>
+<p><em>em <strong>strong em</strong> em</em></p>
+<p><em>em <strong>strong em</strong></em></p>
+<p><em><strong>strong em</strong> em</em></p>
+<p><em>em <strong>strong em</strong> em</em></p>

tests/data/strong_em.md

@@ -0,0 +1,11 @@
+*em **strong em***
+
+***strong em** em*
+
+*em **strong em** em*
+
+_em __strong em___
+
+___strong em__ em_
+
+_em __strong em__ em_

tests/data/tab-indented_code_block.html

@@ -0,0 +1,6 @@
+<pre><code>&lt;?php
+
+$message = 'Hello World!'; 
+echo $message;
+
+echo "following a blank line";</code></pre>

tests/data/tab-indented_code_block.md

@@ -0,0 +1,6 @@
+	<?php
+	
+	$message = 'Hello World!'; 
+	echo $message;
+
+	echo "following a blank line";

tests/data/text_reference.html

@@ -0,0 +1,7 @@
+<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>
+<p><a href="http://example.com"><code>link</code></a></p>

tests/data/text_reference.md

@@ -0,0 +1,18 @@
+[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
+
+[`link`][website]

tests/data/unordered_list.html

@@ -0,0 +1,10 @@
+<ul>
+<li>li</li>
+<li>li</li>
+</ul>
+<p>mixed markers:</p>
+<ul>
+<li>li</li>
+<li>li</li>
+<li>li</li>
+</ul>

tests/data/unordered_list.md

@@ -0,0 +1,8 @@
+- li
+- li
+
+mixed markers:
+
+* li
++ li
+- li

tests/data/url_autolinking.html

@@ -0,0 +1,2 @@
+<p>an autolink <a href="http://example.com">http://example.com</a></p>
+<p>inside of brackets [<a href="http://example.com">http://example.com</a>], inside of braces {<a href="http://example.com">http://example.com</a>},  inside of parentheses (<a href="http://example.com">http://example.com</a>)</p>

tests/data/url_autolinking.md

@@ -0,0 +1,3 @@
+an autolink http://example.com
+
+inside of brackets [http://example.com], inside of braces {http://example.com},  inside of parentheses (http://example.com)

tests/data/whitespace.html

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

tests/data/whitespace.md

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

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;
-}
-