implement automatic line breaks as an option

**strong** and *em* and **strong** and *em*

.travis.yml

@@ -5,7 +5,3 @@ php:
   - 5.4
   - 5.3
   - 5.2
-
-matrix:
-  allow_failures:
-    - php: 5.2

README.md

@@ -1,8 +1,20 @@
-## Parsedown PHP
+## Parsedown
 
-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.
+Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
 
-[Home](http://parsedown.org) · [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)
+* [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4 and 5.5
+* friendly to international input
 
 ### Installation
 

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

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

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

@@ -1,9 +1,15 @@
 ___em strong___
 
-___one_ at the start__
+___em strong_ strong__
 
-__one at the _end___
+__strong _em strong___
 
-__one _in the_ middle__
+__strong _em strong_ strong__
 
-**one with *asterisks***
+***em strong***
+
+***em strong* strong**
+
+**strong *em strong***
+
+**strong *em strong* strong**

tests/data/emphasis.html

@@ -1,5 +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><em>multiline
-emphasis</em></p>
-<p>_ this _ is not an emphasis, neither is _ this_, _this _, or _this*</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

@@ -1,8 +1,13 @@
 _underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
 
-_multiline
-emphasis_
+**strong** and *em* and **strong** and *em*
 
-_ this _ is not an emphasis, neither is _ this_, _this _, or _this*
+_line
+line
+line_
+
+this_is_not_an_emphasis
 
 an empty emphasis __ ** is not an emphasis
+
+*mixed **double and* single asterisk** spans

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

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

tests/data/implicit_reference.html

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

@@ -3,3 +3,7 @@ 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

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

@@ -1,3 +1,7 @@
-[link](http://example.com)
+[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/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/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/special_characters.html

@@ -2,6 +2,6 @@
 <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="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/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/text_reference.html

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

@@ -14,3 +14,5 @@ one][website] defined on 2 lines
 [one][label] with an upper case label
 
 [LABEL]: http://example.com
+
+[`link`][website]

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)