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

Add ) as an ordered list marker

Browse Source 
Also added marker check to ordered list case when deciding to continue the current list
This commit is contained in:
Aidan Woods 2016-10-11 19:18:43 +01:00 committed by GitHub
parent d9679141fa
commit d26b33c20f
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Parsedown.php
View File

@ -502,7 +502,7 @@ class Parsedown
protected function blockList($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]+[.\)]');
if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches)) if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
{ {
@ -511,8 +511,7 @@ class Parsedown
'pattern' => $pattern, 'pattern' => $pattern,
'data' => array( 'data' => array(
'type' => $name, 'type' => $name,
'matchText' => ($name === 'ul' ? stristr($matches[1], ' ', true) : stristr($matches[1], '.', true)), 'marker' => ($name === 'ul' ? stristr($matches[1], ' ', true) : substr(stristr($matches[1], ' ', true), -1)),
'rootItem' => $matches[2]
), ),
'element' => array( 'element' => array(
'name' => $name, 'name' => $name,
@ -522,7 +521,7 @@ class Parsedown
if($name === 'ol') if($name === 'ol')
{ {
$listStart = stristr($matches[0], '.', true); $listStart = stristr($matches[1], $Block['data']['marker'], true);
if($listStart !== '1') if($listStart !== '1')
{ {
@ -547,16 +546,18 @@ class Parsedown
protected function blockListContinue($Line, array $Block) protected function blockListContinue($Line, array $Block)
{ {
if ( if (
$Block['indent'] === $Line['indent']
and
( (
$Block['indent'] === $Line['indent'] (
and $Block['data']['type'] === 'ol' $Block['data']['type'] === 'ol'
and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches) and preg_match('/^[0-9]+'.preg_quote($Block['data']['marker']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
) )
or or
( (
$Block['indent'] === $Line['indent'] $Block['data']['type'] === 'ul'
and $Block['data']['type'] === 'ul' and preg_match('/^'.preg_quote($Block['data']['marker']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches)
and preg_match('/^'.preg_quote($Block['data']['matchText']).'(?:[ ]+(.*)|$)/', $Line['text'], $matches) )
) )
) )
{ {
@ -583,11 +584,13 @@ class Parsedown
return $Block; return $Block;
} }
elseif ($Block['indent'] === $Line['indent'] and $l = $this->blockList($Line)) elseif ($Block['indent'] === $Line['indent'] and $placeholder = $this->blockList($Line))
{ {
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;
@ -595,7 +598,7 @@ class Parsedown
if ( ! isset($Block['interrupted'])) if ( ! isset($Block['interrupted']))
{ {
$text = preg_replace('/^[ ]{0,'.($Block['indent'] + 1).'}/', '', $Line['body']); $text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
$Block['li']['text'] []= $text; $Block['li']['text'] []= $text;
@ -606,7 +609,7 @@ class Parsedown
{ {
$Block['li']['text'] []= ''; $Block['li']['text'] []= '';
$text = preg_replace('/^[ ]{0,'.($Block['indent'] + 1).'}/', '', $Line['body']); $text = preg_replace('/^[ ]{0,'.min(4, $Block['indent'] + 1).'}/', '', $Line['body']);
$Block['li']['text'] []= $text; $Block['li']['text'] []= $text;