fix paragraph list

take $inline_tags out of the method
lines that start with inline html should not get parsed as block-level markup, should resolve #54 and #57
2023-08-10 21:13:06 +03:00 · 2014-01-18 16:45:39 +02:00 · 2014-01-18 16:45:39 +02:00 · 2014-01-18 16:45:39 +02:00 · 2014-01-17 01:33:20 +02:00 · 2014-01-17 01:25:41 +02:00
111 changed files with 1264 additions and 879 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,4 @@ php:
  - 5.4
  - 5.3
  - 5.2
-
-matrix:
-  allow_failures:
-    - php: 5.2
+  - hhvm
--- a/Parsedown.php
+++ b/Parsedown.php
--- a/README.md
+++ b/README.md
@ -1,9 +1,20 @@
-## 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.
+Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.

-[Explorer (demo)](http://parsedown.org/explorer/)  
-[Tests](http://parsedown.org/tests/)
+***
+
+[ [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)
+* friendly to international input
+* [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5 and [hhvm](http://www.hhvm.com/)

 ### Installation

@ -12,9 +23,9 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 ### Example

 ```php
-$text = 'Hello **Parsedown**!';
+$text = 'Hello _Parsedown_!';

 $result = Parsedown::instance()->parse($text);

-echo $result; # prints: <p>Hello <strong>Parsedown</strong>!</p>
+echo $result; # prints: <p>Hello <em>Parsedown</em>!</p>
 ```
--- a/tests/Test.php
+++ b/tests/Test.php
@ -20,20 +20,29 @@ 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);

@ -44,4 +53,3 @@ class Test extends PHPUnit_Framework_TestCase
 		return $provider;
 	}
 }
-
--- a/tests/data/atx_heading.html
+++ b/tests/data/atx_heading.html
@ -1,6 +1,8 @@
-<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>
+<p>#</p>
--- a/tests/data/atx_heading.md
+++ b/tests/data/atx_heading.md
@ -1,11 +1,15 @@
-# 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 #
+
+#
--- a/tests/data/atx_heading_-_closed.html
+++ b/tests/data/atx_heading_-_closed.html
@ -1,6 +0,0 @@
-<h1>h1</h1>
-<h2>h2</h2>
-<h3>h3</h3>
-<h4>h4</h4>
-<h5>h5</h5>
-<h6>h6</h6>
--- a/tests/data/atx_heading_-_closed.md
+++ b/tests/data/atx_heading_-_closed.md
@ -1,11 +0,0 @@
-# h1 #
-
-## h2 ##
-
-### h3 ###
-
-#### h4 ####
-
-##### h5 #####
-
-###### h6 ######
--- a/tests/data/block-level_html.html
+++ b/tests/data/block-level_html.html
@ -0,0 +1,5 @@
+<div>_content_</div>
+<p>sparse:</p>
+<div>
+_content_
+</div>
--- a/tests/data/block-level_html.md
+++ b/tests/data/block-level_html.md
@ -0,0 +1,7 @@
+<div>_content_</div>
+
+sparse:
+
+<div>
+_content_
+</div>
--- a/tests/data/blockquote.html
+++ b/tests/data/blockquote.html
@ -1,9 +0,0 @@
-<p>Here's a blockquote:</p>
-<blockquote>
-<p>blockquote</p>
-</blockquote>
-<p>Here's one on multiple lines:</p>
-<blockquote>
-<p>line 1
-line 2</p>
-</blockquote>
--- a/tests/data/blockquote.md
+++ b/tests/data/blockquote.md
@ -1,8 +0,0 @@
-Here's a blockquote:
-
-> blockquote
-
-Here's one on multiple lines:
-
-> line 1
-> line 2
--- a/tests/data/blockquote_-_compound.html
+++ b/tests/data/blockquote_-_compound.html
@ -1,16 +0,0 @@
-<p>Here's one with multiple paragraphs:</p>
-<blockquote>
-<p>This is line one.</p>
-<p>This is line two.</p>
-</blockquote>
-<p>Here's one with multiple types of blocks:</p>
-<blockquote>
-<p>This is a quoted paragraph.</p>
-<ul>
-<li>This is a list item of a quoted list.</li>
-<li>This is another list item.</li>
-</ul>
-<blockquote>
-<p>This is a nested quote block.</p>
-</blockquote>
-</blockquote>
--- a/tests/data/blockquote_-_compound.md
+++ b/tests/data/blockquote_-_compound.md
@ -1,14 +0,0 @@
-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.
--- a/tests/data/blockquote_-_lazy.html
+++ b/tests/data/blockquote_-_lazy.html
@ -1,11 +0,0 @@
-<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>
--- a/tests/data/blockquote_-_lazy.md
+++ b/tests/data/blockquote_-_lazy.md
@ -1,10 +0,0 @@
-Here's a lazy blockquote:
-
-> line
-line
-
-Here's one with multiple lines:
-
-> line
-line
-line
--- a/tests/data/blockquote_-_whitespace.html
+++ b/tests/data/blockquote_-_whitespace.html
@ -1,12 +0,0 @@
-<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>
--- a/tests/data/blockquote_-_whitespace.md
+++ b/tests/data/blockquote_-_whitespace.md
@ -1,10 +0,0 @@
-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
--- a/tests/data/code_block.html
+++ b/tests/data/code_block.html
@ -1,5 +1,8 @@
-<p>Here's a code block:</p>
 <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>
--- a/tests/data/code_block.md
+++ b/tests/data/code_block.md
@ -1,6 +1,11 @@
-Here's a code block:
-
    <?php
    
    $message = 'Hello World!'; 
    echo $message;
+
+---
+
+    > not a quote 
+    - not a list item
+    [not a reference]: http://foo.com
+    
--- a/tests/data/code_span.html
+++ b/tests/data/code_span.html
@ -1 +1 @@
-<p>This is a <code>code span</code>.</p>
+<p>a <code>code span</code></p>
--- a/tests/data/code_span.md
+++ b/tests/data/code_span.md
@ -1 +1 @@
-This is a `code span`.
+a `code span`
--- a/tests/data/compound_blockquote.html
+++ b/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>
--- a/tests/data/compound_blockquote.md
+++ b/tests/data/compound_blockquote.md
@ -0,0 +1,10 @@
+> header
+> ------
+>
+> paragraph
+>
+> - li
+>
+> ---
+>
+> paragraph
--- a/tests/data/compound_emphasis.html
+++ b/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>
--- a/tests/data/compound_emphasis.md
+++ b/tests/data/compound_emphasis.md
@ -0,0 +1,4 @@
+_`code`_ __`code`__
+
+*`code`**`code`**`code`*
+
--- a/tests/data/compound_list.html
+++ b/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>
--- a/tests/data/compound_list.md
+++ b/tests/data/compound_list.md
@ -0,0 +1,7 @@
+- paragraph
+
+  paragraph
+
+- paragraph
+
+  > quote
--- a/tests/data/em_strong.html
+++ b/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>
--- a/tests/data/em_strong.md
+++ b/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**
--- a/tests/data/emphasis.html
+++ b/tests/data/emphasis.html
@ -1,11 +1,8 @@
-<p>Here's <em>an emphasis</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>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>
-<p>A <em>multi-line
-emphasis</em></p>
-<p>A <strong>multi-line
-strong emphasis</strong></p>
+<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>
--- a/tests/data/emphasis.md
+++ b/tests/data/emphasis.md
@ -1,19 +1,13 @@
-Here's *an emphasis*.
+_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*

-A short one _a_ *b* .
+**strong** and *em* and **strong** and *em*

-Here's **a strong one**. 
+_line
+line
+line_

-Here's _one that uses underscores_. 
+this_is_not_an_emphasis

-Here's __a strong one that uses underscores__.
+an empty emphasis __ ** is not an emphasis

-This is not _ one _ neither is * this * neither is _ this_ neither is _this _.
-
-An empty emphasis ** is not __ an emphasis.
-
-A *multi-line
-emphasis*
-
-A **multi-line
-strong emphasis**
+*mixed **double and* single asterisk** spans
--- a/tests/data/emphasis_-_em_strong.html
+++ b/tests/data/emphasis_-_em_strong.html
@ -1,5 +0,0 @@
-<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>
--- a/tests/data/emphasis_-_em_strong.md
+++ b/tests/data/emphasis_-_em_strong.md
@ -1,9 +0,0 @@
-___em strong___
-
-___one_ at the start__
-
-__one at the _end___
-
-__one _in the_ middle__
-
-**one with *asterisks***
--- a/tests/data/escaping.html
+++ b/tests/data/escaping.html
@ -1,2 +1,4 @@
-<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>
+<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>
--- a/tests/data/escaping.md
+++ b/tests/data/escaping.md
@ -1,3 +1,7 @@
-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.
+escaped \*emphasis\*.

-    An escaped \*emphasis\* inside of a code block.
+`escaped \*emphasis\* in a code span`
+
+    escaped \*emphasis\* in a code block
+
+\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \!
--- a/tests/data/fenced_code_block.html
+++ b/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>
--- a/tests/data/fenced_code_block.md
+++ b/tests/data/fenced_code_block.md
@ -0,0 +1,14 @@
+```
+<?php
+
+$message = 'fenced code block';
+echo $message;
+```
+
+~~~
+tilde
+~~~
+
+```php
+echo 'language identifier';
+```
--- a/tests/data/horizontal_rule.html
+++ b/tests/data/horizontal_rule.html
@ -1,10 +1,5 @@
-<p>Dashes:</p>
 <hr />
 <hr />
 <hr />
-<p>Asterisks:</p>
 <hr />
-<p>Underscores:</p>
-<hr />
-<p>On the next line:</p>
 <hr />
--- a/tests/data/horizontal_rule.md
+++ b/tests/data/horizontal_rule.md
@ -1,18 +1,9 @@
-Dashes:
-
 ---

 - - -

   - - -

-Asterisks:
-
 ***

-Underscores:
-
-___
-
-On the next line:
 ___
--- a/tests/data/html.html
+++ b/tests/data/html.html
@ -1,15 +0,0 @@
-<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>
--- a/tests/data/html.md
+++ b/tests/data/html.md
@ -1,24 +0,0 @@
-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>
--- a/tests/data/image_reference.html
+++ b/tests/data/image_reference.html
@ -0,0 +1 @@
+<p><img alt="Markdown Logo" src="/md.png" /></p>
--- a/tests/data/image_reference.md
+++ b/tests/data/image_reference.md
@ -0,0 +1,3 @@
+![Markdown Logo][image]
+
+[image]: /md.png
--- a/tests/data/implicit_reference.html
+++ b/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>
--- a/tests/data/implicit_reference.md
+++ b/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"
--- a/tests/data/inline_link.html
+++ b/tests/data/inline_link.html
@ -1,2 +1,4 @@
-<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>
+<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>
--- a/tests/data/inline_link.md
+++ b/tests/data/inline_link.md
@ -1,3 +1,7 @@
-Here's a [link](http://example.com).
+[link](http://example.com) and [another link](/tests/)

-Here's one that is based on an image: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/).
+[`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)
--- a/tests/data/inline_title.html
+++ b/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>
--- a/tests/data/inline_title.md
+++ b/tests/data/inline_title.md
@ -0,0 +1 @@
+[single quotes](http://example.com 'Example') and [double quotes](http://example.com "Example")
--- a/tests/data/lazy_blockquote.html
+++ b/tests/data/lazy_blockquote.html
@ -0,0 +1,4 @@
+<blockquote>
+<p>quote
+the rest of it</p>
+</blockquote>
--- a/tests/data/lazy_blockquote.md
+++ b/tests/data/lazy_blockquote.md
@ -0,0 +1,2 @@
+> quote
+the rest of it
--- a/tests/data/lazy_list.html
+++ b/tests/data/lazy_list.html
@ -0,0 +1,4 @@
+<ul>
+<li>li
+the rest of it</li>
+</ul>
--- a/tests/data/lazy_list.md
+++ b/tests/data/lazy_list.md
@ -0,0 +1,2 @@
+- li
+the rest of it
--- a/tests/data/list.html
+++ b/tests/data/list.html
@ -1,5 +0,0 @@
-<p>Here's a list:</p>
-<ul>
-<li>li</li>
-<li>li</li>
-</ul>
--- a/tests/data/list.md
+++ b/tests/data/list.md
@ -1,4 +0,0 @@
-Here's a list:
-
- li
- li
--- a/tests/data/list_-_compound.html
+++ b/tests/data/list_-_compound.html
@ -1,13 +0,0 @@
-<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>
-</li>
-<li>
-<p>This is another list item.</p>
-<blockquote>
-<p>This is a quote block that belongs to it.</p>
-</blockquote>
-</li>
-</ul>
--- a/tests/data/list_-_compound.md
+++ b/tests/data/list_-_compound.md
@ -1,9 +0,0 @@
-Here's a compound list:
-
- This is the first paragraph of the list item.
-
-  This is the second one.
-
- This is another list item.
-
-  > This is a quote block that belongs to it.
--- a/tests/data/list_-_lazy.html
+++ b/tests/data/list_-_lazy.html
@ -1,4 +0,0 @@
-<ul>
-<li>li
-more text</li>
-</ul>
--- a/tests/data/list_-_lazy.md
+++ b/tests/data/list_-_lazy.md
@ -1,2 +0,0 @@
- li
-more text
--- a/tests/data/list_-_ordered.html
+++ b/tests/data/list_-_ordered.html
@ -1,14 +0,0 @@
-<p>Here's a regular ordered list:</p>
-<ol>
-<li>one</li>
-<li>two</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>
-<ol>
-<li>one</li>
-</ol>
--- a/tests/data/list_-_ordered.md
+++ b/tests/data/list_-_ordered.md
@ -1,13 +0,0 @@
-Here's a regular ordered list:
-
-1. one
-2. two
-
-Here's one with repeating numbers:
-
-1. one
-1. two
-
-Here's one with large numbers:
-
-123. one
--- a/tests/data/list_-_sparse.html
+++ b/tests/data/list_-_sparse.html
@ -1,16 +0,0 @@
-<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>
--- a/tests/data/list_-_sparse.md
+++ b/tests/data/list_-_sparse.md
@ -1,11 +0,0 @@
-Here's a sparse list:
-
- list item
-
- another list item
-
-Here's one with an indented list item:
-
- li
-
-    - li
--- a/tests/data/list_-_unordered.md
+++ b/tests/data/list_-_unordered.md
@ -1,10 +0,0 @@
-Here's an unordered list:
-
- li
- li
-
-Here's one with mixed markers:
-
- li
-+ li
-* li
--- a/tests/data/list_-_whitespace.html
+++ b/tests/data/list_-_whitespace.html
@ -1,5 +0,0 @@
-<p>Here's one with white space around items:</p>
-<ul>
-<li>li  </li>
-<li>li  </li>
-</ul>
--- a/tests/data/list_-_whitespace.md
+++ b/tests/data/list_-_whitespace.md
@ -1,4 +0,0 @@
-Here's one with white space around items:
-
-  - li  
-  - li  
--- a/tests/data/multiline_list_paragraph.html
+++ b/tests/data/multiline_list_paragraph.html
@ -0,0 +1,7 @@
+<ul>
+<li>
+<p>li</p>
+<p>line
+line</p>
+</li>
+</ul>
--- a/tests/data/multiline_list_paragraph.md
+++ b/tests/data/multiline_list_paragraph.md
@ -0,0 +1,4 @@
+- li
+
+  line
+  line
--- a/tests/data/nested_block-level_html.html
+++ b/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>
--- a/tests/data/nested_block-level_html.md
+++ b/tests/data/nested_block-level_html.md
@ -0,0 +1,11 @@
+<div>
+_parent_
+<div>
+_child_
+</div>
+<pre>
+_adopted child_
+</pre>
+</div>
+
+_outside_
--- a/tests/data/ordered_list.html
+++ b/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>
--- a/tests/data/ordered_list.md
+++ b/tests/data/ordered_list.md
@ -0,0 +1,11 @@
+1. one
+2. two
+
+repeating numbers:
+
+1. one
+1. two
+
+large numbers:
+
+123. one
--- a/tests/data/paragraph_list.html
+++ b/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>
--- a/tests/data/paragraph_list.md
+++ b/tests/data/paragraph_list.md
@ -0,0 +1,9 @@
+paragraph
+- li
+- li
+
+paragraph
+
+   * li
+   
+   * li
--- a/tests/data/reference_link.html
+++ b/tests/data/reference_link.html
@ -1,7 +0,0 @@
-<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 a <a href="http://example.com">multiline
-one</a> defined on 2 lines.</p>
--- a/tests/data/reference_link.md
+++ b/tests/data/reference_link.md
@ -1,19 +0,0 @@
-Here's a [reference link][1].
-
-[1]: http://example.com
-
-Here's [one][website] with a semantic name.
-
-[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 a [multiline
-one][website] defined on 2 lines.
--- a/tests/data/reference_link_-_image.html
+++ b/tests/data/reference_link_-_image.html
@ -1 +0,0 @@
-<p>Here's an image: <img alt="Markdown Logo" src="/md.png"></p>
--- a/tests/data/reference_link_-_image.md
+++ b/tests/data/reference_link_-_image.md
@ -1,3 +0,0 @@
-Here's an image: ![Markdown Logo][image]
-
-[image]: /md.png
--- a/tests/data/reference_link_-_implicit.html
+++ b/tests/data/reference_link_-_implicit.html
@ -1,2 +0,0 @@
-<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>
--- a/tests/data/reference_link_-_implicit.md
+++ b/tests/data/reference_link_-_implicit.md
@ -1,5 +0,0 @@
-Here's an [implicit] reference link.
-
-[implicit]: http://example.com
-
-Here's an [implicit][] one with an empty link definition.
--- a/tests/data/reference_link_-_whitespace.html
+++ b/tests/data/reference_link_-_whitespace.html
@ -1 +0,0 @@
-<p>Here's a <a href="http://example.com">reference link</a> with a definition on the next line.</p>
--- a/tests/data/reference_link_-_whitespace.md
+++ b/tests/data/reference_link_-_whitespace.md
@ -1,2 +0,0 @@
-Here's a [reference link][2] with a definition on the next line.
-[2]: http://example.com
--- a/tests/data/reference_title.html
+++ b/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>
--- a/tests/data/reference_title.md
+++ b/tests/data/reference_title.md
@ -0,0 +1 @@
+[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")
--- a/tests/data/self-closing_block-level_html.html
+++ b/tests/data/self-closing_block-level_html.html
@ -0,0 +1,4 @@
+<hr />
+<p>attributes:</p>
+<hr style="background: #9bd;" />
+<p>...</p>
--- a/tests/data/self-closing_block-level_html.md
+++ b/tests/data/self-closing_block-level_html.md
@ -0,0 +1,7 @@
+<hr />
+
+attributes:
+
+<hr style="background: #9bd;" />
+
+...
--- a/tests/data/simple_blockquote.html
+++ b/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>
--- a/tests/data/simple_blockquote.md
+++ b/tests/data/simple_blockquote.md
@ -0,0 +1,7 @@
+> quote
+
+indented:
+   > quote
+
+no space after `>`:
+>quote
--- a/tests/data/span-level_html.html
+++ b/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>
--- a/tests/data/span-level_html.md
+++ b/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
--- a/tests/data/span_level_html.html
+++ b/tests/data/span_level_html.html
@ -1 +0,0 @@
-<p>Here's an <b>important</b> <a href=''>link</a>.</p>
--- a/tests/data/span_level_html.md
+++ b/tests/data/span_level_html.md
@ -1 +0,0 @@
-Here's an <b>important</b> <a href=''>link</a>.
--- a/tests/data/sparse_list.html
+++ b/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>
--- a/tests/data/sparse_list.md
+++ b/tests/data/sparse_list.md
@ -0,0 +1,9 @@
+- li
+
+- li
+
+---
+
+- li
+
+    - indented li
--- a/tests/data/special_characters.html
+++ b/tests/data/special_characters.html
@ -1,7 +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>
+<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>
--- a/tests/data/special_characters.md
+++ b/tests/data/special_characters.md
@ -1,15 +1,15 @@
-AT&T has an ampersand in their name.
+AT&T has an ampersand in their name

-AT&amp;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 an autolink <http://example.com/autolink?a=1&b=2>
+<http://example.com/autolink?a=1&b=2>

-Here's an inline [link](/script?a=1&b=2).
+[inline link](/script?a=1&b=2)

-Here's a reference [link] [1] with an ampersand in the URL.
+[reference link][1]

 [1]: http://example.com/?a=1&b=2
--- a/tests/data/strikethrough.html
+++ b/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>
--- a/tests/data/strikethrough.md
+++ b/tests/data/strikethrough.md
@ -0,0 +1,5 @@
+~~strikethrough~~
+
+here's ~~one~~ followed by ~~another one~~
+
+~~ this ~~ is not one neither is ~this~
--- a/tests/data/strong_em.html
+++ b/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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Emanuil Rusev	1017f22cdd	fix paragraph list	2014-01-18 16:45:39 +02:00
Emanuil Rusev	88854955d6	take $inline_tags out of the method	2014-01-18 16:45:39 +02:00
Emanuil Rusev	654dd74074	lines that start with inline html should not get parsed as block-level markup, should resolve #54 and #57	2014-01-18 16:45:39 +02:00
Emanuil Rusev	fee5b71998	improve readme	2014-01-17 01:33:20 +02:00
Emanuil Rusev	149b687ee7	improve tests	2014-01-17 01:25:41 +02:00
Emanuil Rusev	98b17e3354	setext heading doesn't have to use regex	2014-01-17 01:23:25 +02:00
Emanuil Rusev	da966b83f1	atx heading doesn't have to use regex	2014-01-17 00:36:11 +02:00
Emanuil Rusev	b9ab495cb4	parse method doesn't have to use regex	2014-01-16 23:43:34 +02:00
Emanuil Rusev	408cb5c21f	code block doesn't have to use regex	2014-01-16 23:43:12 +02:00
Emanuil Rusev	5dd0e8cb7b	$deindented_line >= ... doesn't make sense	2014-01-16 23:39:56 +02:00
Emanuil Rusev	5521afde31	refactor $element	2014-01-13 23:45:31 +02:00
Emanuil Rusev	4317add3a2	add hhvm to PHP versions to test against	2013-12-28 14:57:25 +02:00
Emanuil Rusev	47d8a1382b	implement automatic line breaks as an option	2013-12-26 23:43:25 +02:00
Emanuil Rusev	fd42f2e864	improve tests	2013-12-26 21:55:33 +02:00
Emanuil Rusev	c0b7155572	implement link titles	2013-12-26 21:53:48 +02:00
Emanuil Rusev	be366b63ea	improve parsing of emphasis strong and em and strong and em	2013-12-24 23:40:12 +02:00
Emanuil Rusev	68484504ca	separate compiling of link / image there are 2 types of input that produce link / image	2013-12-24 16:05:13 +02:00
Emanuil Rusev	4fecd91f7d	span elements should get parsed on a first-come, first-served basis	2013-12-24 03:17:23 +02:00
Emanuil Rusev	9dae844a6e	post-increment operators should not be separated	2013-12-22 02:03:53 +02:00
Emanuil Rusev	df6fe915c6	Merge pull request #48 from kaamaru/master Fix HTML Bug	2013-12-18 10:36:06 -08:00
kaamaru	576b0ea761	Fix HTML Bug If you add markdown after HTML on the same line, all the remaining markdown will not be parsed. Demo: Add "<span></span> test" without quotes to the top of a markdown page on it's own line and then parse.	2013-12-18 12:32:49 +00:00
Emanuil Rusev	0f027dc04b	Merge pull request #47 from malorisdead/link-titles Add ability to specify link titles on inline and reference links.	2013-12-15 14:56:12 -08:00
Emanuil Rusev	179862bd6e	improve readme	2013-12-15 03:32:34 +02:00
malorisdead	019a4af2af	Added ability to specify link titles to inline and reference links. Fixed whitespace bug with reference link regex. Updated tests.	2013-12-14 02:13:53 -05:00
Emanuil Rusev	51a08fad85	improve parsing of emphasis	2013-12-07 17:21:36 +02:00
Emanuil Rusev	7fb08f334a	improve comments	2013-12-07 10:54:05 +02:00
Emanuil Rusev	85ad014f74	parse code span after recursive types to resolve #44	2013-12-06 01:43:55 +02:00
Emanuil Rusev	22336a1bcc	simplify special characters test	2013-12-06 00:45:26 +02:00
Emanuil Rusev	f713e380ee	add comment for automatic link	2013-12-06 00:29:51 +02:00
Emanuil Rusev	5b01915a63	interrupted list items should not add nonexistent empty lines	2013-12-06 00:15:17 +02:00
Emanuil Rusev	18d112a614	improve readme	2013-12-03 23:19:50 +02:00
Emanuil Rusev	1b9641ad03	improve readme	2013-12-03 22:49:50 +02:00
Emanuil Rusev	8baf537c12	resolve #40	2013-12-02 23:26:43 +02:00
Emanuil Rusev	05823567bc	simplify comments	2013-12-02 23:02:15 +02:00
Emanuil Rusev	b7029ab176	improve readme	2013-12-01 00:10:30 +02:00
Emanuil Rusev	102a947c7a	improve readme	2013-11-23 15:58:58 +02:00
Emanuil Rusev	7bb70186c1	simplify test for em strong	2013-11-23 13:35:15 +02:00
Emanuil Rusev	3225c66863	*strong em inside of em* should produce valid markup	2013-11-23 13:19:06 +02:00
Emanuil Rusev	d6dc5ba25b	update introduction text to match website	2013-11-23 09:26:44 +02:00
Emanuil Rusev	f5451a9eff	Merge pull request #37 from hkdobrev/htmlspecialshars-utf8	2013-11-22 13:23:21 -08:00
Haralan Dobrev	849a89b121	Use UTF-8 encoding for htmlspecialchars. See #36 . 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.	2013-11-22 23:06:20 +02:00
Emanuil Rusev	28064a63b3	simplify encoding of special characters	2013-11-22 21:57:21 +02:00
Emanuil Rusev	800aac5b56	Merge pull request #36 from josephok/patch-1	2013-11-22 11:21:38 -08:00
josephok	b15d40e8a3	Update Parsedown.php Changes the htmlentities() to htmlspecialchars(). The htmlentities() has some problems encoding non-english words(like Chinese)	2013-11-22 23:05:26 +08:00
Emanuil Rusev	ddc5b7e2dd	implement URL auto-linking	2013-11-22 00:20:45 +02:00
Emanuil Rusev	5a563008aa	implement GFM strikethrough	2013-11-21 13:39:00 +02:00
Emanuil Rusev	b6f795962f	resolve #21	2013-11-21 00:59:30 +02:00
Emanuil Rusev	cdb2646063	update readme to match website	2013-11-20 23:10:03 +02:00
Emanuil Rusev	e3b8026e39	build should no longer allow failures	2013-11-18 22:39:44 +02:00
Emanuil Rusev	d96f668c42	update test case to make it run on PHP 5.2	2013-11-18 22:29:15 +02:00
Emanuil Rusev	96bf75bd91	remove goto to provide support for PHP 5.2	2013-11-18 21:42:00 +02:00
Emanuil Rusev	67b51794d8	implement fenced code block to resolve #2	2013-11-17 16:52:31 +02:00
Emanuil Rusev	a9d6232705	array_shift » unset to simplify code base and improve performance	2013-11-17 13:21:49 +02:00
Emanuil Rusev	b91629ad94	organize evaluation blocks into switch statements to improve code readability	2013-11-17 12:48:01 +02:00
Emanuil Rusev	24d300ea5d	$pure_line » $deindented_line	2013-11-17 01:52:40 +02:00
Emanuil Rusev	d54712b989	simplify comments	2013-11-17 01:52:40 +02:00
Emanuil Rusev	6ef043ba7d	arrange compile cases	2013-11-17 01:52:40 +02:00
Emanuil Rusev	fe27b70bdb	block » markup	2013-11-17 01:52:40 +02:00
Emanuil Rusev	18d3dbf4f6	simplify comments	2013-11-17 01:52:40 +02:00
Emanuil Rusev	4758f58f73	remove double semicolons	2013-11-17 01:52:40 +02:00
Emanuil Rusev	5fa3eb1b2f	parse_inline_elements » parse_span_elements to match the specs	2013-11-17 01:52:40 +02:00
Emanuil Rusev	38300323a6	simplify readme	2013-11-16 18:45:13 +02:00
Emanuil Rusev	96609329b9	improve readme	2013-11-16 09:51:01 +02:00
Emanuil Rusev	e497acb6dc	escape sequences with double digit codes do not get decoded properly	2013-11-16 02:05:31 +02:00
Emanuil Rusev	30e436ec7d	simplify tests	2013-11-16 02:05:31 +02:00
Emanuil Rusev	3972f18881	improve readme	2013-11-14 00:50:00 +02:00
Emanuil Rusev	4fb12be60a	improve introduction	2013-11-13 01:52:59 +02:00
Emanuil Rusev	f8b07611d3	homepage » home	2013-11-13 01:47:38 +02:00
Emanuil Rusev	21d7f75f5b	improve readme	2013-11-13 01:38:29 +02:00
				`@ -0,0 +1 @@`
				`<p><img alt="Markdown Logo" src="/md.png" /></p>`
				`@ -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>`
				`@ -0,0 +1 @@`
				`[single quotes](http://example.com 'Example') and [double quotes](http://example.com "Example")`
				`@ -1 +0,0 @@`
				`<p>Here's an image: <img alt="Markdown Logo" src="/md.png"></p>`
				`@ -1 +0,0 @@`
				`<p>Here's a <a href="http://example.com">reference link</a> with a definition on the next line.</p>`
				`@ -0,0 +1 @@`
				`[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")`
				`@ -1 +0,0 @@`
				`<p>Here's an <b>important</b> <a href=''>link</a>.</p>`
				`@ -1 +0,0 @@`
				`Here's an <b>important</b> <a href=''>link</a>.`