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

simplify parsing of list

Browse Source
This commit is contained in:
Emanuil Rusev 2014-01-22 01:03:21 +02:00
parent 68f2871996
commit 712dd23d30
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Parsedown.php
View File

@ -182,13 +182,11 @@ class Parsedown
$elements []= $element; $elements []= $element;
$element = array( unset($element['first']);
'type' => 'li',
'indentation' => $matches[1], $element['last'] = true;
'last' => true, $element['lines'] = array(
'lines' => array( preg_replace('/^[ ]{0,4}/', '', $matches[3]),
preg_replace('/^[ ]{0,4}/', '', $matches[3]),
),
); );
} }
@ -477,6 +475,7 @@ class Parsedown
'type' => 'li', 'type' => 'li',
'ordered' => false, 'ordered' => false,
'indentation' => $matches[1], 'indentation' => $matches[1],
'first' => true,
'last' => true, 'last' => true,
'lines' => array( 'lines' => array(
preg_replace('/^[ ]{0,4}/', '', $matches[2]), preg_replace('/^[ ]{0,4}/', '', $matches[2]),
@ -497,6 +496,7 @@ class Parsedown
'type' => 'li', 'type' => 'li',
'ordered' => true, 'ordered' => true,
'indentation' => $matches[1], 'indentation' => $matches[1],
'first' => true,
'last' => true, 'last' => true,
'lines' => array( 'lines' => array(
preg_replace('/^[ ]{0,4}/', '', $matches[2]), preg_replace('/^[ ]{0,4}/', '', $matches[2]),
@ -616,11 +616,11 @@ class Parsedown
case 'li': case 'li':
if (isset($element['ordered'])) # first if (isset($element['first']))
{ {
$list_type = $element['ordered'] ? 'ol' : 'ul'; $type = $element['ordered'] ? 'ol' : 'ul';
$markup .= '<'.$list_type.'>'."\n"; $markup .= '<'.$type.'>'."\n";
} }
if (isset($element['interrupted']) and ! isset($element['last'])) if (isset($element['interrupted']) and ! isset($element['last']))
@ -632,7 +632,12 @@ class Parsedown
$markup .= '<li>'.$text.'</li>'."\n"; $markup .= '<li>'.$text.'</li>'."\n";
isset($element['last']) and $markup .= '</'.$list_type.'>'."\n"; if (isset($element['last']))
{
$type = $element['ordered'] ? 'ol' : 'ul';
$markup .= '</'.$type.'>'."\n";
}
break; break;