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

inline methods should be able to handle unmarked inline elements

Browse Source
This commit is contained in:
Emanuil Rusev 2015-01-19 17:05:10 +02:00
parent bdf0ef024e
commit c664785485
1 changed files with 87 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
Parsedown.php
View File

@ -972,7 +972,8 @@ class Parsedown
'!' => array('Image'), '!' => array('Image'),
'&' => array('SpecialCharacter'), '&' => array('SpecialCharacter'),
'*' => array('Emphasis'), '*' => array('Emphasis'),
'<' => array('Url', 'Email', 'Markup', 'SpecialCharacter'), ':' => array('Url'),
'<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
'>' => array('SpecialCharacter'), '>' => array('SpecialCharacter'),
'[' => array('Link'), '[' => array('Link'),
'_' => array('Emphasis'), '_' => array('Emphasis'),
@ -983,7 +984,7 @@ class Parsedown
# ~ # ~
protected $inlineMarkerList = '!"*_&[<>`~\\'; protected $inlineMarkerList = '!"*_&[:<>`~\\';
# #
# ~ # ~
@ -993,43 +994,53 @@ class Parsedown
{ {
$markup = ''; $markup = '';
$remainder = $text; $unexaminedText = $text;
$markerPosition = 0; $markerPosition = 0;
while ($excerpt = strpbrk($remainder, $this->inlineMarkerList)) while ($excerpt = strpbrk($unexaminedText, $this->inlineMarkerList))
{ {
$marker = $excerpt[0]; $marker = $excerpt[0];
$markerPosition += strpos($remainder, $marker); $markerPosition += strpos($unexaminedText, $marker);
$Excerpt = array('text' => $excerpt, 'context' => $text);
foreach ($this->InlineTypes[$marker] as $inlineType) foreach ($this->InlineTypes[$marker] as $inlineType)
{ {
$handler = 'inline'.$inlineType; $Inline = $this->{'inline'.$inlineType}($Excerpt);
$Inline = $this->$handler($excerpt);
if ( ! isset($Inline)) if ( ! isset($Inline))
{ {
continue; continue;
} }
$plainText = substr($text, 0, $markerPosition); if (isset($Inline['position']) and $Inline['position'] > $markerPosition) # position is ahead of marker
{
continue;
}
$markup .= $this->unmarkedText($plainText); if ( ! isset($Inline['position']))
{
$Inline['position'] = $markerPosition;
}
$unmarkedText = substr($text, 0, $Inline['position']);
$markup .= $this->unmarkedText($unmarkedText);
$markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']); $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
$text = substr($text, $markerPosition + $Inline['extent']); $text = substr($text, $Inline['position'] + $Inline['extent']);
$remainder = $text; $unexaminedText = $text;
$markerPosition = 0; $markerPosition = 0;
continue 2; continue 2;
} }
$remainder = substr($excerpt, 1); $unexaminedText = substr($excerpt, 1);
$markerPosition ++; $markerPosition ++;
} }
@ -1043,11 +1054,11 @@ class Parsedown
# ~ # ~
# #
protected function inlineCode($excerpt) protected function inlineCode($Excerpt)
{ {
$marker = $excerpt[0]; $marker = $Excerpt['text'][0];
if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $excerpt, $matches)) if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
{ {
$text = $matches[2]; $text = $matches[2];
$text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
@ -1063,9 +1074,9 @@ class Parsedown
} }
} }
protected function inlineEmail($excerpt) protected function inlineEmailTag($Excerpt)
{ {
if (strpos($excerpt, '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $excerpt, $matches)) if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
{ {
$url = $matches[1]; $url = $matches[1];
@ -1087,20 +1098,20 @@ class Parsedown
} }
} }
protected function inlineEmphasis($excerpt) protected function inlineEmphasis($Excerpt)
{ {
if ( ! isset($excerpt[1])) if ( ! isset($Excerpt['text'][1]))
{ {
return; return;
} }
$marker = $excerpt[0]; $marker = $Excerpt['text'][0];
if ($excerpt[1] === $marker and preg_match($this->StrongRegex[$marker], $excerpt, $matches)) if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
{ {
$emphasis = 'strong'; $emphasis = 'strong';
} }
elseif (preg_match($this->EmRegex[$marker], $excerpt, $matches)) elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
{ {
$emphasis = 'em'; $emphasis = 'em';
} }
@ -1119,60 +1130,52 @@ class Parsedown
); );
} }
protected function inlineEscapeSequence($excerpt) protected function inlineEscapeSequence($Excerpt)
{ {
if (isset($excerpt[1]) and in_array($excerpt[1], $this->specialCharacters)) if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
{ {
return array( return array(
'markup' => $excerpt[1], 'markup' => $Excerpt['text'][1],
'extent' => 2, 'extent' => 2,
); );
} }
} }
protected function inlineImage($excerpt) protected function inlineImage($Excerpt)
{ {
if ( ! isset($excerpt[1]) or $excerpt[1] !== '[') if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
{ {
return; return;
} }
$excerpt = substr($excerpt, 1); $Excerpt['text']= substr($Excerpt['text'], 1);
$InlineLink = $this->inlineLink($excerpt); $Link = $this->inlineLink($Excerpt);
if ($InlineLink === null) if ($Link === null)
{ {
return; return;
} }
$Inline = array( $Inline = array(
'extent' => $InlineLink['extent'] + 1, 'extent' => $Link['extent'] + 1,
'element' => array( 'element' => array(
'name' => 'img', 'name' => 'img',
'attributes' => array( 'attributes' => array(
'src' => $InlineLink['element']['attributes']['href'], 'src' => $Link['element']['attributes']['href'],
'alt' => $InlineLink['element']['text'], 'alt' => $Link['element']['text'],
), ),
), ),
); );
$Inline['element']['attributes'] += $InlineLink['element']['attributes']; $Inline['element']['attributes'] += $Link['element']['attributes'];
unset($Inline['element']['attributes']['href']); unset($Inline['element']['attributes']['href']);
return $Inline; return $Inline;
} }
protected function inlineLessThan() protected function inlineLink($Excerpt)
{
return array(
'markup' => '&lt;',
'extent' => 1,
);
}
protected function inlineLink($excerpt)
{ {
$Element = array( $Element = array(
'name' => 'a', 'name' => 'a',
@ -1186,7 +1189,7 @@ class Parsedown
$extent = 0; $extent = 0;
$remainder = $excerpt; $remainder = $Excerpt['text'];
if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches)) if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches))
{ {
@ -1245,14 +1248,14 @@ class Parsedown
); );
} }
protected function inlineMarkup($excerpt) protected function inlineMarkup($Excerpt)
{ {
if ($this->markupEscaped or strpos($excerpt, '>') === false) if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false)
{ {
return; return;
} }
if ($excerpt[1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $excerpt, $matches)) if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches))
{ {
return array( return array(
'markup' => $matches[0], 'markup' => $matches[0],
@ -1260,7 +1263,7 @@ class Parsedown
); );
} }
if ($excerpt[1] === '!' and preg_match('/^<!---?[^>-](?:-?[^-])*-->/s', $excerpt, $matches)) if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?[^-])*-->/s', $Excerpt['text'], $matches))
{ {
return array( return array(
'markup' => $matches[0], 'markup' => $matches[0],
@ -1268,7 +1271,7 @@ class Parsedown
); );
} }
if ($excerpt[1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $excerpt, $matches)) if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
{ {
return array( return array(
'markup' => $matches[0], 'markup' => $matches[0],
@ -1277,9 +1280,9 @@ class Parsedown
} }
} }
protected function inlineSpecialCharacter($excerpt) protected function inlineSpecialCharacter($Excerpt)
{ {
if ($excerpt[0] === '&' and ! preg_match('/^&#?\w+;/', $excerpt)) if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
{ {
return array( return array(
'markup' => '&amp;', 'markup' => '&amp;',
@ -1289,23 +1292,23 @@ class Parsedown
$SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot'); $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
if (isset($SpecialCharacter[$excerpt[0]])) if (isset($SpecialCharacter[$Excerpt['text'][0]]))
{ {
return array( return array(
'markup' => '&'.$SpecialCharacter[$excerpt[0]].';', 'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
'extent' => 1, 'extent' => 1,
); );
} }
} }
protected function inlineStrikethrough($excerpt) protected function inlineStrikethrough($Excerpt)
{ {
if ( ! isset($excerpt[1])) if ( ! isset($Excerpt['text'][1]))
{ {
return; return;
} }
if ($excerpt[1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $excerpt, $matches)) if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
{ {
return array( return array(
'extent' => strlen($matches[0]), 'extent' => strlen($matches[0]),
@ -1318,9 +1321,34 @@ class Parsedown
} }
} }
protected function inlineUrl($excerpt) protected function inlineUrl($Excerpt)
{ {
if (strpos($excerpt, '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $excerpt, $matches)) if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
{
return;
}
if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
{
$Inline = array(
'extent' => strlen($matches[0][0]),
'position' => $matches[0][1],
'element' => array(
'name' => 'a',
'text' => $matches[0][0],
'attributes' => array(
'href' => $matches[0][0],
),
),
);
return $Inline;
}
}
protected function inlineUrlTag($Excerpt)
{
if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
{ {
$url = str_replace(array('&', '<'), array('&amp;', '&lt;'), $matches[1]); $url = str_replace(array('&', '<'), array('&amp;', '&lt;'), $matches[1]);
@ -1345,21 +1373,6 @@ class Parsedown
# ~ # ~
protected function unmarkedText($text) protected function unmarkedText($text)
{
foreach ($this->unmarkedInlineTypes as $snippet => $inlineType)
{
if (strpos($text, $snippet) !== false)
{
$text = $this->{'unmarkedInline'.$inlineType}($text);
}
}
return $text;
}
# ~
protected function unmarkedInlineBreak($text)
{ {
if ($this->breaksEnabled) if ($this->breaksEnabled)
{ {
@ -1374,35 +1387,6 @@ class Parsedown
return $text; return $text;
} }
protected function unmarkedInlineUrl($text)
{
if ($this->urlsLinked !== true)
{
return $text;
}
$re = '/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui';
$offset = 0;
while (strpos($text, '://', $offset) and preg_match($re, $text, $matches, PREG_OFFSET_CAPTURE, $offset))
{
$url = $matches[0][0];
$urlLength = strlen($url);
$urlPosition = $matches[0][1];
$markup = '<a href="'.$url.'">'.$url.'</a>';
$markupLength = strlen($markup);
$text = substr_replace($text, $markup, $urlPosition, $urlLength);
$offset = $urlPosition + $markupLength;
}
return $text;
}
# #
# Handlers # Handlers
# #