resolve #135

Run composer install in Travis CI before tests

.travis.yml

@@ -7,3 +7,4 @@ php:
   - 5.3
   - 5.2
   - hhvm
+  

Parsedown.php

@@ -49,7 +49,7 @@ class Parsedown
         $markup = trim($markup, "\n");
 
         # clean up
-        $this->references = array();
+        $this->definitions = array();
 
         return $markup;
     }
@@ -97,7 +97,6 @@ class Parsedown
         '~' => array('FencedCode'),
     );
 
-    # Draft
     protected $definitionMarkers = array(
         '[' => array('Reference'),
     );
@@ -112,30 +111,21 @@ class Parsedown
 
         foreach ($lines as $line)
         {
+            if (chop($line) === '')
+            {
+                if (isset($CurrentBlock))
+                {
+                    $CurrentBlock['interrupted'] = true;
+                }
+
+                continue;
+            }
+
             $indent = 0;
 
-            while (true)
+            while (isset($line[$indent]) and $line[$indent] === ' ')
             {
-                if (isset($line[$indent]))
+                $indent ++;
-                {
-                    if ($line[$indent] === ' ')
-                    {
-                        $indent ++;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-                else # blank line
-                {
-                    if (isset($CurrentBlock))
-                    {
-                        $CurrentBlock['interrupted'] = true;
-                    }
-
-                    continue 2;
-                }
             }
 
             $text = $indent > 0 ? substr($line, $indent) : $line;
@@ -158,12 +148,33 @@ class Parsedown
                 }
                 else
                 {
-                    unset($CurrentBlock['incomplete']);
-
                     if (method_exists($this, 'complete'.$CurrentBlock['type']))
                     {
                         $CurrentBlock = $this->{'complete'.$CurrentBlock['type']}($CurrentBlock);
                     }
+
+                    unset($CurrentBlock['incomplete']);
+                }
+            }
+
+            # ~
+
+            $marker = $text[0];
+
+            # Definitions
+
+            if (isset($this->definitionMarkers[$marker]))
+            {
+                foreach ($this->definitionMarkers[$marker] as $definitionType)
+                {
+                    $Definition = $this->{'identify'.$definitionType}($Line, $CurrentBlock);
+
+                    if (isset($Definition))
+                    {
+                        $this->definitions[$definitionType][$Definition['id']] = $Definition['data'];
+
+                        continue 2;
+                    }
                 }
             }
 
@@ -171,8 +182,6 @@ class Parsedown
 
             $blockTypes = $this->unmarkedBlockTypes;
 
-            $marker = $text[0];
-
             if (isset($this->blockMarkers[$marker]))
             {
                 foreach ($this->blockMarkers[$marker] as $blockType)
@@ -196,7 +205,7 @@ class Parsedown
 
                     if ( ! isset($Block['identified'])) # »
                     {
-                        $elements []= $CurrentBlock['element'];
+                        $Elements []= $CurrentBlock['element'];
 
                         $Block['identified'] = true;
                     }
@@ -222,7 +231,7 @@ class Parsedown
             }
             else
             {
-                $elements []= $CurrentBlock['element'];
+                $Elements []= $CurrentBlock['element'];
 
                 $CurrentBlock = array(
                     'type' => 'Paragraph',
@@ -236,13 +245,22 @@ class Parsedown
             }
         }
 
-        $elements []= $CurrentBlock['element'];
+        # ~
 
-        unset($elements[0]);
+        if (isset($CurrentBlock['incomplete']) and method_exists($this, 'complete'.$CurrentBlock['type']))
+        {
+            $CurrentBlock = $this->{'complete'.$CurrentBlock['type']}($CurrentBlock);
+        }
 
         # ~
 
-        $markup = $this->elements($elements);
+        $Elements []= $CurrentBlock['element'];
+
+        unset($Elements[0]);
+
+        # ~
+
+        $markup = $this->elements($Elements);
 
         # ~
 
@@ -301,22 +319,19 @@ class Parsedown
     {
         if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
         {
-            $label = strtolower($matches[1]);
+            $Definition = array(
-
+                'id' => strtolower($matches[1]),
-            $this->references[$label] = array(
+                'data' => array(
-                'url' => $matches[2],
+                    'url' => $matches[2],
+                ),
             );
 
             if (isset($matches[3]))
             {
-                $this->references[$label]['title'] = $matches[3];
+                $Definition['data']['title'] = $matches[3];
             }
 
-            $Block = array(
+            return $Definition;
-                'element' => null,
-            );
-
-            return $Block;
         }
     }
 
@@ -403,7 +418,7 @@ class Parsedown
 
     protected function identifyFencedCode($Line)
     {
-        if (preg_match('/^(['.$Line['text'][0].']{3,})[ ]*(\w+)?[ ]*$/', $Line['text'], $matches))
+        if (preg_match('/^(['.$Line['text'][0].']{3,})[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
         {
             $Element = array(
                 'name' => 'code',
@@ -455,9 +470,18 @@ class Parsedown
             return $Block;
         }
 
-        $string = htmlspecialchars($Line['body'], ENT_NOQUOTES, 'UTF-8');
+        $Block['element']['text']['text'] .= "\n".$Line['body'];;
 
-        $Block['element']['text']['text'] .= "\n".$string;;
+        return $Block;
+    }
+
+    protected function completeFencedCode($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
 
         return $Block;
     }
@@ -522,7 +546,7 @@ class Parsedown
 
         if ( ! isset($Block['interrupted']))
         {
-            $text = preg_replace('/^[ ]{0,2}/', '', $Line['body']);
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
             $Block['li']['text'] []= $text;
 
@@ -533,7 +557,7 @@ class Parsedown
         {
             $Block['li']['text'] []= '';
 
-            $text = preg_replace('/^[ ]{0,2}/', '', $Line['body']);
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
             $Block['li']['text'] []= $text;
 
@@ -569,6 +593,8 @@ class Parsedown
             if (isset($Block['interrupted']))
             {
                 $Block['element']['text'] []= '';
+
+                unset($Block['interrupted']);
             }
 
             $Block['element']['text'] []= $matches[1];
@@ -747,7 +773,6 @@ class Parsedown
         if ($Line['indent'] >= 4)
         {
             $text = substr($Line['body'], 4);
-            $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
 
             $Block = array(
                 'element' => array(
@@ -778,7 +803,6 @@ class Parsedown
             $Block['element']['text']['text'] .= "\n";
 
             $text = substr($Line['body'], 4);
-            $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
 
             $Block['element']['text']['text'] .= $text;
 
@@ -786,6 +810,17 @@ class Parsedown
         }
     }
 
+    protected function completeCodeBlock($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
+
+        return $Block;
+    }
+
     #
     # ~
     #
@@ -892,36 +927,38 @@ class Parsedown
 
                 $Span = $this->$handler($markedExcerpt, $text);
 
-                if (isset($Span))
+                if ( ! isset($Span))
                 {
-                    # The identified span can be ahead of the marker.
+                    continue;
-
-                    if (isset($Span['position']) and $Span['position'] > $markerPosition)
-                    {
-                        continue;
-                    }
-
-                    # Spans that start at the position of their marker don't have to set a position.
-
-                    if ( ! isset($Span['position']))
-                    {
-                        $Span['position'] = $markerPosition;
-                    }
-
-                    $unmarkedText = substr($text, 0, $Span['position']);
-
-                    $markup .= $this->readPlainText($unmarkedText);
-
-                    $markup .= isset($Span['element']) ? $this->element($Span['element']) : $Span['markup'];
-
-                    $text = substr($text, $Span['position'] + $Span['extent']);
-
-                    $remainder = $text;
-
-                    $markerPosition = 0;
-
-                    continue 2;
                 }
+
+                # The identified span can be ahead of the marker.
+
+                if (isset($Span['position']) and $Span['position'] > $markerPosition)
+                {
+                    continue;
+                }
+
+                # Spans that start at the position of their marker don't have to set a position.
+
+                if ( ! isset($Span['position']))
+                {
+                    $Span['position'] = $markerPosition;
+                }
+
+                $plainText = substr($text, 0, $Span['position']);
+
+                $markup .= $this->readPlainText($plainText);
+
+                $markup .= isset($Span['element']) ? $this->element($Span['element']) : $Span['markup'];
+
+                $text = substr($text, $Span['position'] + $Span['extent']);
+
+                $remainder = $text;
+
+                $markerPosition = 0;
+
+                continue 2;
             }
 
             $remainder = substr($markedExcerpt, 1);
@@ -1034,7 +1071,7 @@ class Parsedown
 
     protected function identifyEmailTag($excerpt)
     {
-        if (strpos($excerpt, '>') !== false and preg_match('/<(\S+?@\S+?)>/', $excerpt, $matches))
+        if (strpos($excerpt, '>') !== false and preg_match('/^<(\S+?@\S+?)>/', $excerpt, $matches))
         {
             return array(
                 'extent' => strlen($matches[0]),
@@ -1095,9 +1132,9 @@ class Parsedown
             {
                 $Link['label'] = strtolower($matches[1]);
 
-                if (isset($this->references[$Link['label']]))
+                if (isset($this->definitions['Reference'][$Link['label']]))
                 {
-                    $Link += $this->references[$Link['label']];
+                    $Link += $this->definitions['Reference'][$Link['label']];
 
                     $extent += strlen($matches[0]);
                 }
@@ -1106,9 +1143,9 @@ class Parsedown
                     return;
                 }
             }
-            elseif ($this->references and isset($this->references[$Link['label']]))
+            elseif (isset($this->definitions['Reference'][$Link['label']]))
             {
-                $Link += $this->references[$Link['label']];
+                $Link += $this->definitions['Reference'][$Link['label']];
 
                 if (preg_match('/^[ ]*\[\]/', $substring, $matches))
                 {
@@ -1276,7 +1313,7 @@ class Parsedown
     # Fields
     #
 
-    protected $references = array(); # » Definitions['reference']
+    protected $definitions;
 
     #
     # Read-only
@@ -1298,12 +1335,12 @@ class Parsedown
     protected $textLevelElements = array(
         'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
         'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'sub', 'code',          'strike', 'marquee',
+        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'sup', 'font',          'strong',
+        'q', 'rt', 'ins', 'font',          'strong',
-        's', 'tt', 'var', 'mark',
+        's', 'tt', 'sub', 'mark',
-        'u', 'xm', 'wbr', 'nobr',
+        'u', 'xm', 'sup', 'nobr',
-                          'ruby',
+                   'var', 'ruby',
-                          'span',
+                   'wbr', 'span',
                           'time',
     );
 }

phpunit.xml.dist

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
+<phpunit bootstrap="test/bootstrap.php" colors="true">
 	<testsuites>
 		<testsuite>
-			<file>tests/Test.php</file>
+			<file>test/Test.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>

test/Test.php

@@ -1,7 +1,5 @@
 <?php
 
-include 'Parsedown.php';
-
 class Test extends PHPUnit_Framework_TestCase
 {
     public function __construct($name = null, array $data = array(), $dataName = '')

test/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+include 'Parsedown.php';

test/data/atx_heading.html

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

test/data/atx_heading.md

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

test/data/code_block.html

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

test/data/code_block.md

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

test/data/deeply_nested_list.md

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

test/data/emphasis.html

@@ -1,8 +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>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><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p>
-<p><em>line
+<p><em>line
-line
+line
-line</em></p>
+line</em></p>
-<p>this_is_not_an_emphasis</p>
+<p>this_is_not_an_emphasis</p>
-<p>an empty emphasis __ ** is not an emphasis</p>
+<p>an empty emphasis __ ** is not an emphasis</p>
 <p>*mixed *<em>double and</em> single asterisk** spans</p>

test/data/emphasis.md

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

test/data/horizontal_rule.html

@@ -1,5 +1,5 @@
-<hr />
+<hr />
-<hr />
+<hr />
-<hr />
+<hr />
-<hr />
+<hr />
 <hr />

test/data/horizontal_rule.md

@@ -1,9 +1,9 @@
----
+---
-
+
-- - -
+- - -
-
+
-   - - -
+   - - -
-
+
-***
+***
-
+
 ___

test/data/lazy_blockquote.html

@@ -1,4 +1,6 @@
 <blockquote>
 <p>quote
 the rest of it</p>
+<p>another paragraph
+the rest of it</p>
 </blockquote>

test/data/lazy_blockquote.md

@@ -0,0 +1,5 @@
+> quote
+the rest of it
+
+> another paragraph
+the rest of it

test/data/line_break.html

@@ -1,2 +1,2 @@
-<p>line<br />
+<p>line<br />
 line</p>

test/data/line_break.md

@@ -1,2 +1,2 @@
-line  
+line  
 line

test/data/separated_nested_list.html

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

test/data/separated_nested_list.md

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

test/data/setext_header.html

@@ -1,5 +1,5 @@
-<h1>h1</h1>
+<h1>h1</h1>
-<h2>h2</h2>
+<h2>h2</h2>
-<h2>single character</h2>
+<h2>single character</h2>
-<p>not a header</p>
+<p>not a header</p>
 <hr />

test/data/setext_header.md

@@ -1,12 +1,12 @@
-h1
+h1
-==
+==
-
+
-h2
+h2
---
+--
-
+
-single character
+single character
--
+-
-
+
-not a header
+not a header
-
+
 ------------

test/data/special_characters.html

@@ -1,6 +1,6 @@
-<p>AT&amp;T has an ampersand in their name</p>
+<p>AT&amp;T has an ampersand in their name</p>
-<p>this &amp; that</p>
+<p>this &amp; that</p>
-<p>4 &lt; 5 and 6 > 5</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="/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>

test/data/special_characters.md

@@ -1,13 +1,13 @@
-AT&T has an ampersand in their name
+AT&T has an ampersand in their name
-
+
-this & that
+this & that
-
+
-4 < 5 and 6 > 5
+4 < 5 and 6 > 5
-
+
-<http://example.com/autolink?a=1&b=2>
+<http://example.com/autolink?a=1&b=2>
-
+
-[inline link](/script?a=1&b=2)
+[inline link](/script?a=1&b=2)
-
+
-[reference link][1]
+[reference link][1]
-
+
 [1]: http://example.com/?a=1&b=2