Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 10 commits into from
Oct 14, 2016
Merged

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

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb853da
Revert "Prevent breaking remaining previously compliant CommonMarkWea…
PhrozenByte Oct 13, 2016
e691034
Revert "Prevent failure with data set 77 in CommonMarkWeak"
PhrozenByte Oct 13, 2016
81025cd
Revert "Break less previously passed CommonMarkWeak tests"
PhrozenByte Oct 13, 2016
bdf537e
Fix ordered list start argument
PhrozenByte Oct 13, 2016
30ff5c6
Remove unused $placeholder variable
PhrozenByte Oct 13, 2016
4b3b7df
Support list items starting with a blank line
PhrozenByte Oct 13, 2016
1d61f90
Support list items starting with indented code
PhrozenByte Oct 13, 2016
7b1529f
Use the list marker width to determine whether a list item is continued
PhrozenByte Oct 13, 2016
a9e1163
Fix code formatting
PhrozenByte Oct 13, 2016
a3836b1
Handle subsequent list items which aren't indented sufficiently
PhrozenByte Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 48 additions & 58 deletions Parsedown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function setUrlsLinked($urlsLinked)
# Blocks
#

protected function lines(array $lines, $parentType = null)
protected function lines(array $lines)
{
$CurrentBlock = null;

Expand Down Expand Up @@ -165,7 +165,7 @@ protected function lines(array $lines, $parentType = null)

if (isset($CurrentBlock['continuable']))
{
$Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock, $parentType);
$Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);

if (isset($Block))
{
Expand All @@ -188,40 +188,16 @@ protected function lines(array $lines, $parentType = null)

# ~

$highPriority = array();

$blockTypes = $this->unmarkedBlockTypes;

if (isset($this->BlockTypes[$marker]))
{
foreach ($this->BlockTypes[$marker] as $blockType)
{
if
(
isset($CurrentBlock['type'])
and $CurrentBlock['type'] === $blockType
and ! isset($CurrentBlock['interrupted'])
and isset($CurrentBlock['continuable'])
and ! isset($CurrentBlock['complete'])
)
{
$highPriority[] = $CurrentBlock['type'];
}
else
{
$blockTypes []= $blockType;
}
$blockTypes []= $blockType;
}
}

$blockTypes = array_merge($highPriority, $blockTypes);

if ( $parentType === 'List' and ($a = array_search('List', $blockTypes)) !== false and ($b = array_search('Code', $blockTypes)) !== false and $a > $b and ($placeholder = $this->blockList($Line)))
{
unset($blockTypes[$b]);
array_splice($blockTypes, $a + 1, 0, 'Code');
}

#
# ~

Expand Down Expand Up @@ -449,7 +425,7 @@ protected function blockFencedCode($Line)
}
}

protected function blockFencedCodeContinue($Line, $Block, $parentType)
protected function blockFencedCodeContinue($Line, $Block)
{
if (isset($Block['complete']))
{
Expand All @@ -472,11 +448,6 @@ protected function blockFencedCodeContinue($Line, $Block, $parentType)
return $Block;
}

if ($parentType === 'List')
{
$Line['body'] = preg_replace('/^[ ]{0,'.min(4, $Line['indent']).'}/', '', $Line['body']);
}

$Block['element']['text']['text'] .= "\n".$Line['body'];;

return $Block;
Expand Down Expand Up @@ -531,16 +502,30 @@ protected function blockHeader($Line)

protected function blockList($Line)
{
list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.\)]');
list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]{1,9}[.\)]');

if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
if (preg_match('/^('.$pattern.'([ ]+|$))(.*)/', $Line['text'], $matches))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd guess that allowing the string to end, instead of a space being present in the regex here would be the cause of the failure mentioned above? (in #2 (comment))

{
$contentIndent = strlen($matches[2]);

if ($contentIndent >= 5)
{
$contentIndent -= 1;
$matches[1] = substr($matches[1], 0, -$contentIndent);
$matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
}
elseif ($contentIndent === 0)
{
$matches[1] .= ' ';
}

$Block = array(
'indent' => $Line['indent'],
'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,
Expand All @@ -550,7 +535,7 @@ protected function blockList($Line)

if($name === 'ol')
{
$listStart = stristr($matches[1], $Block['data']['marker'], true);
$listStart = ltrim(strstr($matches[1], $Block['data']['markerType'], true), '0') ?: '0';

if($listStart !== '1')
{
Expand All @@ -561,9 +546,7 @@ protected function blockList($Line)
$Block['li'] = array(
'name' => 'li',
'handler' => 'li',
'text' => array(
$matches[2],
),
'text' => !empty($matches[3]) ? array($matches[3]) : array(),
);

$Block['element']['text'] []= & $Block['li'];
Expand All @@ -574,18 +557,25 @@ protected function blockList($Line)

protected function blockListContinue($Line, array $Block)
{
if (isset($Block['interrupted']) and empty($Block['li']['text']))
{
return null;
}

$requiredIndent = ($Block['indent'] + strlen($Block['data']['marker']));

if (
$Block['indent'] === $Line['indent']
$Line['indent'] < $requiredIndent
and
(
(
$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)
)
)
)
Expand All @@ -601,6 +591,8 @@ protected function blockListContinue($Line, array $Block)

$text = isset($matches[1]) ? $matches[1] : '';

$Block['indent'] = $Line['indent'];

$Block['li'] = array(
'name' => 'li',
'handler' => 'li',
Expand All @@ -613,7 +605,7 @@ protected function blockListContinue($Line, array $Block)

return $Block;
}
elseif ($Block['indent'] === $Line['indent'] and $placeholder = $this->blockList($Line))
elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
{
return null;
}
Expand All @@ -623,30 +615,28 @@ protected function blockListContinue($Line, array $Block)
return $Block;
}

if ( ! isset($Block['interrupted']))
if ($Line['indent'] >= $requiredIndent)
{
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent']).'}/', '', $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,4}/', '', $Line['body']);

if ($placeholder = $this->blockList($Line))
{
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent']).'}/', '', $Line['body']);
}
$text = preg_replace('/^[ ]{0,'.$requiredIndent.'}/', '', $Line['body']);

$Block['li']['text'] []= $text;

unset($Block['interrupted']);

return $Block;
}
}
Expand Down Expand Up @@ -1513,7 +1503,7 @@ protected function elements(array $Elements)

protected function li($lines)
{
$markup = $this->lines($lines, 'List');
$markup = $this->lines($lines);

$trimmedMarkup = trim($markup);

Expand Down