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

Revert "Break less previously passed CommonMarkWeak tests"

Browse Source 
This reverts commit 2db3199510.
This commit is contained in:
Daniel Rudolf 2016-10-13 19:25:43 +02:00
parent e691034861
commit 81025cd468
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Parsedown.php
View File

@ -188,33 +188,15 @@ 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);
# #
# ~ # ~
@ -607,6 +589,8 @@ 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;
@ -614,7 +598,7 @@ class Parsedown
if ( ! isset($Block['interrupted'])) if ( ! isset($Block['interrupted']))
{ {
$text = preg_replace('/^[ ]{0,'.min(4, $Block['indent']).'}/', '', $Line['body']); $text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
$Block['li']['text'] []= $text; $Block['li']['text'] []= $text;
@ -625,12 +609,7 @@ class Parsedown
{ {
$Block['li']['text'] []= ''; $Block['li']['text'] []= '';
$text = preg_replace('/^[ ]{0,4}/', '', $Line['body']); $text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $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;