resolve #154

resolve #125 using strpos()

.gitignore

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

.travis.yml

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

CONTRIBUTING.md

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

README.md

@@ -2,19 +2,16 @@
 
 Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
 
-***
-
-[ [demo](http://parsedown.org/demo) ] [ [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)
+* [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
+* [Tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/)
+* Extensible
 
 ### Installation
 
@@ -22,10 +19,8 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 
 ### Example
 
-```php
-$text = 'Hello *Parsedown*!';
+``` php
+$Parsedown = new Parsedown();
 
-$result = Parsedown::instance()->parse($text);
-
-echo $result; # prints: <p>Hello <em>Parsedown</em>!</p>
+echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
 ```

tests/Test.php

@@ -4,52 +4,64 @@ include 'Parsedown.php';
 
 class Test extends PHPUnit_Framework_TestCase
 {
-	const provider_dir = 'data/';
+    public function __construct($name = null, array $data = array(), $dataName = '')
+    {
+        $this->dataDir = dirname(__FILE__).'/data/';
 
-	/**
-	 * @dataProvider provider
-	 */
-	function test_($markdown, $expected_markup)
-	{
-		$actual_markup = Parsedown::instance()->parse($markdown);
+        parent::__construct($name, $data, $dataName);
+    }
 
-		$this->assertEquals($expected_markup, $actual_markup);
-	}
+    private $dataDir;
 
-	function provider()
-	{
-		$provider = array();
+    /**
+     * @dataProvider data
+     */
+    function test_($filename)
+    {
+        $markdown = file_get_contents($this->dataDir . $filename . '.md');
 
-		$path = dirname(__FILE__).'/';
+        $expectedMarkup = file_get_contents($this->dataDir . $filename . '.html');
 
-		$DirectoryIterator = new DirectoryIterator($path . '/' . self::provider_dir);
+        $expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup);
+        $expectedMarkup = str_replace("\r", "\n", $expectedMarkup);
 
-		foreach ($DirectoryIterator as $Item)
-		{
-			if ($Item->isFile())
-			{
-				$filename = $Item->getFilename();
+        $actualMarkup = Parsedown::instance()->text($markdown);
 
-				$extension = pathinfo($filename, PATHINFO_EXTENSION);
+        $this->assertEquals($expectedMarkup, $actualMarkup);
+    }
 
-				if ($extension !== 'md')
-					continue;
+    function data()
+    {
+        $data = array();
 
-				$basename = $Item->getBasename('.md');
+        $Folder = new DirectoryIterator($this->dataDir);
 
-				$markdown = file_get_contents($path . '/' . self::provider_dir . $basename . '.md');
+        foreach ($Folder as $File)
+        {
+            /** @var $File DirectoryIterator */
 
-				if (!$markdown)
-					continue;
+            if ( ! $File->isFile())
+            {
+                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);
+            $filename = $File->getFilename();
 
-				$provider [] = array($markdown, $expected_markup);
-			}
-		}
+            $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-		return $provider;
-	}
-}
+            if ($extension !== 'md')
+            {
+                continue;
+            }
+
+            $basename = $File->getBasename('.md');
+
+            if (file_exists($this->dataDir . $basename . '.html'))
+            {
+                $data []= array($basename);
+            }
+        }
+
+        return $data;
+    }
+}

tests/data/aesthetic_table.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th>header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td>cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

tests/data/aesthetic_table.md

@@ -0,0 +1,4 @@
+| header 1 | header 2 |
+| -------- | -------- |
+| cell 1.1 | cell 1.2 |
+| cell 2.1 | cell 2.2 |

tests/data/aligned_table.html

@@ -0,0 +1,21 @@
+<table>
+<thead>
+<tr>
+<th align="left">header 1</th>
+<th align="center">header 2</th>
+<th align="right">header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="left">cell 1.1</td>
+<td align="center">cell 1.2</td>
+<td align="right">cell 1.3</td>
+</tr>
+<tr>
+<td align="left">cell 2.1</td>
+<td align="center">cell 2.2</td>
+<td align="right">cell 2.3</td>
+</tr>
+</tbody>
+</table>

tests/data/aligned_table.md

@@ -0,0 +1,4 @@
+| header 1 | header 2 | header 2 |
+| :------- | :------: | -------: |
+| cell 1.1 | cell 1.2 | cell 1.3 |
+| cell 2.1 | cell 2.2 | cell 2.3 |

tests/data/code_block.html

@@ -1,8 +1,8 @@
 <pre><code>&lt;?php
 
-$message = 'Hello World!'; 
+$message = 'Hello World!';
 echo $message;</code></pre>
 <hr />
-<pre><code>&gt; not a quote 
+<pre><code>&gt; not a quote
 - not a list item
 [not a reference]: http://foo.com</code></pre>

tests/data/code_block.md

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

tests/data/code_span.html

@@ -1,3 +1,6 @@
 <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>
+<p><code>and look at this one!</code></p>
+<p>single backtick in a code span: <code>`</code></p>
+<p>backtick-delimited string in a code span: <code>`foo`</code></p>
+<p><code>sth `` sth</code></p>

tests/data/code_span.md

@@ -2,4 +2,10 @@ a `code span`
 
 `this is also a codespan` trailing text
 
-`and look at this one!`
+`and look at this one!`
+
+single backtick in a code span: `` ` ``
+
+backtick-delimited string in a code span: `` `foo` ``
+
+`sth `` sth`

tests/data/deeply_nested_list.html

@@ -3,16 +3,10 @@
 <ul>
 <li>li
 <ul>
-<li>li
-<ul>
 <li>li</li>
-</ul>
-</li>
 <li>li</li>
-</ul>
-</li>
+</ul></li>
 <li>li</li>
-</ul>
-</li>
+</ul></li>
 <li>li</li>
 </ul>

tests/data/deeply_nested_list.md

@@ -1,7 +1,6 @@
 - li
   - li
     - li
-      - li
     - li
   - li
 - li

tests/data/html_simple.html

@@ -0,0 +1,28 @@
+<p>Headings:</p>
+<h2 id="overview">Overview</h2>
+<p>blah</p>
+<H2 id="block">Block Elements</H2>
+<p>blah</p>
+<h3 id="span">
+      Span Elements
+</h3>
+<p>blah</p>
+<p>Hr's:</p>
+<hr>
+<p>blah</p>
+<hr/>
+<p>blah</p>
+<hr />
+<p>blah</p>
+<hr>   
+<p>blah</p>
+<hr/>  
+<p>blah</p>
+<hr /> 
+<p>blah</p>
+<hr class="foo" id="bar" />
+<p>blah</p>
+<hr class="foo" id="bar"/>
+<p>blah</p>
+<hr class="foo" id="bar" >
+<p>blah</p>

tests/data/html_simple.md

@@ -0,0 +1,39 @@
+Headings:
+
+<h2 id="overview">Overview</h2>
+blah
+<H2 id="block">Block Elements</H2>
+blah
+<h3 id="span">
+      Span Elements
+</h3>
+blah
+
+Hr's:
+
+<hr>
+blah
+
+<hr/>
+blah
+
+<hr />
+blah
+
+<hr>   
+blah
+
+<hr/>  
+blah
+
+<hr /> 
+blah
+
+<hr class="foo" id="bar" />
+blah
+
+<hr class="foo" id="bar"/>
+blah
+
+<hr class="foo" id="bar" >
+blah

tests/data/inline_link_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/inline_link_title.md

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

tests/data/reference_title.html

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

tests/data/reference_title.md

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

tests/data/simple_table.html

@@ -0,0 +1,37 @@
+<table>
+<thead>
+<tr>
+<th>header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td>cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>
+<hr />
+<table>
+<thead>
+<tr>
+<th align="left">header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="left">cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td align="left">cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

tests/data/simple_table.md

@@ -0,0 +1,11 @@
+header 1 | header 2
+-------- | --------
+cell 1.1 | cell 1.2
+cell 2.1 | cell 2.2
+
+---
+
+header 1 | header 2
+:------- | --------
+cell 1.1 | cell 1.2
+cell 2.1 | cell 2.2

tests/data/tab-indented_code_block.html

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

tests/data/tab-indented_code_block.md

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

tests/data/table_inline_markdown.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th><em>header</em> 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><em>cell</em> 1.1</td>
+<td><del>cell</del> 1.2</td>
+</tr>
+<tr>
+<td><code>cell</code> 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

tests/data/table_inline_markdown.md

@@ -0,0 +1,4 @@
+| _header_ 1   | header 2     |
+| ------------ | ------------ |
+| _cell_ 1.1   | ~~cell~~ 1.2 |
+| `cell` 2.1   | cell 2.2     |

tests/data/text_reference.html

@@ -3,5 +3,6 @@
 <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">one</a> with a mixed case label and an upper case definition</p>
+<p><a href="http://example.com">one</a> with the a label on the next line</p>
 <p><a href="http://example.com"><code>link</code></a></p>

tests/data/text_reference.md

@@ -11,8 +11,11 @@
 [multiline
 one][website] defined on 2 lines
 
-[one][label] with an upper case label
+[one][Label] with a mixed case label and an upper case definition
 
 [LABEL]: http://example.com
 
+[one]
+[1] with the a label on the next line
+
 [`link`][website]

tests/data/untidy_table.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th>header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td>cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

tests/data/untidy_table.md

@@ -0,0 +1,4 @@
+| header 1 | header 2          |
+| ------------- | ----------- |
+| cell 1.1   | cell 1.2 |
+|    cell 2.1 | cell 2.2     |

tests/data/url_autolinking.html

@@ -1,2 +1,3 @@
 <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>
+<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>
+<p>trailing slash <a href="http://example.com/">http://example.com/</a> and <a href="http://example.com/path/">http://example.com/path/</a></p>

tests/data/url_autolinking.md

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