improve names of elements

This commit is contained in:
Emanuil Rusev 2015-01-16 02:49:55 +02:00
parent 2cbd3010e4
commit 596350d1f5

View File

@ -1030,7 +1030,7 @@ class Parsedown
'!' => array('Image'), '!' => array('Image'),
'&' => array('Ampersand'), '&' => array('Ampersand'),
'*' => array('Emphasis'), '*' => array('Emphasis'),
'<' => array('UrlTag', 'EmailTag', 'Tag', 'LessThan'), '<' => array('Url', 'Email', 'Markup', 'LessThan'),
'>' => array('GreaterThan'), '>' => array('GreaterThan'),
'[' => array('Link'), '[' => array('Link'),
'_' => array('Emphasis'), '_' => array('Emphasis'),
@ -1167,7 +1167,7 @@ class Parsedown
); );
} }
protected function inlineUrlTag($excerpt) protected function inlineUrl($excerpt)
{ {
if (strpos($excerpt, '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $excerpt, $matches)) if (strpos($excerpt, '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $excerpt, $matches))
{ {
@ -1186,7 +1186,7 @@ class Parsedown
} }
} }
protected function inlineEmailTag($excerpt) protected function inlineEmail($excerpt)
{ {
if (strpos($excerpt, '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $excerpt, $matches)) if (strpos($excerpt, '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $excerpt, $matches))
{ {
@ -1210,7 +1210,7 @@ class Parsedown
} }
} }
protected function inlineTag($excerpt) protected function inlineMarkup($excerpt)
{ {
if ($this->markupEscaped or strpos($excerpt, '>') === false) if ($this->markupEscaped or strpos($excerpt, '>') === false)
{ {