backtick within code span

Parsedown.php

@@ -37,11 +37,11 @@ class Parsedown
 	# Setters
 	#
 
-	private $break_marker = "  \n";
+	private $breaks_enabled = false;
 
 	function set_breaks_enabled($breaks_enabled)
 	{
-		$this->break_marker = $breaks_enabled ? "\n" : "  \n";
+		$this->breaks_enabled = $breaks_enabled;
 
 		return $this;
 	}
@@ -51,7 +51,6 @@ class Parsedown
 	#
 
 	private $reference_map = array();
-	private $escape_sequence_map = array();
 
 	#
 	# Public Methods
@@ -66,25 +65,6 @@ class Parsedown
 		# replaces tabs with spaces
 		$text = str_replace("\t", '    ', $text);
 
-		# encodes escape sequences
-
-		if (strpos($text, '\\') !== FALSE)
-		{
-			$escape_sequences = array('\\\\', '\`', '\*', '\_', '\{', '\}', '\[', '\]', '\(', '\)', '\>', '\#', '\+', '\-', '\.', '\!');
-
-			foreach ($escape_sequences as $index => $escape_sequence)
-			{
-				if (strpos($text, $escape_sequence) !== FALSE)
-				{
-					$code = "\x1A".'\\'.$index.';';
-
-					$text = str_replace($escape_sequence, $code, $text);
-
-					$this->escape_sequence_map[$code] = $escape_sequence;
-				}
-			}
-		}
-
 		# ~
 
 		$text = trim($text, "\n");
@@ -93,15 +73,6 @@ class Parsedown
 
 		$text = $this->parse_block_elements($lines);
 
-		# decodes escape sequences
-
-		foreach ($this->escape_sequence_map as $code => $escape_sequence)
-		{
-			$text = str_replace($code, $escape_sequence[1], $text);
-		}
-
-		# ~
-
 		$text = rtrim($text, "\n");
 
 		return $text;
@@ -111,8 +82,6 @@ class Parsedown
 	# Private Methods
 	#
 
-
-
 	private function parse_block_elements(array $lines, $context = '')
 	{
 		$elements = array();
@@ -213,13 +182,11 @@ class Parsedown
 
 							$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]),
-								),
 							);
 						}
 
@@ -508,6 +475,7 @@ class Parsedown
 							'type' => 'li',
 							'ordered' => false,
 							'indentation' => $matches[1],
+							'first' => true,
 							'last' => true,
 							'lines' => array(
 								preg_replace('/^[ ]{0,4}/', '', $matches[2]),
@@ -528,6 +496,7 @@ class Parsedown
 					'type' => 'li',
 					'ordered' => true,
 					'indentation' => $matches[1],
+					'first' => true,
 					'last' => true,
 					'lines' => array(
 						preg_replace('/^[ ]{0,4}/', '', $matches[2]),
@@ -551,6 +520,8 @@ class Parsedown
 				}
 				else
 				{
+					$this->breaks_enabled and $element['text'] .= '  ';
+
 					$element['text'] .= "\n".$line;
 				}
 			}
@@ -592,6 +563,11 @@ class Parsedown
 						else
 						{
 							$markup .= $text;
+
+							if (isset($elements[2]))
+							{
+								$markup .= "\n";
+							}
 						}
 					}
 					else
@@ -610,17 +586,22 @@ class Parsedown
 					break;
 
 				case 'code block':
+
+					$text = htmlspecialchars($element['text'], ENT_NOQUOTES, 'UTF-8');
+
+					$markup .= '<pre><code>'.$text.'</code></pre>'."\n";
+
+					break;
+
 				case 'fenced block':
 
 					$text = htmlspecialchars($element['text'], ENT_NOQUOTES, 'UTF-8');
 
-					strpos($text, "\x1A\\") !== FALSE and $text = strtr($text, $this->escape_sequence_map);
+					$markup .= '<pre><code';
 
-					$markup .= isset($element['language'])
+					isset($element['language']) and $markup .= ' class="language-'.$element['language'].'"';
-						? '<pre><code class="language-'.$element['language'].'">'.$text.'</code></pre>'
-						: '<pre><code>'.$text.'</code></pre>';
 
-					$markup .= "\n";
+					$markup .= '>'.$text.'</code></pre>'."\n";
 
 					break;
 
@@ -640,11 +621,11 @@ class Parsedown
 
 				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']))
@@ -656,7 +637,12 @@ class Parsedown
 
 					$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;
 
@@ -675,9 +661,9 @@ class Parsedown
 		return $markup;
 	}
 
