1
0
mirror of https://github.com/erusev/parsedown.git synced 2023-08-10 21:13:06 +03:00

Compare commits

...

8 Commits
0.1.2 ... 0.1.5

7 changed files with 100 additions and 55 deletions

View File

@ -3,5 +3,4 @@ language: php
php:
- 5.5
- 5.4
- 5.3
- 5.2
- 5.3

View File

@ -50,7 +50,8 @@ class Parsedown
$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
# Removes \r characters.
$text = str_replace("\r", '', $text);
$text = str_replace("\r\n", "\n", $text);
$text = str_replace("\r", "\n", $text);
# Replaces tabs with spaces.
$text = str_replace("\t", ' ', $text);
@ -80,7 +81,7 @@ class Parsedown
{
foreach ($matches as $matches)
{
$this->reference_map[$matches[1]] = $matches[2];
$this->reference_map[strtolower($matches[1])] = $matches[2];
$text = str_replace($matches[0], '', $text);
}
@ -108,8 +109,10 @@ class Parsedown
private function parse_blocks($text)
{
$text = trim($text, "\n");
# Divides text into blocks.
$blocks = preg_split('/\n\s*\n/', $text, -1, PREG_SPLIT_NO_EMPTY);
$blocks = preg_split('/\n\s*\n/', $text);
# Makes sure compound blocks get rendered.
$blocks []= NULL;
@ -157,7 +160,6 @@ class Parsedown
{
$markup .= '<'.$list_type.'>'."\n";
# Of the same type and indentation.
$list_items = preg_split('/^([ ]{'.$list_indentation.'})'.$list_marker_pattern.'[ ]/m', $list, -1, PREG_SPLIT_NO_EMPTY);
foreach ($list_items as $list_item)
@ -175,7 +177,7 @@ class Parsedown
}
else
{
$list_item = $this->parse_lines($list_item);
$list_item = $this->parse_lines($list_item, TRUE);
}
$markup .= "\n".$list_item;
@ -277,7 +279,7 @@ class Parsedown
{
if (strpos($block, "\n"))
{
$markup .= $this->parse_lines($block);
$markup .= $this->parse_lines($block, TRUE);
}
else
{
@ -292,7 +294,7 @@ class Parsedown
return $markup;
}
private function parse_lines($text)
private function parse_lines($text, $paragraph_based = FALSE)
{
$text = trim($text, "\n");
@ -458,7 +460,7 @@ class Parsedown
{
substr($line, -2) === ' '
and $line = substr($line, 0, -2)
and $line .= '<br/>';
and $line .= '<br />';
if (isset($paragraph))
{
@ -473,9 +475,11 @@ class Parsedown
{
if (isset($paragraph))
{
$element_text = $this->parse_inline_elements($paragraph);
$paragraph_text = $this->parse_inline_elements($paragraph);
$markup .= '<p>'.$element_text.'</p>'."\n";
$markup .= $markup === '' && $paragraph_based === FALSE
? $paragraph_text
: '<p>'.$paragraph_text.'</p>'."\n";
unset($paragraph);
}
@ -524,14 +528,20 @@ class Parsedown
# Reference(d) Link / Image
if ($this->reference_map and strpos($text, '[') !== FALSE and preg_match_all('/(!?)\[(.+?)\][ ]?\[(.+?)\]/', $text, $matches, PREG_SET_ORDER))
if ($this->reference_map and strpos($text, '[') !== FALSE and preg_match_all('/(!?)\[(.+?)\](?:\n?[ ]?\[(.*?)\])?/ms', $text, $matches, PREG_SET_ORDER))
{
foreach ($matches as $matches)
{
if (array_key_exists($matches[3], $this->reference_map))
$link_difinition = isset($matches[3]) && $matches[3]
? $matches[3]
: $matches[2]; # implicit
$link_difinition = strtolower($link_difinition);
if (isset($this->reference_map[$link_difinition]))
{
$url = $this->reference_map[$matches[3]];
$url = $this->reference_map[$link_difinition];
if ($matches[1]) # image
{
$element = '<img alt="'.$matches[2].'" src="'.$url.'">';

View File

@ -34,6 +34,8 @@ class Test extends PHPUnit_Framework_TestCase
continue;
$expected_markup = file_get_contents(__DIR__ . '/' . self::provider_dir . $basename . '.html');
$expected_markup = str_replace("\r\n", "\n", $expected_markup);
$expected_markup = str_replace("\r", "\n", $expected_markup);
$provider [] = array($markdown, $expected_markup);
}

View File

@ -14,4 +14,11 @@
- another list item</code></pre>
<p>Here's one with no space after markers:</p>
<p>-list item
-another list item</p>
-another list item</p>
<p>Here's one where items contain line breaks:</p>
<ul>
<li>list
item</li>
<li>another
list item</li>
</ul>

View File

@ -17,4 +17,11 @@ Here's one with too much space before items:
Here's one with no space after markers:
-list item
-another list item
-another list item
Here's one where items contain line breaks:
- list
item
- another
list item

View File

@ -1,8 +1,14 @@
<p>Here's a <a href="http://parsedown.org">reference link</a>.</p>
<p>Here's <a href="http://parsedown.org">one</a> with an alternative syntax.</p>
<p>Here's <a href="http://parsedown.org">one</a> on the next line.</p>
<p>Here's <a href="http://parsedown.org">one</a> on 2 lines.</p>
<p>Here's <a href="http://parsedown.org/tests/">one</a> with a different URL.</p>
<p>Here's <a href="http://parsedown.org">one</a> with a semantic name.</p>
<p>Here's [one][404] with no definition.</p>
<p>Here's an image: <img alt="Markdown Logo" src="https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png"></p>
<p>Here's a <a href="http://parsedown.org">reference link</a>.</p>
<p>Here's <a href="http://parsedown.org">one</a> with an alternative syntax.</p>
<p>Here's <a href="http://parsedown.org">one</a> on the next line.</p>
<p>Here's <a href="http://parsedown.org">one</a> on 2 lines.</p>
<p>Here's <a href="http://parsedown.org/tests/">one</a> with a different URL.</p>
<p>Here's <a href="http://parsedown.org">one</a> with a semantic name.</p>
<p>Here's <a href="http://parsedown.org">one</a> with definition name on the next line.</p>
<p>Here's [one][404] with no definition.</p>
<p>Here's an image: <img alt="Markdown Logo" src="https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png"></p>
<p>Here's an <a href="http://google.com">implicit one</a>.</p>
<p>Here's an <a href="http://google.com">implicit one</a>.</p>
<p>Here's an <a href="http://google.com">implicit one</a> with an empty link definition.</p>
<p>Here's a <a href="http://parsedown.org">multiline
one</a> defined on 2 lines.</p>

View File

@ -1,29 +1,43 @@
Here's a [reference link][1].
[1]: http://parsedown.org
Here's [one] [2] with an alternative syntax.
[2] :http://parsedown.org
Here's [one][3] on the next line.
[3]: http://parsedown.org
Here's [one][4] on 2 lines.
[4]:
http://parsedown.org
Here's [one][5] with a different URL.
[5]: http://parsedown.org/tests/
Here's [one][the website] with a semantic name.
[the website]: http://parsedown.org
Here's [one][404] with no definition.
Here's an image: ![Markdown Logo][image]
[image]: https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png
Here's a [reference link][1].
[1]: http://parsedown.org
Here's [one] [2] with an alternative syntax.
[2] :http://parsedown.org
Here's [one][3] on the next line.
[3]: http://parsedown.org
Here's [one][4] on 2 lines.
[4]:
http://parsedown.org
Here's [one][5] with a different URL.
[5]: http://parsedown.org/tests/
Here's [one][website] with a semantic name.
[website]: http://parsedown.org
Here's [one]
[website] with definition name on the next line.
Here's [one][404] with no definition.
Here's an image: ![Markdown Logo][image]
[image]: https://raw.github.com/dcurtis/markdown-mark/master/png/32x20-solid.png
Here's an [implicit one].
Here's an [implicit one].
[implicit one]: http://google.com
Here's an [implicit one][] with an empty link definition.
Here's a [multiline
one][website] defined on 2 lines.