escape sequences with double digit codes do not get decoded properly

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

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
 
@@ -17,4 +16,4 @@ $text = 'Hello **Parsedown**!';
 $result = Parsedown::instance()->parse($text);
 
 echo $result; # prints: <p>Hello <strong>Parsedown</strong>!</p>
-```
+```

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/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>

tests/data/atx_heading_-_closed.md

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

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,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>

tests/data/blockquote.md

@@ -1,8 +0,0 @@
-Here's a blockquote:
-
-> blockquote
-
-Here's one on multiple lines:
-
-> line 1
-> line 2

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>

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.

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>

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

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>

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

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>
+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,6 +1,11 @@
-Here's a code block:
-
     <?php
     
     $message = 'Hello World!'; 
-    echo $message;
+    echo $message;
+
+---
+
+    > 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

@@ -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/emphasis.html

@@ -1,11 +1,5 @@
-<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
+<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>A <strong>multi-line
-strong emphasis</strong></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,19 +1,8 @@
-Here's *an emphasis*.
+_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
 
-A short one _a_ *b* .
+_multiline
+emphasis_
 
-Here's **a strong one**. 
+_ this _ is not an emphasis, neither is _ this_, _this _, or _this*
 
-Here's _one that uses underscores_. 
-
-Here's __a strong one that uses underscores__.
-
-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**
+an empty emphasis __ ** is not an emphasis

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>

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
+
+\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \!

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 />

tests/data/horizontal_rule.md

@@ -1,18 +1,9 @@
-Dashes:
-
 ---
 
 - - -
 
    - - -
 
-Asterisks:
-
 ***
 
-Underscores:
-
-___
-
-On the next line:
 ___

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>

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>

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://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></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://example.com).
+[link](http://example.com)
 
-Here's one that is based on an image: [![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

@@ -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/list.html

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

tests/data/list.md

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

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>

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.

tests/data/list_-_lazy.html

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

tests/data/list_-_lazy.md

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

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>

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

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>

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

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

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>

tests/data/list_-_whitespace.md

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

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/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>

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.

tests/data/reference_link_-_image.html

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

tests/data/reference_link_-_image.md

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

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>

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.

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>

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

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

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

tests/data/span_level_html.md

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

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

@@ -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>

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&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

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,9 +1,8 @@
-<p>Here's an unordered list:</p>
 <ul>
 <li>li</li>
 <li>li</li>
 </ul>
-<p>Here's one with mixed markers:</p>
+<p>mixed markers:</p>
 <ul>
 <li>li</li>
 <li>li</li>

tests/data/unordered_list.md

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

tests/data/whitespace.html

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

tests/data/whitespace.md

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