Intellivoid
/
MarkdownParser
mirror of https://git.netkas.me/intellivoid/MarkdownParser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use the list marker width to determine whether a list item is continued 

This basically represents [list item parsing](http://spec.commonmark.org/0.26/#list-items), rule 1 of the CommonMark specs.
This commit is contained in:
Daniel Rudolf 2016-10-13 19:51:32 +02:00
parent 1d61f90bf9
commit 7b1529fff0
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Parsedown.php
View File

@ -520,7 +520,8 @@ class Parsedown
'pattern' => $pattern,
'data' => array(
'type' => $name,
'marker' => ($name === 'ul' ? stristr($matches[1], ' ', true) : substr(stristr($matches[1], ' ', true), -1)),
'marker' => $matches[1],
'markerType' => ($name === 'ul' ? strstr($matches[1], ' ', true) : substr(strstr($matches[1], ' ', true), -1)),
),
'element' => array(
'name' => $name,
@ -530,7 +531,7 @@ class Parsedown
if($name === 'ol')
{
$listStart = ltrim(strstr($matches[1], $Block['data']['marker'], true), '0') ?: '0';
$listStart = ltrim(strstr($matches[1], $Block['data']['markerType'], true), '0') ?: '0';
if($listStart !== '1')
{
@ -562,12 +563,12 @@ class Parsedown
(
(
$Block['data']['type'] === 'ol'
and preg_match('/^[0-9]+'.preg_quote($Block['data']['marker']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
and preg_match('/^[0-9]+'.preg_quote($Block['data']['markerType']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
)
or
(
$Block['data']['type'] === 'ul'
and preg_match('/^'.preg_quote($Block['data']['marker']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
and preg_match('/^'.preg_quote($Block['data']['markerType']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
)
)
)
@ -605,25 +606,31 @@ class Parsedown
return $Block;
}
if ( ! isset($Block['interrupted']))
$requiredIndent = ($Block['indent'] + strlen($Block['data']['marker']));
if ($Line['indent'] >= $requiredIndent)
{
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
if (isset($Block['interrupted']))
{
$Block['li']['text'] []= '';
unset($Block['interrupted']);
}
$text = substr($Line['body'], $requiredIndent);
$Block['li']['text'] []= $text;
return $Block;
}
if ($Line['indent'] > 0)
if ( ! isset($Block['interrupted']))
{
$Block['li']['text'] []= '';
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
// TODO: force multi-line paragraph, this must not parse any new block
$text = preg_replace('/^[ ]{0,'.$requiredIndent.'}/', '', $Line['body']);
$Block['li']['text'] []= $text;
unset($Block['interrupted']);
return $Block;
}
}