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 em/strong routine

Browse Source 
retry to search em/strong markers to fix nested em/strong correctly
This commit is contained in:
Won-Kyu Park 2014-02-03 16:37:57 +09:00
parent 6e93b68692
commit 59907ff757
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Parsedown.php
View File

@ -887,34 +887,18 @@ class Parsedown
if ($text[1] === $closest_marker and preg_match(self::$strong_regex[$closest_marker], $text, $matches)) if ($text[1] === $closest_marker and preg_match(self::$strong_regex[$closest_marker], $text, $matches))
{ {
$markers[] = $closest_marker;
$matches[1] = $this->parse_span_elements($matches[1], $markers); $matches[1] = $this->parse_span_elements($matches[1], $markers);
$markup .= '<strong>'.$matches[1].'</strong>'; $markup .= '<strong>'.$matches[1].'</strong>';
} }
elseif (preg_match(self::$em_regex[$closest_marker], $text, $matches)) elseif (preg_match(self::$em_regex[$closest_marker], $text, $matches))
{ {
$markers[] = $closest_marker;
$matches[1] = $this->parse_span_elements($matches[1], $markers); $matches[1] = $this->parse_span_elements($matches[1], $markers);
$markup .= '<em>'.$matches[1].'</em>'; $markup .= '<em>'.$matches[1].'</em>';
} }
elseif ($text[1] === $closest_marker and preg_match(self::$strong_em_regex[$closest_marker], $text, $matches))
{
$matches[2] = $this->parse_span_elements($matches[2], $markers);
$matches[1] and $matches[1] = $this->parse_span_elements($matches[1], $markers);
$matches[3] and $matches[3] = $this->parse_span_elements($matches[3], $markers);
$markup .= '<strong>'.$matches[1].'<em>'.$matches[2].'</em>'.$matches[3].'</strong>';
}
elseif (preg_match(self::$em_strong_regex[$closest_marker], $text, $matches))
{
$matches[2] = $this->parse_span_elements($matches[2], $markers);
$matches[1] and $matches[1] = $this->parse_span_elements($matches[1], $markers);
$matches[3] and $matches[3] = $this->parse_span_elements($matches[3], $markers);
$markup .= '<em>'.$matches[1].'<strong>'.$matches[2].'</strong>'.$matches[3].'</em>';
}
if (isset($matches) and $matches) if (isset($matches) and $matches)
{ {
@ -1070,23 +1054,13 @@ class Parsedown
# Read-only # Read-only
private static $strong_regex = array( private static $strong_regex = array(
'*' => '/^[*]{2}([^*]+?)[*]{2}(?![*])/s', '*' => '/^[*]{2}((?:[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
'_' => '/^__([^_]+?)__(?!_)/us', '_' => '/^__((?:[^_]|_[^_]*_)+?)__(?!_)/us',
); );
private static $em_regex = array( private static $em_regex = array(
'*' => '/^[*]([^*]+?)[*](?![*])/s', '*' => '/^[*]((?:[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
'_' => '/^_([^_]+?)[_](?![_])\b/us', '_' => '/^_((?:[^_]|__[^_]*__)+?)_(?!_)\b/us',
);
private static $strong_em_regex = array(
'*' => '/^[*]{2}(.*?)[*](.+?)[*](.*?)[*]{2}/s',
'_' => '/^__(.*?)_(.+?)_(.*?)__/us',
);
private static $em_strong_regex = array(
'*' => '/^[*](.*?)[*]{2}(.+?)[*]{2}(.*?)[*]/s',
'_' => '/^_(.*?)__(.+?)__(.*?)_/us',
); );
private static $special_characters = array( private static $special_characters = array(