-	private function parse_span_elements($text, $markers = array('![', '&', '*', '<', '[', '_', '`', 'http', '~~'))
+	private function parse_span_elements($text, $markers = array("  \n", '![', '&', '*', '<', '[', '\\', '_', '`', 'http', '~~'))
 	{
-		if (isset($text[2]) === false or $markers === array())
+		if (isset($text[1]) === false or $markers === array())
 		{
 			return $text;
 		}
@@ -713,7 +699,7 @@ class Parsedown
 
 			# ~
 
-			if ($closest_marker === null or isset($text[$closest_marker_position + 2]) === false)
+			if ($closest_marker === null or isset($text[$closest_marker_position + 1]) === false)
 			{
 				$markup .= $text;
 
@@ -734,6 +720,14 @@ class Parsedown
 
 			switch ($closest_marker)
 			{
+				case "  \n":
+
+					$markup .= '<br />'."\n";
+
+					$offset = 3;
+
+					break;
+
 				case '![':
 				case '[':
 
@@ -801,15 +795,21 @@ class Parsedown
 
 						if ($element['!'])
 						{
-							$markup .= '<img alt="'.$element['a'].'" src="'.$element['»'].'" />';
+							$markup .= '<img alt="'.$element['a'].'" src="'.$element['»'].'"';
+
+							isset($element['#']) and $markup .= ' title="'.$element['#'].'"';
+
+							$markup .= ' />';
 						}
 						else
 						{
 							$element['a'] = $this->parse_span_elements($element['a'], $markers);
 
-							$markup .= isset($element['#'])
+							$markup .= '<a href="'.$element['»'].'"';
-								? '<a href="'.$element['»'].'" title="'.$element['#'].'">'.$element['a'].'</a>'
+
-								: '<a href="'.$element['»'].'">'.$element['a'].'</a>';
+							isset($element['#']) and $markup .= ' title="'.$element['#'].'"';
+
+							$markup .= '>'.$element['a'].'</a>';
 						}
 
 						unset($element);
@@ -825,9 +825,18 @@ class Parsedown
 
 				case '&':
 
-					$markup .= '&amp;';
+					if (preg_match('/^&#?\w+;/', $text, $matches))
+					{
+						$markup .= $matches[0];
 
-					$offset = substr($text, 0, 5) === '&amp;' ? 5 : 1;
+						$offset = strlen($matches[0]);
+					}
+					else
+					{
+						$markup .= '&amp;';
+
+						$offset = 1;
+					}
 
 					break;
 
@@ -892,6 +901,12 @@ class Parsedown
 
 							$offset = strlen($matches[0]);
 						}
+						elseif (strpos($text, '@') > 1 and preg_match('/<(\S+?@\S+?)>/', $text, $matches))
+						{
+							$markup .= '<a href="mailto:'.$matches[1].'">'.$matches[1].'</a>';
+
+							$offset = strlen($matches[0]);
+						}
 						elseif (preg_match('/^<\/?\w.*?>/', $text, $matches))
 						{
 							$markup .= $matches[0];
@@ -914,18 +929,30 @@ class Parsedown
 
 					break;
 
+				case '\\':
+
+					if (in_array($text[1], $this->special_characters))
+					{
+						$markup .= $text[1];
+
+						$offset = 2;
+					}
+					else
+					{
+						$markup .= '\\';
+
+						$offset = 1;
+					}
+
+					break;
+
 				case '`':
 
-					if (preg_match('/^`(.+?)`/', $text, $matches))
+					if (preg_match('/^(`+)(.+?)\1(?!`)/', $text, $matches))
 					{
-						$element_text = $matches[1];
+						$element_text = $matches[2];
 						$element_text = htmlspecialchars($element_text, ENT_NOQUOTES, 'UTF-8');
 
-						if ($this->escape_sequence_map and strpos($element_text, "\x1A") !== false)
-						{
-							$element_text = strtr($element_text, $this->escape_sequence_map);
-						}
-
 						$markup .= '<code>'.$element_text.'</code>';
 
 						$offset = strlen($matches[0]);
@@ -988,8 +1015,6 @@ class Parsedown
 			$markers[$closest_marker_index] = $closest_marker;
 		}
 
-		$markup = str_replace($this->break_marker, '<br />'."\n", $markup);
-
 		return $markup;
 	}
 
@@ -1004,6 +1029,8 @@ class Parsedown
 		'span', 'strong', 'sub', 'sup', 'textarea', 'tt', 'var',
 	);
 
+	private $special_characters = array('\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!');
+
 	# ~
 
 	private $strong_regex = array(

README.md

@@ -13,8 +13,8 @@ Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
 * [fast](http://parsedown.org/speed)
 * [consistent](http://parsedown.org/consistency)
 * [GitHub Flavored](https://help.github.com/articles/github-flavored-markdown)
-* friendly to international input
 * [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5 and [hhvm](http://www.hhvm.com/)
+* friendly to international input
 
 ### Installation
 
@@ -23,7 +23,7 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 ### Example
 
 ```php
-$text = 'Hello _Parsedown_!';
+$text = 'Hello *Parsedown*!';
 
 $result = Parsedown::instance()->parse($text);
 

tests/data/email.html

@@ -0,0 +1 @@
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>

tests/data/email.md

@@ -0,0 +1 @@
+my email is <me@example.com>

tests/data/html_entity.html

@@ -0,0 +1 @@
+<p>&amp; &copy; &#123;</p>

tests/data/html_entity.md

@@ -0,0 +1 @@
+& © {

tests/data/image_title.html

@@ -0,0 +1 @@
+<p><img alt="alt" src="/md.png" title="title" /></p>

tests/data/image_title.md

@@ -0,0 +1 @@
+![alt](/md.png "title")

tests/data/special_characters.html

@@ -1,5 +1,4 @@
 <p>AT&amp;T has an ampersand in their name</p>
-<p>AT&amp;T is another way to write it</p>
 <p>this &amp; that</p>
 <p>4 &lt; 5 and 6 > 5</p>
 <p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>

tests/data/special_characters.md

@@ -1,7 +1,5 @@
 AT&T has an ampersand in their name
 
-AT&T is another way to write it
-
 this & that
 
 4 < 5 and 6 > 5