mirror of
https://github.com/erusev/parsedown.git
synced 2024-09-20 03:51:29 +02:00
Break less previously passed CommonMarkWeak tests
This commit is contained in:
parent
8965c7864f
commit
2db3199510
@ -188,15 +188,33 @@ class Parsedown
|
|||||||
|
|
||||||
# ~
|
# ~
|
||||||
|
|
||||||
|
$highPriority = array();
|
||||||
|
|
||||||
$blockTypes = $this->unmarkedBlockTypes;
|
$blockTypes = $this->unmarkedBlockTypes;
|
||||||
|
|
||||||
if (isset($this->BlockTypes[$marker]))
|
if (isset($this->BlockTypes[$marker]))
|
||||||
{
|
{
|
||||||
foreach ($this->BlockTypes[$marker] as $blockType)
|
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);
|
||||||
|
|
||||||
#
|
#
|
||||||
# ~
|
# ~
|
||||||
@ -589,8 +607,6 @@ class Parsedown
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
unset($placeholder);
|
|
||||||
|
|
||||||
if ($Line['text'][0] === '[' and $this->blockReference($Line))
|
if ($Line['text'][0] === '[' and $this->blockReference($Line))
|
||||||
{
|
{
|
||||||
return $Block;
|
return $Block;
|
||||||
@ -598,7 +614,7 @@ class Parsedown
|
|||||||
|
|
||||||
if ( ! isset($Block['interrupted']))
|
if ( ! isset($Block['interrupted']))
|
||||||
{
|
{
|
||||||
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
|
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent']).'}/', '', $Line['body']);
|
||||||
|
|
||||||
$Block['li']['text'] []= $text;
|
$Block['li']['text'] []= $text;
|
||||||
|
|
||||||
@ -609,7 +625,12 @@ class Parsedown
|
|||||||
{
|
{
|
||||||
$Block['li']['text'] []= '';
|
$Block['li']['text'] []= '';
|
||||||
|
|
||||||
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
|
$text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
|
||||||
|
|
||||||
|
if ($placeholder = $this->blockList($Line))
|
||||||
|
{
|
||||||
|
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent']).'}/', '', $Line['body']);
|
||||||
|
}
|
||||||
|
|
||||||
$Block['li']['text'] []= $text;
|
$Block['li']['text'] []= $text;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user