ylvarw / module

a/vendor/michelf/php-smartypants/Michelf/SmartyPants.php

Indentation +495 added lines, -495 removed lines

@@ -19,303 +19,303 @@ 
 
 class SmartyPants {
 
-	### Version ###
-
-	const  SMARTYPANTSLIB_VERSION  =  "1.8.1";
-
-
-	### Presets
-
-	# SmartyPants does nothing at all
-	const  ATTR_DO_NOTHING             =  0;
-	# "--" for em-dashes; no en-dash support
-	const  ATTR_EM_DASH                =  1;
-	# "---" for em-dashes; "--" for en-dashes
-	const  ATTR_LONG_EM_DASH_SHORT_EN  =  2;
-	# "--" for em-dashes; "---" for en-dashes
-	const  ATTR_SHORT_EM_DASH_LONG_EN  =  3;
-	# "--" for em-dashes; "---" for en-dashes
-	const  ATTR_STUPEFY                = -1;
-
-	# The default preset: ATTR_EM_DASH
-	const  ATTR_DEFAULT  =  SmartyPants::ATTR_EM_DASH;
-
-
-	### Standard Function Interface ###
-
-	public static function defaultTransform($text, $attr = SmartyPants::ATTR_DEFAULT) {
-	#
-	# Initialize the parser and return the result of its transform method.
-	# This will work fine for derived classes too.
-	#
-		# Take parser class on which this function was called.
-		$parser_class = \get_called_class();
-
-		# try to take parser from the static parser list
-		static $parser_list;
-		$parser =& $parser_list[$parser_class][$attr];
-
-		# create the parser if not already set
-		if (!$parser)
-			$parser = new $parser_class($attr);
-
-		# Transform text using parser.
-		return $parser->transform($text);
-	}
-
-
-	### Configuration Variables ###
-
-	# Partial regex for matching tags to skip
-	public $tags_to_skip = 'pre|code|kbd|script|style|math';
-
-	# Options to specify which transformations to make:
-	public $do_nothing   = 0; # disable all transforms
-	public $do_quotes    = 0;
-	public $do_backticks = 0; # 1 => double only, 2 => double & single
-	public $do_dashes    = 0; # 1, 2, or 3 for the three modes described above
-	public $do_ellipses  = 0;
-	public $do_stupefy   = 0;
-	public $convert_quot = 0; # should we translate " entities into normal quotes?
-
-	# Smart quote characters:
-	# Opening and closing smart double-quotes.
-	public $smart_doublequote_open  = '“';
-	public $smart_doublequote_close = '”';
-	public $smart_singlequote_open  = '‘';
-	public $smart_singlequote_close = '’'; # Also apostrophe.
-
-	# ``Backtick quotes''
-	public $backtick_doublequote_open  = '“'; // replacement for ``
-	public $backtick_doublequote_close = '”'; // replacement for ''
-	public $backtick_singlequote_open  = '‘'; // replacement for `
-	public $backtick_singlequote_close = '’'; // replacement for ' (also apostrophe)
-
-	# Other punctuation
-	public $em_dash = '—';
-	public $en_dash = '–';
-	public $ellipsis = '…';
-
-	### Parser Implementation ###
-
-	public function __construct($attr = SmartyPants::ATTR_DEFAULT) {
-	#
-	# Initialize a parser with certain attributes.
-	#
-	# Parser attributes:
-	# 0 : do nothing
-	# 1 : set all
-	# 2 : set all, using old school en- and em- dash shortcuts
-	# 3 : set all, using inverted old school en and em- dash shortcuts
-	# 
-	# q : quotes
-	# b : backtick quotes (``double'' only)
-	# B : backtick quotes (``double'' and `single')
-	# d : dashes
-	# D : old school dashes
-	# i : inverted old school dashes
-	# e : ellipses
-	# w : convert " entities to " for Dreamweaver users
-	#
-		if ($attr == "0") {
-			$this->do_nothing   = 1;
-		}
-		else if ($attr == "1") {
-			# Do everything, turn all options on.
-			$this->do_quotes    = 1;
-			$this->do_backticks = 1;
-			$this->do_dashes    = 1;
-			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "2") {
-			# Do everything, turn all options on, use old school dash shorthand.
-			$this->do_quotes    = 1;
-			$this->do_backticks = 1;
-			$this->do_dashes    = 2;
-			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "3") {
-			# Do everything, turn all options on, use inverted old school dash shorthand.
-			$this->do_quotes    = 1;
-			$this->do_backticks = 1;
-			$this->do_dashes    = 3;
-			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "-1") {
-			# Special "stupefy" mode.
-			$this->do_stupefy   = 1;
-		}
-		else {
-			$chars = preg_split('//', $attr);
-			foreach ($chars as $c){
-				if      ($c == "q") { $this->do_quotes    = 1; }
-				else if ($c == "b") { $this->do_backticks = 1; }
-				else if ($c == "B") { $this->do_backticks = 2; }
-				else if ($c == "d") { $this->do_dashes    = 1; }
-				else if ($c == "D") { $this->do_dashes    = 2; }
-				else if ($c == "i") { $this->do_dashes    = 3; }
-				else if ($c == "e") { $this->do_ellipses  = 1; }
-				else if ($c == "w") { $this->convert_quot = 1; }
-				else {
-					# Unknown attribute option, ignore.
-				}
-			}
-		}
-	}
-
-	public function transform($text) {
-
-		if ($this->do_nothing) {
-			return $text;
-		}
-
-		$tokens = $this->tokenizeHTML($text);
-		$result = '';
-		$in_pre = 0;  # Keep track of when we're inside <pre> or <code> tags.
-
-		$prev_token_last_char = ""; # This is a cheat, used to get some context
-									# for one-character tokens that consist of 
-									# just a quote char. What we do is remember
-									# the last character of the previous text
-									# token, to use as context to curl single-
-									# character quote tokens correctly.
-
-		foreach ($tokens as $cur_token) {
-			if ($cur_token[0] == "tag") {
-				# Don't mess with quotes inside tags.
-				$result .= $cur_token[1];
-				if (preg_match('@<(/?)(?:'.$this->tags_to_skip.')[\s>]@', $cur_token[1], $matches)) {
-					$in_pre = isset($matches[1]) && $matches[1] == '/' ? 0 : 1;
-				}
-			} else {
-				$t = $cur_token[1];
-				$last_char = substr($t, -1); # Remember last char of this token before processing.
-				if (! $in_pre) {
-					$t = $this->educate($t, $prev_token_last_char);
-				}
-				$prev_token_last_char = $last_char;
-				$result .= $t;
-			}
-		}
-
-		return $result;
-	}
-
-
-	function decodeEntitiesInConfiguration() {
-	#
-	#   Utility function that converts entities in configuration variables to
-	#   UTF-8 characters.
-	#
-		$output_config_vars = array(
-			'smart_doublequote_open',
-			'smart_doublequote_close',
-			'smart_singlequote_open',
-			'smart_singlequote_close',
-			'backtick_doublequote_open',
-			'backtick_doublequote_close',
-			'backtick_singlequote_open',
-			'backtick_singlequote_close',
-			'em_dash',
-			'en_dash',
-			'ellipsis',
-		);
-		foreach ($output_config_vars as $var) {
-			$this->$var = html_entity_decode($this->$var);
-		}
-	}
-
-
-	protected function educate($t, $prev_token_last_char) {
-		$t = $this->processEscapes($t);
-
-		if ($this->convert_quot) {
-			$t = preg_replace('/&quot;/', '"', $t);
-		}
-
-		if ($this->do_dashes) {
-			if ($this->do_dashes == 1) $t = $this->educateDashes($t);
-			if ($this->do_dashes == 2) $t = $this->educateDashesOldSchool($t);
-			if ($this->do_dashes == 3) $t = $this->educateDashesOldSchoolInverted($t);
-		}
-
-		if ($this->do_ellipses) $t = $this->educateEllipses($t);
-
-		# Note: backticks need to be processed before quotes.
-		if ($this->do_backticks) {
-			$t = $this->educateBackticks($t);
-			if ($this->do_backticks == 2) $t = $this->educateSingleBackticks($t);
-		}
-
-		if ($this->do_quotes) {
-			if ($t == "'") {
-				# Special case: single-character ' token
-				if (preg_match('/\S/', $prev_token_last_char)) {
-					$t = $this->smart_singlequote_close;
-				}
-				else {
-					$t = $this->smart_singlequote_open;
-				}
-			}
-			else if ($t == '"') {
-				# Special case: single-character " token
-				if (preg_match('/\S/', $prev_token_last_char)) {
-					$t = $this->smart_doublequote_close;
-				}
-				else {
-					$t = $this->smart_doublequote_open;
-				}
-			}
-			else {
-				# Normal case:
-				$t = $this->educateQuotes($t);
-			}
-		}
-
-		if ($this->do_stupefy) $t = $this->stupefyEntities($t);
+    ### Version ###
+
+    const  SMARTYPANTSLIB_VERSION  =  "1.8.1";
+
+
+    ### Presets
+
+    # SmartyPants does nothing at all
+    const  ATTR_DO_NOTHING             =  0;
+    # "--" for em-dashes; no en-dash support
+    const  ATTR_EM_DASH                =  1;
+    # "---" for em-dashes; "--" for en-dashes
+    const  ATTR_LONG_EM_DASH_SHORT_EN  =  2;
+    # "--" for em-dashes; "---" for en-dashes
+    const  ATTR_SHORT_EM_DASH_LONG_EN  =  3;
+    # "--" for em-dashes; "---" for en-dashes
+    const  ATTR_STUPEFY                = -1;
+
+    # The default preset: ATTR_EM_DASH
+    const  ATTR_DEFAULT  =  SmartyPants::ATTR_EM_DASH;
+
+
+    ### Standard Function Interface ###
+
+    public static function defaultTransform($text, $attr = SmartyPants::ATTR_DEFAULT) {
+    #
+    # Initialize the parser and return the result of its transform method.
+    # This will work fine for derived classes too.
+    #
+        # Take parser class on which this function was called.
+        $parser_class = \get_called_class();
+
+        # try to take parser from the static parser list
+        static $parser_list;
+        $parser =& $parser_list[$parser_class][$attr];
+
+        # create the parser if not already set
+        if (!$parser)
+            $parser = new $parser_class($attr);
+
+        # Transform text using parser.
+        return $parser->transform($text);
+    }
+
+
+    ### Configuration Variables ###
+
+    # Partial regex for matching tags to skip
+    public $tags_to_skip = 'pre|code|kbd|script|style|math';
+
+    # Options to specify which transformations to make:
+    public $do_nothing   = 0; # disable all transforms
+    public $do_quotes    = 0;
+    public $do_backticks = 0; # 1 => double only, 2 => double & single
+    public $do_dashes    = 0; # 1, 2, or 3 for the three modes described above
+    public $do_ellipses  = 0;
+    public $do_stupefy   = 0;
+    public $convert_quot = 0; # should we translate &quot; entities into normal quotes?
+
+    # Smart quote characters:
+    # Opening and closing smart double-quotes.
+    public $smart_doublequote_open  = '&#8220;';
+    public $smart_doublequote_close = '&#8221;';
+    public $smart_singlequote_open  = '&#8216;';
+    public $smart_singlequote_close = '&#8217;'; # Also apostrophe.
+
+    # ``Backtick quotes''
+    public $backtick_doublequote_open  = '&#8220;'; // replacement for ``
+    public $backtick_doublequote_close = '&#8221;'; // replacement for ''
+    public $backtick_singlequote_open  = '&#8216;'; // replacement for `
+    public $backtick_singlequote_close = '&#8217;'; // replacement for ' (also apostrophe)
+
+    # Other punctuation
+    public $em_dash = '&#8212;';
+    public $en_dash = '&#8211;';
+    public $ellipsis = '&#8230;';
+
+    ### Parser Implementation ###
+
+    public function __construct($attr = SmartyPants::ATTR_DEFAULT) {
+    #
+    # Initialize a parser with certain attributes.
+    #
+    # Parser attributes:
+    # 0 : do nothing
+    # 1 : set all
+    # 2 : set all, using old school en- and em- dash shortcuts
+    # 3 : set all, using inverted old school en and em- dash shortcuts
+    # 
+    # q : quotes
+    # b : backtick quotes (``double'' only)
+    # B : backtick quotes (``double'' and `single')
+    # d : dashes
+    # D : old school dashes
+    # i : inverted old school dashes
+    # e : ellipses
+    # w : convert &quot; entities to " for Dreamweaver users
+    #
+        if ($attr == "0") {
+            $this->do_nothing   = 1;
+        }
+        else if ($attr == "1") {
+            # Do everything, turn all options on.
+            $this->do_quotes    = 1;
+            $this->do_backticks = 1;
+            $this->do_dashes    = 1;
+            $this->do_ellipses  = 1;
+        }
+        else if ($attr == "2") {
+            # Do everything, turn all options on, use old school dash shorthand.
+            $this->do_quotes    = 1;
+            $this->do_backticks = 1;
+            $this->do_dashes    = 2;
+            $this->do_ellipses  = 1;
+        }
+        else if ($attr == "3") {
+            # Do everything, turn all options on, use inverted old school dash shorthand.
+            $this->do_quotes    = 1;
+            $this->do_backticks = 1;
+            $this->do_dashes    = 3;
+            $this->do_ellipses  = 1;
+        }
+        else if ($attr == "-1") {
+            # Special "stupefy" mode.
+            $this->do_stupefy   = 1;
+        }
+        else {
+            $chars = preg_split('//', $attr);
+            foreach ($chars as $c){
+                if      ($c == "q") { $this->do_quotes    = 1; }
+                else if ($c == "b") { $this->do_backticks = 1; }
+                else if ($c == "B") { $this->do_backticks = 2; }
+                else if ($c == "d") { $this->do_dashes    = 1; }
+                else if ($c == "D") { $this->do_dashes    = 2; }
+                else if ($c == "i") { $this->do_dashes    = 3; }
+                else if ($c == "e") { $this->do_ellipses  = 1; }
+                else if ($c == "w") { $this->convert_quot = 1; }
+                else {
+                    # Unknown attribute option, ignore.
+                }
+            }
+        }
+    }
+
+    public function transform($text) {
+
+        if ($this->do_nothing) {
+            return $text;
+        }
+
+        $tokens = $this->tokenizeHTML($text);
+        $result = '';
+        $in_pre = 0;  # Keep track of when we're inside <pre> or <code> tags.
+
+        $prev_token_last_char = ""; # This is a cheat, used to get some context
+                                    # for one-character tokens that consist of 
+                                    # just a quote char. What we do is remember
+                                    # the last character of the previous text
+                                    # token, to use as context to curl single-
+                                    # character quote tokens correctly.
+
+        foreach ($tokens as $cur_token) {
+            if ($cur_token[0] == "tag") {
+                # Don't mess with quotes inside tags.
+                $result .= $cur_token[1];
+                if (preg_match('@<(/?)(?:'.$this->tags_to_skip.')[\s>]@', $cur_token[1], $matches)) {
+                    $in_pre = isset($matches[1]) && $matches[1] == '/' ? 0 : 1;
+                }
+            } else {
+                $t = $cur_token[1];
+                $last_char = substr($t, -1); # Remember last char of this token before processing.
+                if (! $in_pre) {
+                    $t = $this->educate($t, $prev_token_last_char);
+                }
+                $prev_token_last_char = $last_char;
+                $result .= $t;
+            }
+        }
+
+        return $result;
+    }
+
+
+    function decodeEntitiesInConfiguration() {
+    #
+    #   Utility function that converts entities in configuration variables to
+    #   UTF-8 characters.
+    #
+        $output_config_vars = array(
+            'smart_doublequote_open',
+            'smart_doublequote_close',
+            'smart_singlequote_open',
+            'smart_singlequote_close',
+            'backtick_doublequote_open',
+            'backtick_doublequote_close',
+            'backtick_singlequote_open',
+            'backtick_singlequote_close',
+            'em_dash',
+            'en_dash',
+            'ellipsis',
+        );
+        foreach ($output_config_vars as $var) {
+            $this->$var = html_entity_decode($this->$var);
+        }
+    }
+
+
+    protected function educate($t, $prev_token_last_char) {
+        $t = $this->processEscapes($t);
+
+        if ($this->convert_quot) {
+            $t = preg_replace('/&quot;/', '"', $t);
+        }
+
+        if ($this->do_dashes) {
+            if ($this->do_dashes == 1) $t = $this->educateDashes($t);
+            if ($this->do_dashes == 2) $t = $this->educateDashesOldSchool($t);
+            if ($this->do_dashes == 3) $t = $this->educateDashesOldSchoolInverted($t);
+        }
+
+        if ($this->do_ellipses) $t = $this->educateEllipses($t);
+
+        # Note: backticks need to be processed before quotes.
+        if ($this->do_backticks) {
+            $t = $this->educateBackticks($t);
+            if ($this->do_backticks == 2) $t = $this->educateSingleBackticks($t);
+        }
+
+        if ($this->do_quotes) {
+            if ($t == "'") {
+                # Special case: single-character ' token
+                if (preg_match('/\S/', $prev_token_last_char)) {
+                    $t = $this->smart_singlequote_close;
+                }
+                else {
+                    $t = $this->smart_singlequote_open;
+                }
+            }
+            else if ($t == '"') {
+                # Special case: single-character " token
+                if (preg_match('/\S/', $prev_token_last_char)) {
+                    $t = $this->smart_doublequote_close;
+                }
+                else {
+                    $t = $this->smart_doublequote_open;
+                }
+            }
+            else {
+                # Normal case:
+                $t = $this->educateQuotes($t);
+            }
+        }
+
+        if ($this->do_stupefy) $t = $this->stupefyEntities($t);
 		
-		return $t;
-	}
-
-
-	protected function educateQuotes($_) {
-	#
-	#   Parameter:  String.
-	#
-	#   Returns:    The string, with "educated" curly quote HTML entities.
-	#
-	#   Example input:  "Isn't this fun?"
-	#   Example output: &#8220;Isn&#8217;t this fun?&#8221;
-	#
-		$dq_open  = $this->smart_doublequote_open;
-		$dq_close = $this->smart_doublequote_close;
-		$sq_open  = $this->smart_singlequote_open;
-		$sq_close = $this->smart_singlequote_close;
+        return $t;
+    }
+
+
+    protected function educateQuotes($_) {
+    #
+    #   Parameter:  String.
+    #
+    #   Returns:    The string, with "educated" curly quote HTML entities.
+    #
+    #   Example input:  "Isn't this fun?"
+    #   Example output: &#8220;Isn&#8217;t this fun?&#8221;
+    #
+        $dq_open  = $this->smart_doublequote_open;
+        $dq_close = $this->smart_doublequote_close;
+        $sq_open  = $this->smart_singlequote_open;
+        $sq_close = $this->smart_singlequote_close;
 	
-		# Make our own "punctuation" character class, because the POSIX-style
-		# [:PUNCT:] is only available in Perl 5.6 or later:
-		$punct_class = "[!\"#\\$\\%'()*+,-.\\/:;<=>?\\@\\[\\\\\]\\^_`{|}~]";
-
-		# Special case if the very first character is a quote
-		# followed by punctuation at a non-word-break. Close the quotes by brute force:
-		$_ = preg_replace(
-			array("/^'(?=$punct_class\\B)/", "/^\"(?=$punct_class\\B)/"),
-			array($sq_close,                 $dq_close), $_);
-
-		# Special case for double sets of quotes, e.g.:
-		#   <p>He said, "'Quoted' words in a larger quote."</p>
-		$_ = preg_replace(
-			array("/\"'(?=\w)/",     "/'\"(?=\w)/"),
-			array($dq_open.$sq_open, $sq_open.$dq_open), $_);
-
-		# Special case for decade abbreviations (the '80s):
-		$_ = preg_replace("/'(?=\\d{2}s)/", $sq_close, $_);
-
-		$close_class = '[^\ \t\r\n\[\{\(\-]';
-		$dec_dashes = '&\#8211;|&\#8212;';
-
-		# Get most opening single quotes:
-		$_ = preg_replace("{
+        # Make our own "punctuation" character class, because the POSIX-style
+        # [:PUNCT:] is only available in Perl 5.6 or later:
+        $punct_class = "[!\"#\\$\\%'()*+,-.\\/:;<=>?\\@\\[\\\\\]\\^_`{|}~]";
+
+        # Special case if the very first character is a quote
+        # followed by punctuation at a non-word-break. Close the quotes by brute force:
+        $_ = preg_replace(
+            array("/^'(?=$punct_class\\B)/", "/^\"(?=$punct_class\\B)/"),
+            array($sq_close,                 $dq_close), $_);
+
+        # Special case for double sets of quotes, e.g.:
+        #   <p>He said, "'Quoted' words in a larger quote."</p>
+        $_ = preg_replace(
+            array("/\"'(?=\w)/",     "/'\"(?=\w)/"),
+            array($dq_open.$sq_open, $sq_open.$dq_open), $_);
+
+        # Special case for decade abbreviations (the '80s):
+        $_ = preg_replace("/'(?=\\d{2}s)/", $sq_close, $_);
+
+        $close_class = '[^\ \t\r\n\[\{\(\-]';
+        $dec_dashes = '&\#8211;|&\#8212;';
+
+        # Get most opening single quotes:
+        $_ = preg_replace("{
 			(
 				\\s          |   # a whitespace char, or
 				&nbsp;      |   # a non-breaking space entity, or
@@ -327,8 +327,8 @@ 
 			'                   # the quote
 			(?=\\w)              # followed by a word character
 			}x", '\1'.$sq_open, $_);
-		# Single closing quotes:
-		$_ = preg_replace("{
+        # Single closing quotes:
+        $_ = preg_replace("{
 			($close_class)?
 			'
 			(?(1)|          # If $1 captured, then do nothing;
@@ -338,12 +338,12 @@ 
 							# \"<i>Custer</i>'s Last Stand.\"
 			}xi", '\1'.$sq_close, $_);
 
-		# Any remaining single quotes should be opening ones:
-		$_ = str_replace("'", $sq_open, $_);
+        # Any remaining single quotes should be opening ones:
+        $_ = str_replace("'", $sq_open, $_);
 
 
-		# Get most opening double quotes:
-		$_ = preg_replace("{
+        # Get most opening double quotes:
+        $_ = preg_replace("{
 			(
 				\\s          |   # a whitespace char, or
 				&nbsp;      |   # a non-breaking space entity, or
@@ -356,205 +356,205 @@ 
 			(?=\\w)              # followed by a word character
 			}x", '\1'.$dq_open, $_);
 
-		# Double closing quotes:
-		$_ = preg_replace("{
+        # Double closing quotes:
+        $_ = preg_replace("{
 			($close_class)?
 			\"
 			(?(1)|(?=\\s))   # If $1 captured, then do nothing;
 							   # if not, then make sure the next char is whitespace.
 			}x", '\1'.$dq_close, $_);
 
-		# Any remaining quotes should be opening ones.
-		$_ = str_replace('"', $dq_open, $_);
-
-		return $_;
-	}
-
-
-	protected function educateBackticks($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with ``backticks'' -style double quotes
-	#               translated into HTML curly quote entities.
-	#
-	#   Example input:  ``Isn't this fun?''
-	#   Example output: &#8220;Isn't this fun?&#8221;
-	#
-
-		$_ = str_replace(array("``", "''",),
-						 array($this->backtick_doublequote_open,
-							   $this->backtick_doublequote_close), $_);
-		return $_;
-	}
-
-
-	protected function educateSingleBackticks($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with `backticks' -style single quotes
-	#               translated into HTML curly quote entities.
-	#
-	#   Example input:  `Isn't this fun?'
-	#   Example output: &#8216;Isn&#8217;t this fun?&#8217;
-	#
-
-		$_ = str_replace(array("`",       "'",),
-						 array($this->backtick_singlequote_open,
-							   $this->backtick_singlequote_close), $_);
-		return $_;
-	}
-
-
-	protected function educateDashes($_) {
-	#
-	#   Parameter:  String.
-	#
-	#   Returns:    The string, with each instance of "--" translated to
-	#               an em-dash HTML entity.
-	#
-
-		$_ = str_replace('--', $this->em_dash, $_);
-		return $_;
-	}
-
-
-	protected function educateDashesOldSchool($_) {
-	#
-	#   Parameter:  String.
-	#
-	#   Returns:    The string, with each instance of "--" translated to
-	#               an en-dash HTML entity, and each "---" translated to
-	#               an em-dash HTML entity.
-	#
-
-		#                      em              en
-		$_ = str_replace(array("---",          "--",),
-						 array($this->em_dash, $this->en_dash), $_);
-		return $_;
-	}
-
-
-	protected function educateDashesOldSchoolInverted($_) {
-	#
-	#   Parameter:  String.
-	#
-	#   Returns:    The string, with each instance of "--" translated to
-	#               an em-dash HTML entity, and each "---" translated to
-	#               an en-dash HTML entity. Two reasons why: First, unlike the
-	#               en- and em-dash syntax supported by
-	#               EducateDashesOldSchool(), it's compatible with existing
-	#               entries written before SmartyPants 1.1, back when "--" was
-	#               only used for em-dashes.  Second, em-dashes are more
-	#               common than en-dashes, and so it sort of makes sense that
-	#               the shortcut should be shorter to type. (Thanks to Aaron
-	#               Swartz for the idea.)
-	#
-
-		#                      en              em
-		$_ = str_replace(array("---",          "--",),
-						 array($this->en_dash, $this->em_dash), $_);
-		return $_;
-	}
-
-
-	protected function educateEllipses($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with each instance of "..." translated to
-	#               an ellipsis HTML entity. Also converts the case where
-	#               there are spaces between the dots.
-	#
-	#   Example input:  Huh...?
-	#   Example output: Huh&#8230;?
-	#
-
-		$_ = str_replace(array("...",     ". . .",), $this->ellipsis, $_);
-		return $_;
-	}
-
-
-	protected function stupefyEntities($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with each SmartyPants HTML entity translated to
-	#               its ASCII counterpart.
-	#
-	#   Example input:  &#8220;Hello &#8212; world.&#8221;
-	#   Example output: "Hello -- world."
-	#
-
-							#  en-dash    em-dash
-		$_ = str_replace(array('&#8211;', '&#8212;'),
-						 array('-',       '--'), $_);
-
-		# single quote         open       close
-		$_ = str_replace(array('&#8216;', '&#8217;'), "'", $_);
-
-		# double quote         open       close
-		$_ = str_replace(array('&#8220;', '&#8221;'), '"', $_);
-
-		$_ = str_replace('&#8230;', '...', $_); # ellipsis
-
-		return $_;
-	}
-
-
-	protected function processEscapes($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with after processing the following backslash
-	#               escape sequences. This is useful if you want to force a "dumb"
-	#               quote or other character to appear.
-	#
-	#               Escape  Value
-	#               ------  -----
-	#               \\      &#92;
-	#               \"      &#34;
-	#               \'      &#39;
-	#               \.      &#46;
-	#               \-      &#45;
-	#               \`      &#96;
-	#
-		$_ = str_replace(
-			array('\\\\',  '\"',    "\'",    '\.',    '\-',    '\`'),
-			array('&#92;', '&#34;', '&#39;', '&#46;', '&#45;', '&#96;'), $_);
-
-		return $_;
-	}
-
-
-	protected function tokenizeHTML($str) {
-	#
-	#   Parameter:  String containing HTML markup.
-	#   Returns:    An array of the tokens comprising the input
-	#               string. Each token is either a tag (possibly with nested,
-	#               tags contained therein, such as <a href="<MTFoo>">, or a
-	#               run of text between tags. Each element of the array is a
-	#               two-element array; the first is either 'tag' or 'text';
-	#               the second is the actual value.
-	#
-	#
-	#   Regular expression derived from the _tokenize() subroutine in 
-	#   Brad Choate's MTRegex plugin.
-	#   <http://www.bradchoate.com/past/mtregex.php>
-	#
-		$index = 0;
-		$tokens = array();
-
-		$match = '(?s:<!--.*?-->)|'.	# comment
-				 '(?s:<\?.*?\?>)|'.				# processing instruction
-												# regular tags
-				 '(?:<[/!$]?[-a-zA-Z0-9:]+\b(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*>)'; 
-
-		$parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-		foreach ($parts as $part) {
-			if (++$index % 2 && $part != '') 
-				$tokens[] = array('text', $part);
-			else
-				$tokens[] = array('tag', $part);
-		}
-		return $tokens;
-	}
+        # Any remaining quotes should be opening ones.
+        $_ = str_replace('"', $dq_open, $_);
+
+        return $_;
+    }
+
+
+    protected function educateBackticks($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with ``backticks'' -style double quotes
+    #               translated into HTML curly quote entities.
+    #
+    #   Example input:  ``Isn't this fun?''
+    #   Example output: &#8220;Isn't this fun?&#8221;
+    #
+
+        $_ = str_replace(array("``", "''",),
+                            array($this->backtick_doublequote_open,
+                                $this->backtick_doublequote_close), $_);
+        return $_;
+    }
+
+
+    protected function educateSingleBackticks($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with `backticks' -style single quotes
+    #               translated into HTML curly quote entities.
+    #
+    #   Example input:  `Isn't this fun?'
+    #   Example output: &#8216;Isn&#8217;t this fun?&#8217;
+    #
+
+        $_ = str_replace(array("`",       "'",),
+                            array($this->backtick_singlequote_open,
+                                $this->backtick_singlequote_close), $_);
+        return $_;
+    }
+
+
+    protected function educateDashes($_) {
+    #
+    #   Parameter:  String.
+    #
+    #   Returns:    The string, with each instance of "--" translated to
+    #               an em-dash HTML entity.
+    #
+
+        $_ = str_replace('--', $this->em_dash, $_);
+        return $_;
+    }
+
+
+    protected function educateDashesOldSchool($_) {
+    #
+    #   Parameter:  String.
+    #
+    #   Returns:    The string, with each instance of "--" translated to
+    #               an en-dash HTML entity, and each "---" translated to
+    #               an em-dash HTML entity.
+    #
+
+        #                      em              en
+        $_ = str_replace(array("---",          "--",),
+                            array($this->em_dash, $this->en_dash), $_);
+        return $_;
+    }
+
+
+    protected function educateDashesOldSchoolInverted($_) {
+    #
+    #   Parameter:  String.
+    #
+    #   Returns:    The string, with each instance of "--" translated to
+    #               an em-dash HTML entity, and each "---" translated to
+    #               an en-dash HTML entity. Two reasons why: First, unlike the
+    #               en- and em-dash syntax supported by
+    #               EducateDashesOldSchool(), it's compatible with existing
+    #               entries written before SmartyPants 1.1, back when "--" was
+    #               only used for em-dashes.  Second, em-dashes are more
+    #               common than en-dashes, and so it sort of makes sense that
+    #               the shortcut should be shorter to type. (Thanks to Aaron
+    #               Swartz for the idea.)
+    #
+
+        #                      en              em
+        $_ = str_replace(array("---",          "--",),
+                            array($this->en_dash, $this->em_dash), $_);
+        return $_;
+    }
+
+
+    protected function educateEllipses($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with each instance of "..." translated to
+    #               an ellipsis HTML entity. Also converts the case where
+    #               there are spaces between the dots.
+    #
+    #   Example input:  Huh...?
+    #   Example output: Huh&#8230;?
+    #
+
+        $_ = str_replace(array("...",     ". . .",), $this->ellipsis, $_);
+        return $_;
+    }
+
+
+    protected function stupefyEntities($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with each SmartyPants HTML entity translated to
+    #               its ASCII counterpart.
+    #
+    #   Example input:  &#8220;Hello &#8212; world.&#8221;
+    #   Example output: "Hello -- world."
+    #
+
+                            #  en-dash    em-dash
+        $_ = str_replace(array('&#8211;', '&#8212;'),
+                            array('-',       '--'), $_);
+
+        # single quote         open       close
+        $_ = str_replace(array('&#8216;', '&#8217;'), "'", $_);
+
+        # double quote         open       close
+        $_ = str_replace(array('&#8220;', '&#8221;'), '"', $_);
+
+        $_ = str_replace('&#8230;', '...', $_); # ellipsis
+
+        return $_;
+    }
+
+
+    protected function processEscapes($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with after processing the following backslash
+    #               escape sequences. This is useful if you want to force a "dumb"
+    #               quote or other character to appear.
+    #
+    #               Escape  Value
+    #               ------  -----
+    #               \\      &#92;
+    #               \"      &#34;
+    #               \'      &#39;
+    #               \.      &#46;
+    #               \-      &#45;
+    #               \`      &#96;
+    #
+        $_ = str_replace(
+            array('\\\\',  '\"',    "\'",    '\.',    '\-',    '\`'),
+            array('&#92;', '&#34;', '&#39;', '&#46;', '&#45;', '&#96;'), $_);
+
+        return $_;
+    }
+
+
+    protected function tokenizeHTML($str) {
+    #
+    #   Parameter:  String containing HTML markup.
+    #   Returns:    An array of the tokens comprising the input
+    #               string. Each token is either a tag (possibly with nested,
+    #               tags contained therein, such as <a href="<MTFoo>">, or a
+    #               run of text between tags. Each element of the array is a
+    #               two-element array; the first is either 'tag' or 'text';
+    #               the second is the actual value.
+    #
+    #
+    #   Regular expression derived from the _tokenize() subroutine in 
+    #   Brad Choate's MTRegex plugin.
+    #   <http://www.bradchoate.com/past/mtregex.php>
+    #
+        $index = 0;
+        $tokens = array();
+
+        $match = '(?s:<!--.*?-->)|'.	# comment
+                    '(?s:<\?.*?\?>)|'.				# processing instruction
+                                                # regular tags
+                    '(?:<[/!$]?[-a-zA-Z0-9:]+\b(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*>)'; 
+
+        $parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        foreach ($parts as $part) {
+            if (++$index % 2 && $part != '') 
+                $tokens[] = array('text', $part);
+            else
+                $tokens[] = array('tag', $part);
+        }
+        return $tokens;
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -21,24 +21,24 @@ 
 
 	### Version ###
 
-	const  SMARTYPANTSLIB_VERSION  =  "1.8.1";
+	const  SMARTYPANTSLIB_VERSION = "1.8.1";
 
 
 	### Presets
 
 	# SmartyPants does nothing at all
-	const  ATTR_DO_NOTHING             =  0;
+	const  ATTR_DO_NOTHING             = 0;
 	# "--" for em-dashes; no en-dash support
-	const  ATTR_EM_DASH                =  1;
+	const  ATTR_EM_DASH                = 1;
 	# "---" for em-dashes; "--" for en-dashes
-	const  ATTR_LONG_EM_DASH_SHORT_EN  =  2;
+	const  ATTR_LONG_EM_DASH_SHORT_EN  = 2;
 	# "--" for em-dashes; "---" for en-dashes
-	const  ATTR_SHORT_EM_DASH_LONG_EN  =  3;
+	const  ATTR_SHORT_EM_DASH_LONG_EN  = 3;
 	# "--" for em-dashes; "---" for en-dashes
 	const  ATTR_STUPEFY                = -1;
 
 	# The default preset: ATTR_EM_DASH
-	const  ATTR_DEFAULT  =  SmartyPants::ATTR_EM_DASH;
+	const  ATTR_DEFAULT = SmartyPants::ATTR_EM_DASH;
 
 
 	### Standard Function Interface ###
@@ -53,7 +53,7 @@ 
 
 		# try to take parser from the static parser list
 		static $parser_list;
-		$parser =& $parser_list[$parser_class][$attr];
+		$parser = & $parser_list[$parser_class][$attr];
 
 		# create the parser if not already set
 		if (!$parser)
@@ -118,7 +118,7 @@ 
 	# w : convert " entities to " for Dreamweaver users
 	#
 		if ($attr == "0") {
-			$this->do_nothing   = 1;
+			$this->do_nothing = 1;
 		}
 		else if ($attr == "1") {
 			# Do everything, turn all options on.
@@ -143,12 +143,12 @@ 
 		}
 		else if ($attr == "-1") {
 			# Special "stupefy" mode.
-			$this->do_stupefy   = 1;
+			$this->do_stupefy = 1;
 		}
 		else {
 			$chars = preg_split('//', $attr);
-			foreach ($chars as $c){
-				if      ($c == "q") { $this->do_quotes    = 1; }
+			foreach ($chars as $c) {
+				if ($c == "q") { $this->do_quotes    = 1; }
 				else if ($c == "b") { $this->do_backticks = 1; }
 				else if ($c == "B") { $this->do_backticks = 2; }
 				else if ($c == "d") { $this->do_dashes    = 1; }
@@ -171,7 +171,7 @@ 
 
 		$tokens = $this->tokenizeHTML($text);
 		$result = '';
-		$in_pre = 0;  # Keep track of when we're inside <pre> or <code> tags.
+		$in_pre = 0; # Keep track of when we're inside <pre> or <code> tags.
 
 		$prev_token_last_char = ""; # This is a cheat, used to get some context
 									# for one-character tokens that consist of 
@@ -184,13 +184,13 @@ 
 			if ($cur_token[0] == "tag") {
 				# Don't mess with quotes inside tags.
 				$result .= $cur_token[1];
-				if (preg_match('@<(/?)(?:'.$this->tags_to_skip.')[\s>]@', $cur_token[1], $matches)) {
+				if (preg_match('@<(/?)(?:' . $this->tags_to_skip . ')[\s>]@', $cur_token[1], $matches)) {
 					$in_pre = isset($matches[1]) && $matches[1] == '/' ? 0 : 1;
 				}
 			} else {
 				$t = $cur_token[1];
 				$last_char = substr($t, -1); # Remember last char of this token before processing.
-				if (! $in_pre) {
+				if (!$in_pre) {
 					$t = $this->educate($t, $prev_token_last_char);
 				}
 				$prev_token_last_char = $last_char;
@@ -300,13 +300,13 @@ 
 		# followed by punctuation at a non-word-break. Close the quotes by brute force:
 		$_ = preg_replace(
 			array("/^'(?=$punct_class\\B)/", "/^\"(?=$punct_class\\B)/"),
-			array($sq_close,                 $dq_close), $_);
+			array($sq_close, $dq_close), $_);
 
 		# Special case for double sets of quotes, e.g.:
 		#   <p>He said, "'Quoted' words in a larger quote."</p>
 		$_ = preg_replace(
-			array("/\"'(?=\w)/",     "/'\"(?=\w)/"),
-			array($dq_open.$sq_open, $sq_open.$dq_open), $_);
+			array("/\"'(?=\w)/", "/'\"(?=\w)/"),
+			array($dq_open . $sq_open, $sq_open . $dq_open), $_);
 
 		# Special case for decade abbreviations (the '80s):
 		$_ = preg_replace("/'(?=\\d{2}s)/", $sq_close, $_);
@@ -326,7 +326,7 @@ 
 			)
 			'                   # the quote
 			(?=\\w)              # followed by a word character
-			}x", '\1'.$sq_open, $_);
+			}x", '\1' . $sq_open, $_);
 		# Single closing quotes:
 		$_ = preg_replace("{
 			($close_class)?
@@ -336,7 +336,7 @@ 
 			)               # char or an 's' at a word ending position. This
 							# is a special case to handle something like:
 							# \"<i>Custer</i>'s Last Stand.\"
-			}xi", '\1'.$sq_close, $_);
+			}xi", '\1' . $sq_close, $_);
 
 		# Any remaining single quotes should be opening ones:
 		$_ = str_replace("'", $sq_open, $_);
@@ -354,7 +354,7 @@ 
 			)
 			\"                   # the quote
 			(?=\\w)              # followed by a word character
-			}x", '\1'.$dq_open, $_);
+			}x", '\1' . $dq_open, $_);
 
 		# Double closing quotes:
 		$_ = preg_replace("{
@@ -362,7 +362,7 @@ 
 			\"
 			(?(1)|(?=\\s))   # If $1 captured, then do nothing;
 							   # if not, then make sure the next char is whitespace.
-			}x", '\1'.$dq_close, $_);
+			}x", '\1' . $dq_close, $_);
 
 		# Any remaining quotes should be opening ones.
 		$_ = str_replace('"', $dq_open, $_);
@@ -398,7 +398,7 @@ 
 	#   Example output: &#8216;Isn&#8217;t this fun?&#8217;
 	#
 
-		$_ = str_replace(array("`",       "'",),
+		$_ = str_replace(array("`", "'",),
 						 array($this->backtick_singlequote_open,
 							   $this->backtick_singlequote_close), $_);
 		return $_;
@@ -428,7 +428,7 @@ 
 	#
 
 		#                      em              en
-		$_ = str_replace(array("---",          "--",),
+		$_ = str_replace(array("---", "--",),
 						 array($this->em_dash, $this->en_dash), $_);
 		return $_;
 	}
@@ -451,7 +451,7 @@ 
 	#
 
 		#                      en              em
-		$_ = str_replace(array("---",          "--",),
+		$_ = str_replace(array("---", "--",),
 						 array($this->en_dash, $this->em_dash), $_);
 		return $_;
 	}
@@ -468,7 +468,7 @@ 
 	#   Example output: Huh&#8230;?
 	#
 
-		$_ = str_replace(array("...",     ". . .",), $this->ellipsis, $_);
+		$_ = str_replace(array("...", ". . .",), $this->ellipsis, $_);
 		return $_;
 	}
 
@@ -485,7 +485,7 @@ 
 
 							#  en-dash    em-dash
 		$_ = str_replace(array('&#8211;', '&#8212;'),
-						 array('-',       '--'), $_);
+						 array('-', '--'), $_);
 
 		# single quote         open       close
 		$_ = str_replace(array('&#8216;', '&#8217;'), "'", $_);
@@ -516,7 +516,7 @@ 
 	#               \`      &#96;
 	#
 		$_ = str_replace(
-			array('\\\\',  '\"',    "\'",    '\.',    '\-',    '\`'),
+			array('\\\\', '\"', "\'", '\.', '\-', '\`'),
 			array('&#92;', '&#34;', '&#39;', '&#46;', '&#45;', '&#96;'), $_);
 
 		return $_;
@@ -541,15 +541,15 @@ 
 		$index = 0;
 		$tokens = array();
 
-		$match = '(?s:<!--.*?-->)|'.	# comment
-				 '(?s:<\?.*?\?>)|'.				# processing instruction
+		$match = '(?s:<!--.*?-->)|' . # comment
+				 '(?s:<\?.*?\?>)|' . # processing instruction
 												# regular tags
 				 '(?:<[/!$]?[-a-zA-Z0-9:]+\b(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*>)'; 
 
 		$parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
 
 		foreach ($parts as $part) {
-			if (++$index % 2 && $part != '') 
+			if (++$index%2 && $part != '') 
 				$tokens[] = array('text', $part);
 			else
 				$tokens[] = array('tag', $part);

Braces +36 added lines, -39 removed lines

@@ -56,8 +56,9 @@ 
 		$parser =& $parser_list[$parser_class][$attr];
 
 		# create the parser if not already set
-		if (!$parser)
-			$parser = new $parser_class($attr);
+		if (!$parser) {
+					$parser = new $parser_class($attr);
+		}
 
 		# Transform text using parser.
 		return $parser->transform($text);
@@ -119,44 +120,31 @@ 
 	#
 		if ($attr == "0") {
 			$this->do_nothing   = 1;
-		}
-		else if ($attr == "1") {
+		} else if ($attr == "1") {
 			# Do everything, turn all options on.
 			$this->do_quotes    = 1;
 			$this->do_backticks = 1;
 			$this->do_dashes    = 1;
 			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "2") {
+		} else if ($attr == "2") {
 			# Do everything, turn all options on, use old school dash shorthand.
 			$this->do_quotes    = 1;
 			$this->do_backticks = 1;
 			$this->do_dashes    = 2;
 			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "3") {
+		} else if ($attr == "3") {
 			# Do everything, turn all options on, use inverted old school dash shorthand.
 			$this->do_quotes    = 1;
 			$this->do_backticks = 1;
 			$this->do_dashes    = 3;
 			$this->do_ellipses  = 1;
-		}
-		else if ($attr == "-1") {
+		} else if ($attr == "-1") {
 			# Special "stupefy" mode.
 			$this->do_stupefy   = 1;
-		}
-		else {
+		} else {
 			$chars = preg_split('//', $attr);
 			foreach ($chars as $c){
-				if      ($c == "q") { $this->do_quotes    = 1; }
-				else if ($c == "b") { $this->do_backticks = 1; }
-				else if ($c == "B") { $this->do_backticks = 2; }
-				else if ($c == "d") { $this->do_dashes    = 1; }
-				else if ($c == "D") { $this->do_dashes    = 2; }
-				else if ($c == "i") { $this->do_dashes    = 3; }
-				else if ($c == "e") { $this->do_ellipses  = 1; }
-				else if ($c == "w") { $this->convert_quot = 1; }
-				else {
+				if      ($c == "q") { $this->do_quotes    = 1; } else if ($c == "b") { $this->do_backticks = 1; } else if ($c == "B") { $this->do_backticks = 2; } else if ($c == "d") { $this->do_dashes    = 1; } else if ($c == "D") { $this->do_dashes    = 2; } else if ($c == "i") { $this->do_dashes    = 3; } else if ($c == "e") { $this->do_ellipses  = 1; } else if ($c == "w") { $this->convert_quot = 1; } else {
 					# Unknown attribute option, ignore.
 				}
 			}
@@ -234,17 +222,27 @@ 
 		}
 
 		if ($this->do_dashes) {
-			if ($this->do_dashes == 1) $t = $this->educateDashes($t);
-			if ($this->do_dashes == 2) $t = $this->educateDashesOldSchool($t);
-			if ($this->do_dashes == 3) $t = $this->educateDashesOldSchoolInverted($t);
+			if ($this->do_dashes == 1) {
+			    $t = $this->educateDashes($t);
+			}
+			if ($this->do_dashes == 2) {
+			    $t = $this->educateDashesOldSchool($t);
+			}
+			if ($this->do_dashes == 3) {
+			    $t = $this->educateDashesOldSchoolInverted($t);
+			}
 		}
 
-		if ($this->do_ellipses) $t = $this->educateEllipses($t);
+		if ($this->do_ellipses) {
+		    $t = $this->educateEllipses($t);
+		}
 
 		# Note: backticks need to be processed before quotes.
 		if ($this->do_backticks) {
 			$t = $this->educateBackticks($t);
-			if ($this->do_backticks == 2) $t = $this->educateSingleBackticks($t);
+			if ($this->do_backticks == 2) {
+			    $t = $this->educateSingleBackticks($t);
+			}
 		}
 
 		if ($this->do_quotes) {
@@ -252,27 +250,25 @@ 
 				# Special case: single-character ' token
 				if (preg_match('/\S/', $prev_token_last_char)) {
 					$t = $this->smart_singlequote_close;
-				}
-				else {
+				} else {
 					$t = $this->smart_singlequote_open;
 				}
-			}
-			else if ($t == '"') {
+			} else if ($t == '"') {
 				# Special case: single-character " token
 				if (preg_match('/\S/', $prev_token_last_char)) {
 					$t = $this->smart_doublequote_close;
-				}
-				else {
+				} else {
 					$t = $this->smart_doublequote_open;
 				}
-			}
-			else {
+			} else {
 				# Normal case:
 				$t = $this->educateQuotes($t);
 			}
 		}
 
-		if ($this->do_stupefy) $t = $this->stupefyEntities($t);
+		if ($this->do_stupefy) {
+		    $t = $this->stupefyEntities($t);
+		}
 		
 		return $t;
 	}
@@ -549,10 +545,11 @@ 
 		$parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
 
 		foreach ($parts as $part) {
-			if (++$index % 2 && $part != '') 
-				$tokens[] = array('text', $part);
-			else
-				$tokens[] = array('tag', $part);
+			if (++$index % 2 && $part != '') {
+							$tokens[] = array('text', $part);
+			} else {
+							$tokens[] = array('tag', $part);
+			}
 		}
 		return $tokens;
 	}

a/vendor/michelf/php-smartypants/Michelf/SmartyPantsTypographer.php

Indentation +422 added lines, -422 removed lines

@@ -18,374 +18,374 @@ 
 #
 class SmartyPantsTypographer extends \Michelf\SmartyPants {
 
-	### Configuration Variables ###
-
-	# Options to specify which transformations to make:
-	public $do_comma_quotes      = 0;
-	public $do_guillemets        = 0;
-	public $do_geresh_gershayim  = 0;
-	public $do_space_emdash      = 0;
-	public $do_space_endash      = 0;
-	public $do_space_colon       = 0;
-	public $do_space_semicolon   = 0;
-	public $do_space_marks       = 0;
-	public $do_space_frenchquote = 0;
-	public $do_space_thousand    = 0;
-	public $do_space_unit        = 0;
-
-	# Quote characters for replacing ASCII approximations
-	public $doublequote_low         = "„"; // replacement for ,,
-	public $guillemet_leftpointing  = "&#171;"; // replacement for <<
-	public $guillemet_rightpointing = "&#187;"; // replacement for >>
-	public $geresh    = "&#1523;";
-	public $gershayim = "&#1524;";
-
-	# Space characters for different places:
-	# Space around em-dashes.  "He_—_or she_—_should change that."
-	public $space_emdash      = " ";
-	# Space around en-dashes.  "He_–_or she_–_should change that."
-	public $space_endash      = " ";
-	# Space before a colon. "He said_: here it is."
-	public $space_colon       = "&#160;";
-	# Space before a semicolon. "That's what I said_; that's what he said."
-	public $space_semicolon   = "&#160;";
-	# Space before a question mark and an exclamation mark: "¡_Holà_! What_?"
-	public $space_marks       = "&#160;";
-	# Space inside french quotes. "Voici la «_chose_» qui m'a attaqué."
-	public $space_frenchquote = "&#160;";
-	# Space as thousand separator. "On compte 10_000 maisons sur cette liste."
-	public $space_thousand    = "&#160;";
-	# Space before a unit abreviation. "This 12_kg of matter costs 10_$."
-	public $space_unit        = "&#160;";
+    ### Configuration Variables ###
+
+    # Options to specify which transformations to make:
+    public $do_comma_quotes      = 0;
+    public $do_guillemets        = 0;
+    public $do_geresh_gershayim  = 0;
+    public $do_space_emdash      = 0;
+    public $do_space_endash      = 0;
+    public $do_space_colon       = 0;
+    public $do_space_semicolon   = 0;
+    public $do_space_marks       = 0;
+    public $do_space_frenchquote = 0;
+    public $do_space_thousand    = 0;
+    public $do_space_unit        = 0;
+
+    # Quote characters for replacing ASCII approximations
+    public $doublequote_low         = "&#8222;"; // replacement for ,,
+    public $guillemet_leftpointing  = "&#171;"; // replacement for <<
+    public $guillemet_rightpointing = "&#187;"; // replacement for >>
+    public $geresh    = "&#1523;";
+    public $gershayim = "&#1524;";
+
+    # Space characters for different places:
+    # Space around em-dashes.  "He_—_or she_—_should change that."
+    public $space_emdash      = " ";
+    # Space around en-dashes.  "He_–_or she_–_should change that."
+    public $space_endash      = " ";
+    # Space before a colon. "He said_: here it is."
+    public $space_colon       = "&#160;";
+    # Space before a semicolon. "That's what I said_; that's what he said."
+    public $space_semicolon   = "&#160;";
+    # Space before a question mark and an exclamation mark: "¡_Holà_! What_?"
+    public $space_marks       = "&#160;";
+    # Space inside french quotes. "Voici la «_chose_» qui m'a attaqué."
+    public $space_frenchquote = "&#160;";
+    # Space as thousand separator. "On compte 10_000 maisons sur cette liste."
+    public $space_thousand    = "&#160;";
+    # Space before a unit abreviation. "This 12_kg of matter costs 10_$."
+    public $space_unit        = "&#160;";
 
 	
-	# Expression of a space (breakable or not):
-	public $space = '(?: | |&nbsp;|&#0*160;|&#x0*[aA]0;)';
-
-
-	### Parser Implementation ###
-
-	public function __construct($attr = SmartyPants::ATTR_DEFAULT) {
-	#
-	# Initialize a SmartyPantsTypographer_Parser with certain attributes.
-	#
-	# Parser attributes:
-	# 0 : do nothing
-	# 1 : set all, except dash spacing
-	# 2 : set all, except dash spacing, using old school en- and em- dash shortcuts
-	# 3 : set all, except dash spacing, using inverted old school en and em- dash shortcuts
-	# 
-	# Punctuation:
-	# q -> quotes
-	# b -> backtick quotes (``double'' only)
-	# B -> backtick quotes (``double'' and `single')
-	# c -> comma quotes (,,double`` only)
-	# g -> guillemets (<<double>> only)
-	# d -> dashes
-	# D -> old school dashes
-	# i -> inverted old school dashes
-	# e -> ellipses
-	# w -> convert &quot; entities to " for Dreamweaver users
-	#
-	# Spacing:
-	# : -> colon spacing +-
-	# ; -> semicolon spacing +-
-	# m -> question and exclamation marks spacing +-
-	# h -> em-dash spacing +-
-	# H -> en-dash spacing +-
-	# f -> french quote spacing +-
-	# t -> thousand separator spacing -
-	# u -> unit spacing +-
-	#   (you can add a plus sign after some of these options denoted by + to 
-	#    add the space when it is not already present, or you can add a minus 
-	#    sign to completly remove any space present)
-	#
-		# Initialize inherited SmartyPants parser.
-		parent::__construct($attr);
+    # Expression of a space (breakable or not):
+    public $space = '(?: | |&nbsp;|&#0*160;|&#x0*[aA]0;)';
+
+
+    ### Parser Implementation ###
+
+    public function __construct($attr = SmartyPants::ATTR_DEFAULT) {
+    #
+    # Initialize a SmartyPantsTypographer_Parser with certain attributes.
+    #
+    # Parser attributes:
+    # 0 : do nothing
+    # 1 : set all, except dash spacing
+    # 2 : set all, except dash spacing, using old school en- and em- dash shortcuts
+    # 3 : set all, except dash spacing, using inverted old school en and em- dash shortcuts
+    # 
+    # Punctuation:
+    # q -> quotes
+    # b -> backtick quotes (``double'' only)
+    # B -> backtick quotes (``double'' and `single')
+    # c -> comma quotes (,,double`` only)
+    # g -> guillemets (<<double>> only)
+    # d -> dashes
+    # D -> old school dashes
+    # i -> inverted old school dashes
+    # e -> ellipses
+    # w -> convert &quot; entities to " for Dreamweaver users
+    #
+    # Spacing:
+    # : -> colon spacing +-
+    # ; -> semicolon spacing +-
+    # m -> question and exclamation marks spacing +-
+    # h -> em-dash spacing +-
+    # H -> en-dash spacing +-
+    # f -> french quote spacing +-
+    # t -> thousand separator spacing -
+    # u -> unit spacing +-
+    #   (you can add a plus sign after some of these options denoted by + to 
+    #    add the space when it is not already present, or you can add a minus 
+    #    sign to completly remove any space present)
+    #
+        # Initialize inherited SmartyPants parser.
+        parent::__construct($attr);
 				
-		if ($attr == "1" || $attr == "2" || $attr == "3") {
-			# Do everything, turn all options on.
-			$this->do_comma_quotes      = 1;
-			$this->do_guillemets        = 1;
-			$this->do_geresh_gershayim  = 1;
-			$this->do_space_emdash      = 1;
-			$this->do_space_endash      = 1;
-			$this->do_space_colon       = 1;
-			$this->do_space_semicolon   = 1;
-			$this->do_space_marks       = 1;
-			$this->do_space_frenchquote = 1;
-			$this->do_space_thousand    = 1;
-			$this->do_space_unit        = 1;
-		}
-		else if ($attr == "-1") {
-			# Special "stupefy" mode.
-			$this->do_stupefy   = 1;
-		}
-		else {
-			$chars = preg_split('//', $attr);
-			foreach ($chars as $c){
-				if      ($c == "c") { $current =& $this->do_comma_quotes; }
-				else if ($c == "g") { $current =& $this->do_guillemets; }
-				else if ($c == "G") { $current =& $this->do_geresh_gershayim; }
-				else if ($c == ":") { $current =& $this->do_space_colon; }
-				else if ($c == ";") { $current =& $this->do_space_semicolon; }
-				else if ($c == "m") { $current =& $this->do_space_marks; }
-				else if ($c == "h") { $current =& $this->do_space_emdash; }
-				else if ($c == "H") { $current =& $this->do_space_endash; }
-				else if ($c == "f") { $current =& $this->do_space_frenchquote; }
-				else if ($c == "t") { $current =& $this->do_space_thousand; }
-				else if ($c == "u") { $current =& $this->do_space_unit; }
-				else if ($c == "+") {
-					$current = 2;
-					unset($current);
-				}
-				else if ($c == "-") {
-					$current = -1;
-					unset($current);
-				}
-				else {
-					# Unknown attribute option, ignore.
-				}
-				$current = 1;
-			}
-		}
-	}
-
-
-	function decodeEntitiesInConfiguration() {
-		parent::decodeEntitiesInConfiguration();
-		$output_config_vars = array(
-			'doublequote_low',
-			'guillemet_leftpointing',
-			'guillemet_rightpointing',
-			'space_emdash',
-			'space_endash',
-			'space_colon',
-			'space_semicolon',
-			'space_marks',
-			'space_frenchquote',
-			'space_thousand',
-			'space_unit',
-		);
-		foreach ($output_config_vars as $var) {
-			$this->$var = html_entity_decode($this->$var);
-		}
-	}
-
-
-	function educate($t, $prev_token_last_char) {
-		# must happen before regular smart quotes
-		if ($this->do_geresh_gershayim)  $t = $this->educateGereshGershayim($t);
-
-		$t = parent::educate($t, $prev_token_last_char);
+        if ($attr == "1" || $attr == "2" || $attr == "3") {
+            # Do everything, turn all options on.
+            $this->do_comma_quotes      = 1;
+            $this->do_guillemets        = 1;
+            $this->do_geresh_gershayim  = 1;
+            $this->do_space_emdash      = 1;
+            $this->do_space_endash      = 1;
+            $this->do_space_colon       = 1;
+            $this->do_space_semicolon   = 1;
+            $this->do_space_marks       = 1;
+            $this->do_space_frenchquote = 1;
+            $this->do_space_thousand    = 1;
+            $this->do_space_unit        = 1;
+        }
+        else if ($attr == "-1") {
+            # Special "stupefy" mode.
+            $this->do_stupefy   = 1;
+        }
+        else {
+            $chars = preg_split('//', $attr);
+            foreach ($chars as $c){
+                if      ($c == "c") { $current =& $this->do_comma_quotes; }
+                else if ($c == "g") { $current =& $this->do_guillemets; }
+                else if ($c == "G") { $current =& $this->do_geresh_gershayim; }
+                else if ($c == ":") { $current =& $this->do_space_colon; }
+                else if ($c == ";") { $current =& $this->do_space_semicolon; }
+                else if ($c == "m") { $current =& $this->do_space_marks; }
+                else if ($c == "h") { $current =& $this->do_space_emdash; }
+                else if ($c == "H") { $current =& $this->do_space_endash; }
+                else if ($c == "f") { $current =& $this->do_space_frenchquote; }
+                else if ($c == "t") { $current =& $this->do_space_thousand; }
+                else if ($c == "u") { $current =& $this->do_space_unit; }
+                else if ($c == "+") {
+                    $current = 2;
+                    unset($current);
+                }
+                else if ($c == "-") {
+                    $current = -1;
+                    unset($current);
+                }
+                else {
+                    # Unknown attribute option, ignore.
+                }
+                $current = 1;
+            }
+        }
+    }
+
+
+    function decodeEntitiesInConfiguration() {
+        parent::decodeEntitiesInConfiguration();
+        $output_config_vars = array(
+            'doublequote_low',
+            'guillemet_leftpointing',
+            'guillemet_rightpointing',
+            'space_emdash',
+            'space_endash',
+            'space_colon',
+            'space_semicolon',
+            'space_marks',
+            'space_frenchquote',
+            'space_thousand',
+            'space_unit',
+        );
+        foreach ($output_config_vars as $var) {
+            $this->$var = html_entity_decode($this->$var);
+        }
+    }
+
+
+    function educate($t, $prev_token_last_char) {
+        # must happen before regular smart quotes
+        if ($this->do_geresh_gershayim)  $t = $this->educateGereshGershayim($t);
+
+        $t = parent::educate($t, $prev_token_last_char);
 		
-		if ($this->do_comma_quotes)      $t = $this->educateCommaQuotes($t);
-		if ($this->do_guillemets)        $t = $this->educateGuillemets($t);
+        if ($this->do_comma_quotes)      $t = $this->educateCommaQuotes($t);
+        if ($this->do_guillemets)        $t = $this->educateGuillemets($t);
 		
-		if ($this->do_space_emdash)      $t = $this->spaceEmDash($t);
-		if ($this->do_space_endash)      $t = $this->spaceEnDash($t);
-		if ($this->do_space_colon)       $t = $this->spaceColon($t);
-		if ($this->do_space_semicolon)   $t = $this->spaceSemicolon($t);
-		if ($this->do_space_marks)       $t = $this->spaceMarks($t);
-		if ($this->do_space_frenchquote) $t = $this->spaceFrenchQuotes($t);
-		if ($this->do_space_thousand)    $t = $this->spaceThousandSeparator($t);
-		if ($this->do_space_unit)        $t = $this->spaceUnit($t);
+        if ($this->do_space_emdash)      $t = $this->spaceEmDash($t);
+        if ($this->do_space_endash)      $t = $this->spaceEnDash($t);
+        if ($this->do_space_colon)       $t = $this->spaceColon($t);
+        if ($this->do_space_semicolon)   $t = $this->spaceSemicolon($t);
+        if ($this->do_space_marks)       $t = $this->spaceMarks($t);
+        if ($this->do_space_frenchquote) $t = $this->spaceFrenchQuotes($t);
+        if ($this->do_space_thousand)    $t = $this->spaceThousandSeparator($t);
+        if ($this->do_space_unit)        $t = $this->spaceUnit($t);
 		
-		return $t;
-	}
-
-
-	protected function educateCommaQuotes($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with ,,comma,, -style double quotes
-	#               translated into HTML curly quote entities.
-	#
-	#   Example input:  ,,Isn't this fun?,,
-	#   Example output: &#8222;Isn't this fun?&#8222;
-	#
-	# Note: this is meant to be used alongside with backtick quotes; there is 
-	# no language that use only lower quotations alone mark like in the example.
-	#
-		$_ = str_replace(",,", $this->doublequote_low, $_);
-		return $_;
-	}
-
-
-	protected function educateGuillemets($_) {
-	#
-	#   Parameter:  String.
-	#   Returns:    The string, with << guillemets >> -style quotes
-	#               translated into HTML guillemets entities.
-	#
-	#   Example input:  << Isn't this fun? >>
-	#   Example output: &#8222; Isn't this fun? &#8222;
-	#
-		$_ = preg_replace("/(?:<|&lt;){2}/", $this->guillemet_leftpointing, $_);
-		$_ = preg_replace("/(?:>|&gt;){2}/", $this->guillemet_rightpointing, $_);
-		return $_;
-	}
-
-
-	protected function educateGereshGershayim($_) {
-	#
-	#   Parameter:  String, UTF-8 encoded.
-	#   Returns:    The string, where simple a or double quote surrounded by
-	#               two hebrew characters is replaced into a typographic
-	#               geresh or gershayim punctuation mark.
-	#
-	#   Example input:  צה"ל / צ'ארלס
-	#   Example output: צה״ל / צ׳ארלס
-	#
-		// surrounding code points can be U+0590 to U+05BF and U+05D0 to U+05F2
-		// encoded in UTF-8: D6.90 to D6.BF and D7.90 to D7.B2
-		$_ = preg_replace('/(?<=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])\'(?=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])/', $this->geresh, $_);
-		$_ = preg_replace('/(?<=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])"(?=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])/', $this->gershayim, $_);
-		return $_;
-	}
-
-
-	protected function spaceFrenchQuotes($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				inside french-style quotes, only french quotes.
-	#
-	#	Example input:  Quotes in « French », »German« and »Finnish» style.
-	#	Example output: Quotes in «_French_», »German« and »Finnish» style.
-	#
-		$opt = ( $this->do_space_frenchquote ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_frenchquote != -1 ? $this->space_frenchquote : '' );
+        return $t;
+    }
+
+
+    protected function educateCommaQuotes($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with ,,comma,, -style double quotes
+    #               translated into HTML curly quote entities.
+    #
+    #   Example input:  ,,Isn't this fun?,,
+    #   Example output: &#8222;Isn't this fun?&#8222;
+    #
+    # Note: this is meant to be used alongside with backtick quotes; there is 
+    # no language that use only lower quotations alone mark like in the example.
+    #
+        $_ = str_replace(",,", $this->doublequote_low, $_);
+        return $_;
+    }
+
+
+    protected function educateGuillemets($_) {
+    #
+    #   Parameter:  String.
+    #   Returns:    The string, with << guillemets >> -style quotes
+    #               translated into HTML guillemets entities.
+    #
+    #   Example input:  << Isn't this fun? >>
+    #   Example output: &#8222; Isn't this fun? &#8222;
+    #
+        $_ = preg_replace("/(?:<|&lt;){2}/", $this->guillemet_leftpointing, $_);
+        $_ = preg_replace("/(?:>|&gt;){2}/", $this->guillemet_rightpointing, $_);
+        return $_;
+    }
+
+
+    protected function educateGereshGershayim($_) {
+    #
+    #   Parameter:  String, UTF-8 encoded.
+    #   Returns:    The string, where simple a or double quote surrounded by
+    #               two hebrew characters is replaced into a typographic
+    #               geresh or gershayim punctuation mark.
+    #
+    #   Example input:  צה"ל / צ'ארלס
+    #   Example output: צה״ל / צ׳ארלס
+    #
+        // surrounding code points can be U+0590 to U+05BF and U+05D0 to U+05F2
+        // encoded in UTF-8: D6.90 to D6.BF and D7.90 to D7.B2
+        $_ = preg_replace('/(?<=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])\'(?=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])/', $this->geresh, $_);
+        $_ = preg_replace('/(?<=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])"(?=\xD6[\x90-\xBF]|\xD7[\x90-\xB2])/', $this->gershayim, $_);
+        return $_;
+    }
+
+
+    protected function spaceFrenchQuotes($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				inside french-style quotes, only french quotes.
+    #
+    #	Example input:  Quotes in « French », »German« and »Finnish» style.
+    #	Example output: Quotes in «_French_», »German« and »Finnish» style.
+    #
+        $opt = ( $this->do_space_frenchquote ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_frenchquote != -1 ? $this->space_frenchquote : '' );
 		
-		# Characters allowed immediatly outside quotes.
-		$outside_char = $this->space . '|\s|[.,:;!?\[\](){}|@*~=+-]|¡|¿';
+        # Characters allowed immediatly outside quotes.
+        $outside_char = $this->space . '|\s|[.,:;!?\[\](){}|@*~=+-]|¡|¿';
 		
-		$_ = preg_replace(
-			"/(^|$outside_char)(&#171;|«|&#8250;|‹)$this->space$opt/",
-			"\\1\\2$chr", $_);
-		$_ = preg_replace(
-			"/$this->space$opt(&#187;|»|&#8249;|›)($outside_char|$)/", 
-			"$chr\\1\\2", $_);
-		return $_;
-	}
-
-
-	protected function spaceColon($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				before colons.
-	#
-	#	Example input:  Ingredients : fun.
-	#	Example output: Ingredients_: fun.
-	#
-		$opt = ( $this->do_space_colon ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_colon != -1 ? $this->space_colon : '' );
+        $_ = preg_replace(
+            "/(^|$outside_char)(&#171;|«|&#8250;|‹)$this->space$opt/",
+            "\\1\\2$chr", $_);
+        $_ = preg_replace(
+            "/$this->space$opt(&#187;|»|&#8249;|›)($outside_char|$)/", 
+            "$chr\\1\\2", $_);
+        return $_;
+    }
+
+
+    protected function spaceColon($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				before colons.
+    #
+    #	Example input:  Ingredients : fun.
+    #	Example output: Ingredients_: fun.
+    #
+        $opt = ( $this->do_space_colon ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_colon != -1 ? $this->space_colon : '' );
 		
-		$_ = preg_replace("/$this->space$opt(:)(\\s|$)/m",
-						  "$chr\\1\\2", $_);
-		return $_;
-	}
-
-
-	protected function spaceSemicolon($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				before semicolons.
-	#
-	#	Example input:  There he goes ; there she goes.
-	#	Example output: There he goes_; there she goes.
-	#
-		$opt = ( $this->do_space_semicolon ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_semicolon != -1 ? $this->space_semicolon : '' );
+        $_ = preg_replace("/$this->space$opt(:)(\\s|$)/m",
+                            "$chr\\1\\2", $_);
+        return $_;
+    }
+
+
+    protected function spaceSemicolon($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				before semicolons.
+    #
+    #	Example input:  There he goes ; there she goes.
+    #	Example output: There he goes_; there she goes.
+    #
+        $opt = ( $this->do_space_semicolon ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_semicolon != -1 ? $this->space_semicolon : '' );
 		
-		$_ = preg_replace("/$this->space(;)(?=\\s|$)/m", 
-						  " \\1", $_);
-		$_ = preg_replace("/((?:^|\\s)(?>[^&;\\s]+|&#?[a-zA-Z0-9]+;)*)".
-						  " $opt(;)(?=\\s|$)/m", 
-						  "\\1$chr\\2", $_);
-		return $_;
-	}
-
-
-	protected function spaceMarks($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				around question and exclamation marks.
-	#
-	#	Example input:  ¡ Holà ! What ?
-	#	Example output: ¡_Holà_! What_?
-	#
-		$opt = ( $this->do_space_marks ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_marks != -1 ? $this->space_marks : '' );
-
-		// Regular marks.
-		$_ = preg_replace("/$this->space$opt([?!]+)/", "$chr\\1", $_);
-
-		// Inverted marks.
-		$imarks = "(?:¡|&iexcl;|&#161;|&#x[Aa]1;|¿|&iquest;|&#191;|&#x[Bb][Ff];)";
-		$_ = preg_replace("/($imarks+)$this->space$opt/", "\\1$chr", $_);
+        $_ = preg_replace("/$this->space(;)(?=\\s|$)/m", 
+                            " \\1", $_);
+        $_ = preg_replace("/((?:^|\\s)(?>[^&;\\s]+|&#?[a-zA-Z0-9]+;)*)".
+                            " $opt(;)(?=\\s|$)/m", 
+                            "\\1$chr\\2", $_);
+        return $_;
+    }
+
+
+    protected function spaceMarks($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				around question and exclamation marks.
+    #
+    #	Example input:  ¡ Holà ! What ?
+    #	Example output: ¡_Holà_! What_?
+    #
+        $opt = ( $this->do_space_marks ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_marks != -1 ? $this->space_marks : '' );
+
+        // Regular marks.
+        $_ = preg_replace("/$this->space$opt([?!]+)/", "$chr\\1", $_);
+
+        // Inverted marks.
+        $imarks = "(?:¡|&iexcl;|&#161;|&#x[Aa]1;|¿|&iquest;|&#191;|&#x[Bb][Ff];)";
+        $_ = preg_replace("/($imarks+)$this->space$opt/", "\\1$chr", $_);
 	
-		return $_;
-	}
-
-
-	protected function spaceEmDash($_) {
-	#
-	#	Parameters: String, two replacement characters separated by a hyphen (`-`),
-	#				and forcing flag.
-	#
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				around dashes.
-	#
-	#	Example input:  Then — without any plan — the fun happend.
-	#	Example output: Then_—_without any plan_—_the fun happend.
-	#
-		$opt = ( $this->do_space_emdash ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_emdash != -1 ? $this->space_emdash : '' );
-		$_ = preg_replace("/$this->space$opt(&#8212;|—)$this->space$opt/", 
-			"$chr\\1$chr", $_);
-		return $_;
-	}
+        return $_;
+    }
+
+
+    protected function spaceEmDash($_) {
+    #
+    #	Parameters: String, two replacement characters separated by a hyphen (`-`),
+    #				and forcing flag.
+    #
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				around dashes.
+    #
+    #	Example input:  Then — without any plan — the fun happend.
+    #	Example output: Then_—_without any plan_—_the fun happend.
+    #
+        $opt = ( $this->do_space_emdash ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_emdash != -1 ? $this->space_emdash : '' );
+        $_ = preg_replace("/$this->space$opt(&#8212;|—)$this->space$opt/", 
+            "$chr\\1$chr", $_);
+        return $_;
+    }
 	
 	
-	protected function spaceEnDash($_) {
-	#
-	#	Parameters: String, two replacement characters separated by a hyphen (`-`),
-	#				and forcing flag.
-	#
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				around dashes.
-	#
-	#	Example input:  Then — without any plan — the fun happend.
-	#	Example output: Then_—_without any plan_—_the fun happend.
-	#
-		$opt = ( $this->do_space_endash ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_endash != -1 ? $this->space_endash : '' );
-		$_ = preg_replace("/$this->space$opt(&#8211;|–)$this->space$opt/", 
-			"$chr\\1$chr", $_);
-		return $_;
-	}
-
-
-	protected function spaceThousandSeparator($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced 
-	#				inside numbers (thousand separator in french).
-	#
-	#	Example input:  Il y a 10 000 insectes amusants dans ton jardin.
-	#	Example output: Il y a 10_000 insectes amusants dans ton jardin.
-	#
-		$chr = ( $this->do_space_thousand != -1 ? $this->space_thousand : '' );
-		$_ = preg_replace('/([0-9]) ([0-9])/', "\\1$chr\\2", $_);
-		return $_;
-	}
-
-
-	protected $units = '
+    protected function spaceEnDash($_) {
+    #
+    #	Parameters: String, two replacement characters separated by a hyphen (`-`),
+    #				and forcing flag.
+    #
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				around dashes.
+    #
+    #	Example input:  Then — without any plan — the fun happend.
+    #	Example output: Then_—_without any plan_—_the fun happend.
+    #
+        $opt = ( $this->do_space_endash ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_endash != -1 ? $this->space_endash : '' );
+        $_ = preg_replace("/$this->space$opt(&#8211;|–)$this->space$opt/", 
+            "$chr\\1$chr", $_);
+        return $_;
+    }
+
+
+    protected function spaceThousandSeparator($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced 
+    #				inside numbers (thousand separator in french).
+    #
+    #	Example input:  Il y a 10 000 insectes amusants dans ton jardin.
+    #	Example output: Il y a 10_000 insectes amusants dans ton jardin.
+    #
+        $chr = ( $this->do_space_thousand != -1 ? $this->space_thousand : '' );
+        $_ = preg_replace('/([0-9]) ([0-9])/', "\\1$chr\\2", $_);
+        return $_;
+    }
+
+
+    protected $units = '
 		### Metric units (with prefixes)
 		(?:
 			p |
@@ -411,76 +411,76 @@ 
 		%|pt|pi|M?px|em|en|gal|lb|[NSEOW]|[NS][EOW]|ha|mbar
 		'; //x
 
-	protected function spaceUnit($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced
-	#				before unit symbols.
-	#
-	#	Example input:  Get 3 mol of fun for 3 $.
-	#	Example output: Get 3_mol of fun for 3_$.
-	#
-		$opt = ( $this->do_space_unit ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_unit != -1 ? $this->space_unit : '' );
-
-		$_ = preg_replace('/
+    protected function spaceUnit($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced
+    #				before unit symbols.
+    #
+    #	Example input:  Get 3 mol of fun for 3 $.
+    #	Example output: Get 3_mol of fun for 3_$.
+    #
+        $opt = ( $this->do_space_unit ==  2 ? '?' : '' );
+        $chr = ( $this->do_space_unit != -1 ? $this->space_unit : '' );
+
+        $_ = preg_replace('/
 			(?:([0-9])[ ]'.$opt.') # Number followed by space.
 			('.$this->units.')     # Unit.
 			(?![a-zA-Z0-9])  # Negative lookahead for other unit characters.
 			/x',
-			"\\1$chr\\2", $_);
-
-		return $_;
-	}
-
-
-	protected function spaceAbbr($_) {
-	#
-	#	Parameters: String, replacement character, and forcing flag.
-	#	Returns:    The string, with appropriates spaces replaced
-	#				around abbreviations.
-	#
-	#	Example input:  Fun i.e. something pleasant.
-	#	Example output: Fun i.e._something pleasant.
-	#
-		$opt = ( $this->do_space_abbr ==  2 ? '?' : '' );
+            "\\1$chr\\2", $_);
+
+        return $_;
+    }
+
+
+    protected function spaceAbbr($_) {
+    #
+    #	Parameters: String, replacement character, and forcing flag.
+    #	Returns:    The string, with appropriates spaces replaced
+    #				around abbreviations.
+    #
+    #	Example input:  Fun i.e. something pleasant.
+    #	Example output: Fun i.e._something pleasant.
+    #
+        $opt = ( $this->do_space_abbr ==  2 ? '?' : '' );
 		
-		$_ = preg_replace("/(^|\s)($this->abbr_after) $opt/m",
-			"\\1\\2$this->space_abbr", $_);
-		$_ = preg_replace("/( )$opt($this->abbr_sp_before)(?![a-zA-Z'])/m", 
-			"\\1$this->space_abbr\\2", $_);
-		return $_;
-	}
-
-
-	protected function stupefyEntities($_) {
-	#
-	#   Adding angle quotes and lower quotes to SmartyPants's stupefy mode.
-	#
-		$_ = parent::stupefyEntities($_);
-
-		$_ = str_replace(array('&#8222;', '&#171;', '&#187'), '"', $_);
-
-		return $_;
-	}
-
-
-	protected function processEscapes($_) {
-	#
-	#   Adding a few more escapes to SmartyPants's escapes:
-	#
-	#               Escape  Value
-	#               ------  -----
-	#               \,      &#44;
-	#               \<      &#60;
-	#               \>      &#62;
-	#
-		$_ = parent::processEscapes($_);
-
-		$_ = str_replace(
-			array('\,',    '\<',    '\>',    '\&lt;', '\&gt;'),
-			array('&#44;', '&#60;', '&#62;', '&#60;', '&#62;'), $_);
-
-		return $_;
-	}
+        $_ = preg_replace("/(^|\s)($this->abbr_after) $opt/m",
+            "\\1\\2$this->space_abbr", $_);
+        $_ = preg_replace("/( )$opt($this->abbr_sp_before)(?![a-zA-Z'])/m", 
+            "\\1$this->space_abbr\\2", $_);
+        return $_;
+    }
+
+
+    protected function stupefyEntities($_) {
+    #
+    #   Adding angle quotes and lower quotes to SmartyPants's stupefy mode.
+    #
+        $_ = parent::stupefyEntities($_);
+
+        $_ = str_replace(array('&#8222;', '&#171;', '&#187'), '"', $_);
+
+        return $_;
+    }
+
+
+    protected function processEscapes($_) {
+    #
+    #   Adding a few more escapes to SmartyPants's escapes:
+    #
+    #               Escape  Value
+    #               ------  -----
+    #               \,      &#44;
+    #               \<      &#60;
+    #               \>      &#62;
+    #
+        $_ = parent::processEscapes($_);
+
+        $_ = str_replace(
+            array('\,',    '\<',    '\>',    '\&lt;', '\&gt;'),
+            array('&#44;', '&#60;', '&#62;', '&#60;', '&#62;'), $_);
+
+        return $_;
+    }
 }

Spacing +33 added lines, -33 removed lines

@@ -119,22 +119,22 @@ 
 		}
 		else if ($attr == "-1") {
 			# Special "stupefy" mode.
-			$this->do_stupefy   = 1;
+			$this->do_stupefy = 1;
 		}
 		else {
 			$chars = preg_split('//', $attr);
-			foreach ($chars as $c){
-				if      ($c == "c") { $current =& $this->do_comma_quotes; }
-				else if ($c == "g") { $current =& $this->do_guillemets; }
-				else if ($c == "G") { $current =& $this->do_geresh_gershayim; }
-				else if ($c == ":") { $current =& $this->do_space_colon; }
-				else if ($c == ";") { $current =& $this->do_space_semicolon; }
-				else if ($c == "m") { $current =& $this->do_space_marks; }
-				else if ($c == "h") { $current =& $this->do_space_emdash; }
-				else if ($c == "H") { $current =& $this->do_space_endash; }
-				else if ($c == "f") { $current =& $this->do_space_frenchquote; }
-				else if ($c == "t") { $current =& $this->do_space_thousand; }
-				else if ($c == "u") { $current =& $this->do_space_unit; }
+			foreach ($chars as $c) {
+				if ($c == "c") { $current = & $this->do_comma_quotes; }
+				else if ($c == "g") { $current = & $this->do_guillemets; }
+				else if ($c == "G") { $current = & $this->do_geresh_gershayim; }
+				else if ($c == ":") { $current = & $this->do_space_colon; }
+				else if ($c == ";") { $current = & $this->do_space_semicolon; }
+				else if ($c == "m") { $current = & $this->do_space_marks; }
+				else if ($c == "h") { $current = & $this->do_space_emdash; }
+				else if ($c == "H") { $current = & $this->do_space_endash; }
+				else if ($c == "f") { $current = & $this->do_space_frenchquote; }
+				else if ($c == "t") { $current = & $this->do_space_thousand; }
+				else if ($c == "u") { $current = & $this->do_space_unit; }
 				else if ($c == "+") {
 					$current = 2;
 					unset($current);
@@ -254,8 +254,8 @@ 
 	#	Example input:  Quotes in « French », »German« and »Finnish» style.
 	#	Example output: Quotes in «_French_», »German« and »Finnish» style.
 	#
-		$opt = ( $this->do_space_frenchquote ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_frenchquote != -1 ? $this->space_frenchquote : '' );
+		$opt = ($this->do_space_frenchquote == 2 ? '?' : '');
+		$chr = ($this->do_space_frenchquote != -1 ? $this->space_frenchquote : '');
 		
 		# Characters allowed immediatly outside quotes.
 		$outside_char = $this->space . '|\s|[.,:;!?\[\](){}|@*~=+-]|¡|¿';
@@ -279,8 +279,8 @@ 
 	#	Example input:  Ingredients : fun.
 	#	Example output: Ingredients_: fun.
 	#
-		$opt = ( $this->do_space_colon ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_colon != -1 ? $this->space_colon : '' );
+		$opt = ($this->do_space_colon == 2 ? '?' : '');
+		$chr = ($this->do_space_colon != -1 ? $this->space_colon : '');
 		
 		$_ = preg_replace("/$this->space$opt(:)(\\s|$)/m",
 						  "$chr\\1\\2", $_);
@@ -297,12 +297,12 @@ 
 	#	Example input:  There he goes ; there she goes.
 	#	Example output: There he goes_; there she goes.
 	#
-		$opt = ( $this->do_space_semicolon ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_semicolon != -1 ? $this->space_semicolon : '' );
+		$opt = ($this->do_space_semicolon == 2 ? '?' : '');
+		$chr = ($this->do_space_semicolon != -1 ? $this->space_semicolon : '');
 		
 		$_ = preg_replace("/$this->space(;)(?=\\s|$)/m", 
 						  " \\1", $_);
-		$_ = preg_replace("/((?:^|\\s)(?>[^&;\\s]+|&#?[a-zA-Z0-9]+;)*)".
+		$_ = preg_replace("/((?:^|\\s)(?>[^&;\\s]+|&#?[a-zA-Z0-9]+;)*)" .
 						  " $opt(;)(?=\\s|$)/m", 
 						  "\\1$chr\\2", $_);
 		return $_;
@@ -318,8 +318,8 @@ 
 	#	Example input:  ¡ Holà ! What ?
 	#	Example output: ¡_Holà_! What_?
 	#
-		$opt = ( $this->do_space_marks ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_marks != -1 ? $this->space_marks : '' );
+		$opt = ($this->do_space_marks == 2 ? '?' : '');
+		$chr = ($this->do_space_marks != -1 ? $this->space_marks : '');
 
 		// Regular marks.
 		$_ = preg_replace("/$this->space$opt([?!]+)/", "$chr\\1", $_);
@@ -343,8 +343,8 @@ 
 	#	Example input:  Then — without any plan — the fun happend.
 	#	Example output: Then_—_without any plan_—_the fun happend.
 	#
-		$opt = ( $this->do_space_emdash ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_emdash != -1 ? $this->space_emdash : '' );
+		$opt = ($this->do_space_emdash == 2 ? '?' : '');
+		$chr = ($this->do_space_emdash != -1 ? $this->space_emdash : '');
 		$_ = preg_replace("/$this->space$opt(—|—)$this->space$opt/", 
 			"$chr\\1$chr", $_);
 		return $_;
@@ -362,8 +362,8 @@ 
 	#	Example input:  Then — without any plan — the fun happend.
 	#	Example output: Then_—_without any plan_—_the fun happend.
 	#
-		$opt = ( $this->do_space_endash ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_endash != -1 ? $this->space_endash : '' );
+		$opt = ($this->do_space_endash == 2 ? '?' : '');
+		$chr = ($this->do_space_endash != -1 ? $this->space_endash : '');
 		$_ = preg_replace("/$this->space$opt(–|–)$this->space$opt/", 
 			"$chr\\1$chr", $_);
 		return $_;
@@ -379,7 +379,7 @@ 
 	#	Example input:  Il y a 10 000 insectes amusants dans ton jardin.
 	#	Example output: Il y a 10_000 insectes amusants dans ton jardin.
 	#
-		$chr = ( $this->do_space_thousand != -1 ? $this->space_thousand : '' );
+		$chr = ($this->do_space_thousand != -1 ? $this->space_thousand : '');
 		$_ = preg_replace('/([0-9]) ([0-9])/', "\\1$chr\\2", $_);
 		return $_;
 	}
@@ -420,12 +420,12 @@ 
 	#	Example input:  Get 3 mol of fun for 3 $.
 	#	Example output: Get 3_mol of fun for 3_$.
 	#
-		$opt = ( $this->do_space_unit ==  2 ? '?' : '' );
-		$chr = ( $this->do_space_unit != -1 ? $this->space_unit : '' );
+		$opt = ($this->do_space_unit == 2 ? '?' : '');
+		$chr = ($this->do_space_unit != -1 ? $this->space_unit : '');
 
 		$_ = preg_replace('/
-			(?:([0-9])[ ]'.$opt.') # Number followed by space.
-			('.$this->units.')     # Unit.
+			(?:([0-9])[ ]'.$opt . ') # Number followed by space.
+			('.$this->units . ')     # Unit.
 			(?![a-zA-Z0-9])  # Negative lookahead for other unit characters.
 			/x',
 			"\\1$chr\\2", $_);
@@ -443,7 +443,7 @@ 
 	#	Example input:  Fun i.e. something pleasant.
 	#	Example output: Fun i.e._something pleasant.
 	#
-		$opt = ( $this->do_space_abbr ==  2 ? '?' : '' );
+		$opt = ($this->do_space_abbr == 2 ? '?' : '');
 		
 		$_ = preg_replace("/(^|\s)($this->abbr_after) $opt/m",
 			"\\1\\2$this->space_abbr", $_);
@@ -478,7 +478,7 @@ 
 		$_ = parent::processEscapes($_);
 
 		$_ = str_replace(
-			array('\,',    '\<',    '\>',    '\&lt;', '\&gt;'),
+			array('\,', '\<', '\>', '\&lt;', '\&gt;'),
 			array('&#44;', '&#60;', '&#62;', '&#60;', '&#62;'), $_);
 
 		return $_;

Braces +38 added lines, -31 removed lines

@@ -116,34 +116,19 @@ 
 			$this->do_space_frenchquote = 1;
 			$this->do_space_thousand    = 1;
 			$this->do_space_unit        = 1;
-		}
-		else if ($attr == "-1") {
+		} else if ($attr == "-1") {
 			# Special "stupefy" mode.
 			$this->do_stupefy   = 1;
-		}
-		else {
+		} else {
 			$chars = preg_split('//', $attr);
 			foreach ($chars as $c){
-				if      ($c == "c") { $current =& $this->do_comma_quotes; }
-				else if ($c == "g") { $current =& $this->do_guillemets; }
-				else if ($c == "G") { $current =& $this->do_geresh_gershayim; }
-				else if ($c == ":") { $current =& $this->do_space_colon; }
-				else if ($c == ";") { $current =& $this->do_space_semicolon; }
-				else if ($c == "m") { $current =& $this->do_space_marks; }
-				else if ($c == "h") { $current =& $this->do_space_emdash; }
-				else if ($c == "H") { $current =& $this->do_space_endash; }
-				else if ($c == "f") { $current =& $this->do_space_frenchquote; }
-				else if ($c == "t") { $current =& $this->do_space_thousand; }
-				else if ($c == "u") { $current =& $this->do_space_unit; }
-				else if ($c == "+") {
+				if      ($c == "c") { $current =& $this->do_comma_quotes; } else if ($c == "g") { $current =& $this->do_guillemets; } else if ($c == "G") { $current =& $this->do_geresh_gershayim; } else if ($c == ":") { $current =& $this->do_space_colon; } else if ($c == ";") { $current =& $this->do_space_semicolon; } else if ($c == "m") { $current =& $this->do_space_marks; } else if ($c == "h") { $current =& $this->do_space_emdash; } else if ($c == "H") { $current =& $this->do_space_endash; } else if ($c == "f") { $current =& $this->do_space_frenchquote; } else if ($c == "t") { $current =& $this->do_space_thousand; } else if ($c == "u") { $current =& $this->do_space_unit; } else if ($c == "+") {
 					$current = 2;
 					unset($current);
-				}
-				else if ($c == "-") {
+				} else if ($c == "-") {
 					$current = -1;
 					unset($current);
-				}
-				else {
+				} else {
 					# Unknown attribute option, ignore.
 				}
 				$current = 1;
@@ -175,21 +160,43 @@ 
 
 	function educate($t, $prev_token_last_char) {
 		# must happen before regular smart quotes
-		if ($this->do_geresh_gershayim)  $t = $this->educateGereshGershayim($t);
+		if ($this->do_geresh_gershayim) {
+		    $t = $this->educateGereshGershayim($t);
+		}
 
 		$t = parent::educate($t, $prev_token_last_char);
 		
-		if ($this->do_comma_quotes)      $t = $this->educateCommaQuotes($t);
-		if ($this->do_guillemets)        $t = $this->educateGuillemets($t);
+		if ($this->do_comma_quotes) {
+		    $t = $this->educateCommaQuotes($t);
+		}
+		if ($this->do_guillemets) {
+		    $t = $this->educateGuillemets($t);
+		}
 		
-		if ($this->do_space_emdash)      $t = $this->spaceEmDash($t);
-		if ($this->do_space_endash)      $t = $this->spaceEnDash($t);
-		if ($this->do_space_colon)       $t = $this->spaceColon($t);
-		if ($this->do_space_semicolon)   $t = $this->spaceSemicolon($t);
-		if ($this->do_space_marks)       $t = $this->spaceMarks($t);
-		if ($this->do_space_frenchquote) $t = $this->spaceFrenchQuotes($t);
-		if ($this->do_space_thousand)    $t = $this->spaceThousandSeparator($t);
-		if ($this->do_space_unit)        $t = $this->spaceUnit($t);
+		if ($this->do_space_emdash) {
+		    $t = $this->spaceEmDash($t);
+		}
+		if ($this->do_space_endash) {
+		    $t = $this->spaceEnDash($t);
+		}
+		if ($this->do_space_colon) {
+		    $t = $this->spaceColon($t);
+		}
+		if ($this->do_space_semicolon) {
+		    $t = $this->spaceSemicolon($t);
+		}
+		if ($this->do_space_marks) {
+		    $t = $this->spaceMarks($t);
+		}
+		if ($this->do_space_frenchquote) {
+		    $t = $this->spaceFrenchQuotes($t);
+		}
+		if ($this->do_space_thousand) {
+		    $t = $this->spaceThousandSeparator($t);
+		}
+		if ($this->do_space_unit) {
+		    $t = $this->spaceUnit($t);
+		}
 		
 		return $t;
 	}

a/vendor/michelf/php-markdown/Readme.php

Indentation +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 
 // Install PSR-4-compatible class autoloader
 spl_autoload_register(function($class){
-	require str_replace('\\', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php';
+    require str_replace('\\', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php';
 });
 // If using Composer, use this instead:
 //require 'vendor/autoload.php';
@@ -26,8 +26,8 @@ 
 	</head>
 	<body>
 		<?php
-			// Put HTML content in the document
-			echo $html;
-		?>
+            // Put HTML content in the document
+            echo $html;
+        ?>
 	</body>
 </html>

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 // you like.
 
 // Install PSR-4-compatible class autoloader
-spl_autoload_register(function($class){
-	require str_replace('\\', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php';
+spl_autoload_register(function($class) {
+	require str_replace('\\', DIRECTORY_SEPARATOR, ltrim($class, '\\')) . '.php';
 });
 // If using Composer, use this instead:
 //require 'vendor/autoload.php';

a/vendor/michelf/php-markdown/test/integration/PhpMarkdownTest.php

Indentation +164 added lines, -164 removed lines

@@ -6,168 +6,168 @@
 
 class PhpMarkdownTest extends TestCase
 {
-	/**
-	 * Returns all php-markdown.mdtest tests
-	 * @return array
-	 */
-	public function dataProviderForPhpMarkdown() {
-		$dir = TEST_RESOURCES_ROOT . '/php-markdown.mdtest';
-		return MarkdownTestHelper::getInputOutputPaths($dir);
-	}
-
-	/**
-	 * Runs php-markdown.mdtest against Markdown::defaultTransform
-	 *
-	 * @dataProvider dataProviderForPhpMarkdown
-	 *
-	 * @param string $inputPath Input markdown path
-	 * @param string $htmlPath File path of expected transformed output (X)HTML
-	 *
-	 * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
-	 *
-	 * @return void
-	 */
-	public function testTransformingOfPhpMarkdown($inputPath, $htmlPath, $xhtml = false) {
-		$inputMarkdown = file_get_contents($inputPath);
-		$expectedHtml = file_get_contents($htmlPath);
-		$result = Markdown::defaultTransform($inputMarkdown);
-
-		MarkdownTestHelper::assertSameNormalized(
-			$expectedHtml,
-			$result,
-			"Markdown in $inputPath converts exactly to expected $htmlPath",
-			$xhtml
-		);
-	}
-
-	/**
-	 * Returns all php-markdown.mdtest tests EXCEPT Emphasis test.
-	 * @return array
-	 */
-	public function dataProviderForPhpMarkdownExceptEmphasis()
-	{
-		$dir = TEST_RESOURCES_ROOT . '/php-markdown.mdtest';
-		$allTests = MarkdownTestHelper::getInputOutputPaths($dir);
-
-		foreach ($allTests as $index => $test) {
-			// Because MarkdownExtra treats underscore emphasis differently, this one test has to be excluded
-			if (preg_match('~/Emphasis\.text$~', $test[0])) {
-				unset($allTests[$index]);
-			}
-		}
-
-		return array_values($allTests);
-	}
-
-	/**
-	 * Runs php-markdown.mdtest against MarkdownExtra::defaultTransform
-	 *
-	 * @dataProvider dataProviderForPhpMarkdownExceptEmphasis
-	 *
-	 * @param $inputPath
-	 * @param $htmlPath
-	 * @param bool $xhtml
-	 */
-	public function testPhpMarkdownMdTestWithMarkdownExtra($inputPath, $htmlPath, $xhtml = false)
-	{
-		$inputMarkdown = file_get_contents($inputPath);
-		$expectedHtml = file_get_contents($htmlPath);
-
-		$result = MarkdownExtra::defaultTransform($inputMarkdown);
-
-		MarkdownTestHelper::assertSameNormalized(
-			$expectedHtml,
-			$result,
-			"Markdown in $inputPath converts exactly to expected $htmlPath",
-			$xhtml
-		);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function dataProviderForMarkdownExtra() {
-		$dir = TEST_RESOURCES_ROOT . '/php-markdown-extra.mdtest';
-		return MarkdownTestHelper::getInputOutputPaths($dir);
-	}
-
-	/**
-	 * @dataProvider dataProviderForMarkdownExtra
-	 *
-	 * @param string $inputPath Input markdown path
-	 * @param string $htmlPath File path of expected transformed output (X)HTML
-	 *
-	 * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
-	 *
-	 * @return void
-	 */
-	public function testTransformingOfMarkdownExtra($inputPath, $htmlPath, $xhtml = false) {
-		$inputMarkdown = file_get_contents($inputPath);
-		$expectedHtml = file_get_contents($htmlPath);
-		$result = MarkdownExtra::defaultTransform($inputMarkdown);
-
-		MarkdownTestHelper::assertSameNormalized(
-			$expectedHtml,
-			$result,
-			"Markdown in $inputPath converts exactly to expected $htmlPath",
-			$xhtml
-		);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function dataProviderForRegularMarkdown()
-	{
-		$dir = TEST_RESOURCES_ROOT . '/markdown.mdtest';
-		return MarkdownTestHelper::getInputOutputPaths($dir);
-	}
-
-	/**
-	 * @dataProvider dataProviderForRegularMarkdown
-	 *
-	 * @param string $inputPath Input markdown path
-	 * @param string $htmlPath File path of expected transformed output (X)HTML
-	 *
-	 * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
-	 *
-	 * @return void
-	 */
-	public function testTransformingOfRegularMarkdown($inputPath, $htmlPath, $xhtml = false)
-	{
-		$inputMarkdown = file_get_contents($inputPath);
-		$expectedHtml = file_get_contents($htmlPath);
-		$result = Markdown::defaultTransform($inputMarkdown);
-
-		MarkdownTestHelper::assertSameNormalized(
-			$expectedHtml,
-			$result,
-			"Markdown in $inputPath converts exactly to expected $htmlPath",
-			$xhtml
-		);
-	}
-
-	/**
-	 * Runs markdown.mdtest against MarkdownExtra::defaultTransform
-	 *
-	 * @dataProvider dataProviderForRegularMarkdown
-	 *
-	 * @param $inputPath
-	 * @param $htmlPath
-	 * @param bool $xhtml
-	 */
-	public function testMarkdownMdTestWithMarkdownExtra($inputPath, $htmlPath, $xhtml = false)
-	{
-		$inputMarkdown = file_get_contents($inputPath);
-		$expectedHtml = file_get_contents($htmlPath);
-
-		$result = MarkdownExtra::defaultTransform($inputMarkdown);
-
-		MarkdownTestHelper::assertSameNormalized(
-			$expectedHtml,
-			$result,
-			"Markdown in $inputPath converts exactly to expected $htmlPath",
-			$xhtml
-		);
-	}
+    /**
+     * Returns all php-markdown.mdtest tests
+     * @return array
+     */
+    public function dataProviderForPhpMarkdown() {
+        $dir = TEST_RESOURCES_ROOT . '/php-markdown.mdtest';
+        return MarkdownTestHelper::getInputOutputPaths($dir);
+    }
+
+    /**
+     * Runs php-markdown.mdtest against Markdown::defaultTransform
+     *
+     * @dataProvider dataProviderForPhpMarkdown
+     *
+     * @param string $inputPath Input markdown path
+     * @param string $htmlPath File path of expected transformed output (X)HTML
+     *
+     * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
+     *
+     * @return void
+     */
+    public function testTransformingOfPhpMarkdown($inputPath, $htmlPath, $xhtml = false) {
+        $inputMarkdown = file_get_contents($inputPath);
+        $expectedHtml = file_get_contents($htmlPath);
+        $result = Markdown::defaultTransform($inputMarkdown);
+
+        MarkdownTestHelper::assertSameNormalized(
+            $expectedHtml,
+            $result,
+            "Markdown in $inputPath converts exactly to expected $htmlPath",
+            $xhtml
+        );
+    }
+
+    /**
+     * Returns all php-markdown.mdtest tests EXCEPT Emphasis test.
+     * @return array
+     */
+    public function dataProviderForPhpMarkdownExceptEmphasis()
+    {
+        $dir = TEST_RESOURCES_ROOT . '/php-markdown.mdtest';
+        $allTests = MarkdownTestHelper::getInputOutputPaths($dir);
+
+        foreach ($allTests as $index => $test) {
+            // Because MarkdownExtra treats underscore emphasis differently, this one test has to be excluded
+            if (preg_match('~/Emphasis\.text$~', $test[0])) {
+                unset($allTests[$index]);
+            }
+        }
+
+        return array_values($allTests);
+    }
+
+    /**
+     * Runs php-markdown.mdtest against MarkdownExtra::defaultTransform
+     *
+     * @dataProvider dataProviderForPhpMarkdownExceptEmphasis
+     *
+     * @param $inputPath
+     * @param $htmlPath
+     * @param bool $xhtml
+     */
+    public function testPhpMarkdownMdTestWithMarkdownExtra($inputPath, $htmlPath, $xhtml = false)
+    {
+        $inputMarkdown = file_get_contents($inputPath);
+        $expectedHtml = file_get_contents($htmlPath);
+
+        $result = MarkdownExtra::defaultTransform($inputMarkdown);
+
+        MarkdownTestHelper::assertSameNormalized(
+            $expectedHtml,
+            $result,
+            "Markdown in $inputPath converts exactly to expected $htmlPath",
+            $xhtml
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForMarkdownExtra() {
+        $dir = TEST_RESOURCES_ROOT . '/php-markdown-extra.mdtest';
+        return MarkdownTestHelper::getInputOutputPaths($dir);
+    }
+
+    /**
+     * @dataProvider dataProviderForMarkdownExtra
+     *
+     * @param string $inputPath Input markdown path
+     * @param string $htmlPath File path of expected transformed output (X)HTML
+     *
+     * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
+     *
+     * @return void
+     */
+    public function testTransformingOfMarkdownExtra($inputPath, $htmlPath, $xhtml = false) {
+        $inputMarkdown = file_get_contents($inputPath);
+        $expectedHtml = file_get_contents($htmlPath);
+        $result = MarkdownExtra::defaultTransform($inputMarkdown);
+
+        MarkdownTestHelper::assertSameNormalized(
+            $expectedHtml,
+            $result,
+            "Markdown in $inputPath converts exactly to expected $htmlPath",
+            $xhtml
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForRegularMarkdown()
+    {
+        $dir = TEST_RESOURCES_ROOT . '/markdown.mdtest';
+        return MarkdownTestHelper::getInputOutputPaths($dir);
+    }
+
+    /**
+     * @dataProvider dataProviderForRegularMarkdown
+     *
+     * @param string $inputPath Input markdown path
+     * @param string $htmlPath File path of expected transformed output (X)HTML
+     *
+     * @param bool $xhtml True if XHTML. Otherwise, HTML is assumed.
+     *
+     * @return void
+     */
+    public function testTransformingOfRegularMarkdown($inputPath, $htmlPath, $xhtml = false)
+    {
+        $inputMarkdown = file_get_contents($inputPath);
+        $expectedHtml = file_get_contents($htmlPath);
+        $result = Markdown::defaultTransform($inputMarkdown);
+
+        MarkdownTestHelper::assertSameNormalized(
+            $expectedHtml,
+            $result,
+            "Markdown in $inputPath converts exactly to expected $htmlPath",
+            $xhtml
+        );
+    }
+
+    /**
+     * Runs markdown.mdtest against MarkdownExtra::defaultTransform
+     *
+     * @dataProvider dataProviderForRegularMarkdown
+     *
+     * @param $inputPath
+     * @param $htmlPath
+     * @param bool $xhtml
+     */
+    public function testMarkdownMdTestWithMarkdownExtra($inputPath, $htmlPath, $xhtml = false)
+    {
+        $inputMarkdown = file_get_contents($inputPath);
+        $expectedHtml = file_get_contents($htmlPath);
+
+        $result = MarkdownExtra::defaultTransform($inputMarkdown);
+
+        MarkdownTestHelper::assertSameNormalized(
+            $expectedHtml,
+            $result,
+            "Markdown in $inputPath converts exactly to expected $htmlPath",
+            $xhtml
+        );
+    }
 }

a/vendor/michelf/php-markdown/test/helpers/MarkdownTestHelper.php

Indentation +231 added lines, -231 removed lines

@@ -4,264 +4,264 @@
 
 class MarkdownTestHelper
 {
-	/**
-	 * Takes an input directory containing .text and .(x)html files, and returns an array
-	 * of .text files and the corresponding output xhtml or html file. Can be used in a unit test data provider.
-	 *
-	 * @param string $directory Input directory
-	 *
-	 * @return array
-	 */
-	public static function getInputOutputPaths($directory) {
-		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
-		$regexIterator = new RegexIterator(
-			$iterator,
-			'/^.+\.text$/',
-			RecursiveRegexIterator::GET_MATCH
-		);
+    /**
+     * Takes an input directory containing .text and .(x)html files, and returns an array
+     * of .text files and the corresponding output xhtml or html file. Can be used in a unit test data provider.
+     *
+     * @param string $directory Input directory
+     *
+     * @return array
+     */
+    public static function getInputOutputPaths($directory) {
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
+        $regexIterator = new RegexIterator(
+            $iterator,
+            '/^.+\.text$/',
+            RecursiveRegexIterator::GET_MATCH
+        );
 
-		$dataValues = [];
+        $dataValues = [];
 
-		/** @var SplFileInfo $inputFile */
-		foreach ($regexIterator as $inputFiles) {
-			foreach ($inputFiles as $inputMarkdownPath) {
-				$xhtml = true;
-				$expectedHtmlPath = substr($inputMarkdownPath, 0, -4) . 'xhtml';
-				if (!file_exists($expectedHtmlPath)) {
-					$expectedHtmlPath = substr($inputMarkdownPath, 0, -4) . 'html';
-					$xhtml = false;
-				}
-				$dataValues[] = [$inputMarkdownPath, $expectedHtmlPath, $xhtml];
-			}
-		}
+        /** @var SplFileInfo $inputFile */
+        foreach ($regexIterator as $inputFiles) {
+            foreach ($inputFiles as $inputMarkdownPath) {
+                $xhtml = true;
+                $expectedHtmlPath = substr($inputMarkdownPath, 0, -4) . 'xhtml';
+                if (!file_exists($expectedHtmlPath)) {
+                    $expectedHtmlPath = substr($inputMarkdownPath, 0, -4) . 'html';
+                    $xhtml = false;
+                }
+                $dataValues[] = [$inputMarkdownPath, $expectedHtmlPath, $xhtml];
+            }
+        }
 
-		return $dataValues;
-	}
+        return $dataValues;
+    }
 
-	/**
-	 * Applies PHPUnit's assertSame after normalizing both strings (e.g. ignoring whitespace differences).
-	 * Uses logic found originally in MDTest.
-	 *
-	 * @param string $string1
-	 * @param string $string2
-	 * @param string $message Positive message to print when test fails (e.g. "String1 matches String2")
-	 * @param bool $xhtml
-	 */
-	public static function assertSameNormalized($string1, $string2, $message, $xhtml = true) {
+    /**
+     * Applies PHPUnit's assertSame after normalizing both strings (e.g. ignoring whitespace differences).
+     * Uses logic found originally in MDTest.
+     *
+     * @param string $string1
+     * @param string $string2
+     * @param string $message Positive message to print when test fails (e.g. "String1 matches String2")
+     * @param bool $xhtml
+     */
+    public static function assertSameNormalized($string1, $string2, $message, $xhtml = true) {
 
-		$t_result = $string1;
-		$t_output = $string2;
+        $t_result = $string1;
+        $t_output = $string2;
 
-		// DOMDocuments
-		if ($xhtml) {
-			$document = new DOMDocument();
-			$doc_result = $document->loadXML('<!DOCTYPE html>' .
-				"<html xmlns='http://www.w3.org/1999/xhtml'>" .
-				"<body>$t_result</body></html>");
+        // DOMDocuments
+        if ($xhtml) {
+            $document = new DOMDocument();
+            $doc_result = $document->loadXML('<!DOCTYPE html>' .
+                "<html xmlns='http://www.w3.org/1999/xhtml'>" .
+                "<body>$t_result</body></html>");
 
-			$document2 = new DOMDocument();
-			$doc_output = $document2->loadXML('<!DOCTYPE html>' .
-				"<html xmlns='http://www.w3.org/1999/xhtml'>" .
-				"<body>$t_output</body></html>");
+            $document2 = new DOMDocument();
+            $doc_output = $document2->loadXML('<!DOCTYPE html>' .
+                "<html xmlns='http://www.w3.org/1999/xhtml'>" .
+                "<body>$t_output</body></html>");
 
-			if ($doc_result) {
-				static::normalizeElementContent($document->documentElement, false);
-				$n_result = $document->saveXML();
-			} else {
-				$n_result = '--- Expected Result: XML Parse Error ---';
-			}
-			if ($doc_output) {
-				static::normalizeElementContent($document2->documentElement, false);
-				$n_output = $document2->saveXML();
-			} else {
-				$n_output = '--- Output: XML Parse Error ---';
-			}
-		} else {
+            if ($doc_result) {
+                static::normalizeElementContent($document->documentElement, false);
+                $n_result = $document->saveXML();
+            } else {
+                $n_result = '--- Expected Result: XML Parse Error ---';
+            }
+            if ($doc_output) {
+                static::normalizeElementContent($document2->documentElement, false);
+                $n_output = $document2->saveXML();
+            } else {
+                $n_output = '--- Output: XML Parse Error ---';
+            }
+        } else {
 
-			// '@' suppressors used because some tests have invalid HTML (multiple elements with the same id attribute)
-			// Perhaps isolate to a separate test and remove this?
+            // '@' suppressors used because some tests have invalid HTML (multiple elements with the same id attribute)
+            // Perhaps isolate to a separate test and remove this?
 
-			$document = new DOMDocument();
-			$doc_result = @$document->loadHTML($t_result);
+            $document = new DOMDocument();
+            $doc_result = @$document->loadHTML($t_result);
 
-			$document2 = new DOMDocument();
-			$doc_output = @$document2->loadHTML($t_output);
+            $document2 = new DOMDocument();
+            $doc_output = @$document2->loadHTML($t_output);
 
-			if ($doc_result) {
-				static::normalizeElementContent($document->documentElement, false);
-				$n_result = $document->saveHTML();
-			} else {
-				$n_result = '--- Expected Result: HTML Parse Error ---';
-			}
+            if ($doc_result) {
+                static::normalizeElementContent($document->documentElement, false);
+                $n_result = $document->saveHTML();
+            } else {
+                $n_result = '--- Expected Result: HTML Parse Error ---';
+            }
 
-			if ($doc_output) {
-				static::normalizeElementContent($document2->documentElement, false);
-				$n_output = $document2->saveHTML();
-			} else {
-				$n_output = '--- Output: HTML Parse Error ---';
-			}
-		}
+            if ($doc_output) {
+                static::normalizeElementContent($document2->documentElement, false);
+                $n_output = $document2->saveHTML();
+            } else {
+                $n_output = '--- Output: HTML Parse Error ---';
+            }
+        }
 
-		$n_result = preg_replace('{^.*?<body>|</body>.*?$}is', '', $n_result);
-		$n_output = preg_replace('{^.*?<body>|</body>.*?$}is', '', $n_output);
+        $n_result = preg_replace('{^.*?<body>|</body>.*?$}is', '', $n_result);
+        $n_output = preg_replace('{^.*?<body>|</body>.*?$}is', '', $n_output);
 
-		$c_result = $n_result;
-		$c_output = $n_output;
+        $c_result = $n_result;
+        $c_output = $n_output;
 
-		$c_result = trim($c_result) . "\n";
-		$c_output = trim($c_output) . "\n";
+        $c_result = trim($c_result) . "\n";
+        $c_output = trim($c_output) . "\n";
 
-		// This will throw a test exception if the strings don't exactly match
-		TestCase::assertSame($c_result, $c_output, $message);
-	}
+        // This will throw a test exception if the strings don't exactly match
+        TestCase::assertSame($c_result, $c_output, $message);
+    }
 
-	/**
-	 * @param DOMElement $element Modifies this element by reference
-	 * @param bool $whitespace_preserve Preserve Whitespace
-	 * @return void
-	 */
-	protected static function normalizeElementContent($element, $whitespace_preserve) {
-		#
-		# Normalize content of HTML DOM $element. The $whitespace_preserve
-		# argument indicates that whitespace is significant and shouldn't be
-		# normalized; it should be used for the content of certain elements like
-		# <pre> or <script>.
-		#
-		$node_list = $element->childNodes;
-		switch (strtolower($element->nodeName)) {
-			case 'body':
-			case 'div':
-			case 'blockquote':
-			case 'ul':
-			case 'ol':
-			case 'dl':
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6':
-				$whitespace = "\n\n";
-				break;
+    /**
+     * @param DOMElement $element Modifies this element by reference
+     * @param bool $whitespace_preserve Preserve Whitespace
+     * @return void
+     */
+    protected static function normalizeElementContent($element, $whitespace_preserve) {
+        #
+        # Normalize content of HTML DOM $element. The $whitespace_preserve
+        # argument indicates that whitespace is significant and shouldn't be
+        # normalized; it should be used for the content of certain elements like
+        # <pre> or <script>.
+        #
+        $node_list = $element->childNodes;
+        switch (strtolower($element->nodeName)) {
+            case 'body':
+            case 'div':
+            case 'blockquote':
+            case 'ul':
+            case 'ol':
+            case 'dl':
+            case 'h1':
+            case 'h2':
+            case 'h3':
+            case 'h4':
+            case 'h5':
+            case 'h6':
+                $whitespace = "\n\n";
+                break;
 
-			case 'table':
-				$whitespace = "\n";
-				break;
+            case 'table':
+                $whitespace = "\n";
+                break;
 
-			case 'pre':
-			case 'script':
-			case 'style':
-			case 'title':
-				$whitespace_preserve = true;
-				$whitespace = "";
-				break;
+            case 'pre':
+            case 'script':
+            case 'style':
+            case 'title':
+                $whitespace_preserve = true;
+                $whitespace = "";
+                break;
 
-			default:
-				$whitespace = "";
-				break;
-		}
-		foreach ($node_list as $node) {
-			switch ($node->nodeType) {
-				case XML_ELEMENT_NODE:
-					static::normalizeElementContent($node, $whitespace_preserve);
-					static::normalizeElementAttributes($node);
+            default:
+                $whitespace = "";
+                break;
+        }
+        foreach ($node_list as $node) {
+            switch ($node->nodeType) {
+                case XML_ELEMENT_NODE:
+                    static::normalizeElementContent($node, $whitespace_preserve);
+                    static::normalizeElementAttributes($node);
 
-					switch (strtolower($node->nodeName)) {
-						case 'p':
-						case 'div':
-						case 'hr':
-						case 'blockquote':
-						case 'ul':
-						case 'ol':
-						case 'dl':
-						case 'li':
-						case 'address':
-						case 'table':
-						case 'dd':
-						case 'pre':
-						case 'h1':
-						case 'h2':
-						case 'h3':
-						case 'h4':
-						case 'h5':
-						case 'h6':
-							$whitespace = "\n\n";
-							break;
+                    switch (strtolower($node->nodeName)) {
+                        case 'p':
+                        case 'div':
+                        case 'hr':
+                        case 'blockquote':
+                        case 'ul':
+                        case 'ol':
+                        case 'dl':
+                        case 'li':
+                        case 'address':
+                        case 'table':
+                        case 'dd':
+                        case 'pre':
+                        case 'h1':
+                        case 'h2':
+                        case 'h3':
+                        case 'h4':
+                        case 'h5':
+                        case 'h6':
+                            $whitespace = "\n\n";
+                            break;
 
-						case 'tr':
-						case 'td':
-						case 'dt':
-							$whitespace = "\n";
-							break;
+                        case 'tr':
+                        case 'td':
+                        case 'dt':
+                            $whitespace = "\n";
+                            break;
 
-						default:
-							$whitespace = "";
-							break;
-					}
+                        default:
+                            $whitespace = "";
+                            break;
+                    }
 
-					if (($whitespace === "\n\n" || $whitespace === "\n") &&
-						$node->nextSibling &&
-						$node->nextSibling->nodeType != XML_TEXT_NODE) {
-						$element->insertBefore(new DOMText($whitespace), $node->nextSibling);
-					}
-					break;
+                    if (($whitespace === "\n\n" || $whitespace === "\n") &&
+                        $node->nextSibling &&
+                        $node->nextSibling->nodeType != XML_TEXT_NODE) {
+                        $element->insertBefore(new DOMText($whitespace), $node->nextSibling);
+                    }
+                    break;
 
-				case XML_TEXT_NODE:
-					if (!$whitespace_preserve) {
-						if (trim($node->data) === "") {
-							$node->data = $whitespace;
-						}
-						else {
-							$node->data = preg_replace('{\s+}', ' ', $node->data);
-						}
-					}
-					break;
-			}
-		}
-		if (!$whitespace_preserve &&
-			($whitespace === "\n\n" || $whitespace === "\n")) {
-			if ($element->firstChild) {
-				if ($element->firstChild->nodeType == XML_TEXT_NODE) {
-					$element->firstChild->data =
-						preg_replace('{^\s+}', "\n", $element->firstChild->data);
-				}
-				else {
-					$element->insertBefore(new DOMText("\n"), $element->firstChild);
-				}
-			}
-			if ($element->lastChild) {
-				if ($element->lastChild->nodeType == XML_TEXT_NODE) {
-					$element->lastChild->data =
-						preg_replace('{\s+$}', "\n", $element->lastChild->data);
-				}
-				else {
-					$element->insertBefore(new DOMText("\n"), null);
-				}
-			}
-		}
-	}
+                case XML_TEXT_NODE:
+                    if (!$whitespace_preserve) {
+                        if (trim($node->data) === "") {
+                            $node->data = $whitespace;
+                        }
+                        else {
+                            $node->data = preg_replace('{\s+}', ' ', $node->data);
+                        }
+                    }
+                    break;
+            }
+        }
+        if (!$whitespace_preserve &&
+            ($whitespace === "\n\n" || $whitespace === "\n")) {
+            if ($element->firstChild) {
+                if ($element->firstChild->nodeType == XML_TEXT_NODE) {
+                    $element->firstChild->data =
+                        preg_replace('{^\s+}', "\n", $element->firstChild->data);
+                }
+                else {
+                    $element->insertBefore(new DOMText("\n"), $element->firstChild);
+                }
+            }
+            if ($element->lastChild) {
+                if ($element->lastChild->nodeType == XML_TEXT_NODE) {
+                    $element->lastChild->data =
+                        preg_replace('{\s+$}', "\n", $element->lastChild->data);
+                }
+                else {
+                    $element->insertBefore(new DOMText("\n"), null);
+                }
+            }
+        }
+    }
 
-	/**
-	 * @param DOMElement $element Modifies this element by reference
-	 */
-	protected static function normalizeElementAttributes (DOMElement $element)
-	{
-		#
-		# Sort attributes by name.
-		#
-		// Gather the list of attributes as an array.
-		$attr_list = array();
-		foreach ($element->attributes as $attr_node) {
-			$attr_list[$attr_node->name] = $attr_node;
-		}
+    /**
+     * @param DOMElement $element Modifies this element by reference
+     */
+    protected static function normalizeElementAttributes (DOMElement $element)
+    {
+        #
+        # Sort attributes by name.
+        #
+        // Gather the list of attributes as an array.
+        $attr_list = array();
+        foreach ($element->attributes as $attr_node) {
+            $attr_list[$attr_node->name] = $attr_node;
+        }
 
-		// Sort attribute list by name.
-		ksort($attr_list);
+        // Sort attribute list by name.
+        ksort($attr_list);
 
-		// Remove then put back each attribute following sort order.
-		foreach ($attr_list as $attr_node) {
-			$element->removeAttributeNode($attr_node);
-			$element->setAttributeNode($attr_node);
-		}
-	}
+        // Remove then put back each attribute following sort order.
+        foreach ($attr_list as $attr_node) {
+            $element->removeAttributeNode($attr_node);
+            $element->setAttributeNode($attr_node);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 	/**
 	 * @param DOMElement $element Modifies this element by reference
 	 */
-	protected static function normalizeElementAttributes (DOMElement $element)
+	protected static function normalizeElementAttributes(DOMElement $element)
 	{
 		#
 		# Sort attributes by name.

Braces +3 added lines, -6 removed lines

@@ -210,8 +210,7 @@ 
 					if (!$whitespace_preserve) {
 						if (trim($node->data) === "") {
 							$node->data = $whitespace;
-						}
-						else {
+						} else {
 							$node->data = preg_replace('{\s+}', ' ', $node->data);
 						}
 					}
@@ -224,8 +223,7 @@ 
 				if ($element->firstChild->nodeType == XML_TEXT_NODE) {
 					$element->firstChild->data =
 						preg_replace('{^\s+}', "\n", $element->firstChild->data);
-				}
-				else {
+				} else {
 					$element->insertBefore(new DOMText("\n"), $element->firstChild);
 				}
 			}
@@ -233,8 +231,7 @@ 
 				if ($element->lastChild->nodeType == XML_TEXT_NODE) {
 					$element->lastChild->data =
 						preg_replace('{\s+$}', "\n", $element->lastChild->data);
-				}
-				else {
+				} else {
 					$element->insertBefore(new DOMText("\n"), null);
 				}
 			}

a/vendor/michelf/php-markdown/test/unit/MarkdownExtraTest.php

Indentation +46 added lines, -46 removed lines

@@ -2,50 +2,50 @@
 
 class MarkdownExtraTest extends \PHPUnit\Framework\TestCase
 {
-	public function testSetupOfPredefinedAttributes()
-	{
-		$obj = new \Michelf\MarkdownExtra();
-
-		// Allows custom expansions of arreviations to their full version with the abbr tag
-		$obj->predef_abbr = array(
-			'foo' => 'foobar-test',
-		);
-		$result = $obj->transform('**Hello world, foo**');
-
-		$this->assertSame(
-			'<p><strong>Hello world, <abbr title="foobar-test">foo</abbr></strong></p>',
-			trim($result)
-		);
-	}
-
-	public function testSetupOfMultiplePredefinedAttributes()
-	{
-		$obj = new \Michelf\MarkdownExtra();
-
-		// Allows custom expansions of arreviations to their full version with the abbr tag
-		$obj->predef_abbr = array(
-			'foo' => 'foobar-test',
-			'ISP' => 'Internet Service Provider',
-		);
-		$result = $obj->transform('**I get internet from an ISP. foo.**');
-
-		$this->assertSame(
-			'<p><strong>I get internet from an <abbr title="Internet Service Provider">ISP' .
-			'</abbr>. <abbr title="foobar-test">foo</abbr>.</strong></p>',
-			trim($result)
-		);
-	}
-
-	public function testTransformWithNoMarkup()
-	{
-		$obj = new \Michelf\MarkdownExtra();
-		$obj->no_markup = true;
-
-		$result = $obj->transform('This is a <strong class="custom">no markup</strong> test.');
-
-		$this->assertSame(
-			'<p>This is a &lt;strong class="custom">no markup&lt;/strong> test.</p>',
-			trim($result)
-		);
-	}
+    public function testSetupOfPredefinedAttributes()
+    {
+        $obj = new \Michelf\MarkdownExtra();
+
+        // Allows custom expansions of arreviations to their full version with the abbr tag
+        $obj->predef_abbr = array(
+            'foo' => 'foobar-test',
+        );
+        $result = $obj->transform('**Hello world, foo**');
+
+        $this->assertSame(
+            '<p><strong>Hello world, <abbr title="foobar-test">foo</abbr></strong></p>',
+            trim($result)
+        );
+    }
+
+    public function testSetupOfMultiplePredefinedAttributes()
+    {
+        $obj = new \Michelf\MarkdownExtra();
+
+        // Allows custom expansions of arreviations to their full version with the abbr tag
+        $obj->predef_abbr = array(
+            'foo' => 'foobar-test',
+            'ISP' => 'Internet Service Provider',
+        );
+        $result = $obj->transform('**I get internet from an ISP. foo.**');
+
+        $this->assertSame(
+            '<p><strong>I get internet from an <abbr title="Internet Service Provider">ISP' .
+            '</abbr>. <abbr title="foobar-test">foo</abbr>.</strong></p>',
+            trim($result)
+        );
+    }
+
+    public function testTransformWithNoMarkup()
+    {
+        $obj = new \Michelf\MarkdownExtra();
+        $obj->no_markup = true;
+
+        $result = $obj->transform('This is a <strong class="custom">no markup</strong> test.');
+
+        $this->assertSame(
+            '<p>This is a &lt;strong class="custom">no markup&lt;/strong> test.</p>',
+            trim($result)
+        );
+    }
 }

a/vendor/michelf/php-markdown/Michelf/Markdown.php

Indentation +1551 added lines, -1551 removed lines

@@ -14,275 +14,275 @@ 
  * Markdown Parser Class
  */
 class Markdown implements MarkdownInterface {
-	/**
-	 * Define the package version
-	 * @var string
-	 */
-	const MARKDOWNLIB_VERSION = "1.9.0";
-
-	/**
-	 * Simple function interface - Initialize the parser and return the result
-	 * of its transform method. This will work fine for derived classes too.
-	 *
-	 * @api
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	public static function defaultTransform($text) {
-		// Take parser class on which this function was called.
-		$parser_class = \get_called_class();
-
-		// Try to take parser from the static parser list
-		static $parser_list;
-		$parser =& $parser_list[$parser_class];
-
-		// Create the parser it not already set
-		if (!$parser) {
-			$parser = new $parser_class;
-		}
-
-		// Transform text using parser.
-		return $parser->transform($text);
-	}
-
-	/**
-	 * Configuration variables
-	 */
-
-	/**
-	 * Change to ">" for HTML output.
-	 * @var string
-	 */
-	public $empty_element_suffix = " />";
-
-	/**
-	 * The width of indentation of the output markup
-	 * @var int
-	 */
-	public $tab_width = 4;
-
-	/**
-	 * Change to `true` to disallow markup or entities.
-	 * @var boolean
-	 */
-	public $no_markup   = false;
-	public $no_entities = false;
-
-
-	/**
-	 * Change to `true` to enable line breaks on \n without two trailling spaces
-	 * @var boolean
-	 */
-	public $hard_wrap = false;
-
-	/**
-	 * Predefined URLs and titles for reference links and images.
-	 * @var array
-	 */
-	public $predef_urls   = array();
-	public $predef_titles = array();
-
-	/**
-	 * Optional filter function for URLs
-	 * @var callable|null
-	 */
-	public $url_filter_func = null;
-
-	/**
-	 * Optional header id="" generation callback function.
-	 * @var callable|null
-	 */
-	public $header_id_func = null;
-
-	/**
-	 * Optional function for converting code block content to HTML
-	 * @var callable|null
-	 */
-	public $code_block_content_func = null;
-
-	/**
-	 * Optional function for converting code span content to HTML.
-	 * @var callable|null
-	 */
-	public $code_span_content_func = null;
-
-	/**
-	 * Class attribute to toggle "enhanced ordered list" behaviour
-	 * setting this to true will allow ordered lists to start from the index
-	 * number that is defined first.
-	 *
-	 * For example:
-	 * 2. List item two
-	 * 3. List item three
-	 *
-	 * Becomes:
-	 * <ol start="2">
-	 * <li>List item two</li>
-	 * <li>List item three</li>
-	 * </ol>
-	 *
-	 * @var bool
-	 */
-	public $enhanced_ordered_list = false;
-
-	/**
-	 * Parser implementation
-	 */
-
-	/**
-	 * Regex to match balanced [brackets].
-	 * Needed to insert a maximum bracked depth while converting to PHP.
-	 * @var int
-	 */
-	protected $nested_brackets_depth = 6;
-	protected $nested_brackets_re;
-
-	protected $nested_url_parenthesis_depth = 4;
-	protected $nested_url_parenthesis_re;
-
-	/**
-	 * Table of hash values for escaped characters:
-	 * @var string
-	 */
-	protected $escape_chars = '\`*_{}[]()>#+-.!';
-	protected $escape_chars_re;
-
-	/**
-	 * Constructor function. Initialize appropriate member variables.
-	 * @return void
-	 */
-	public function __construct() {
-		$this->_initDetab();
-		$this->prepareItalicsAndBold();
-
-		$this->nested_brackets_re =
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-			str_repeat('\])*', $this->nested_brackets_depth);
-
-		$this->nested_url_parenthesis_re =
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
-
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
-
-		// Sort document, block, and span gamut in ascendent priority order.
-		asort($this->document_gamut);
-		asort($this->block_gamut);
-		asort($this->span_gamut);
-	}
-
-
-	/**
-	 * Internal hashes used during transformation.
-	 * @var array
-	 */
-	protected $urls        = array();
-	protected $titles      = array();
-	protected $html_hashes = array();
-
-	/**
-	 * Status flag to avoid invalid nesting.
-	 * @var boolean
-	 */
-	protected $in_anchor = false;
-
-	/**
-	 * Status flag to avoid invalid nesting.
-	 * @var boolean
-	 */
-	protected $in_emphasis_processing = false;
-
-	/**
-	 * Called before the transformation process starts to setup parser states.
-	 * @return void
-	 */
-	protected function setup() {
-		// Clear global hashes.
-		$this->urls        = $this->predef_urls;
-		$this->titles      = $this->predef_titles;
-		$this->html_hashes = array();
-		$this->in_anchor   = false;
-		$this->in_emphasis_processing = false;
-	}
-
-	/**
-	 * Called after the transformation process to clear any variable which may
-	 * be taking up memory unnecessarly.
-	 * @return void
-	 */
-	protected function teardown() {
-		$this->urls        = array();
-		$this->titles      = array();
-		$this->html_hashes = array();
-	}
-
-	/**
-	 * Main function. Performs some preprocessing on the input text and pass
-	 * it through the document gamut.
-	 *
-	 * @api
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	public function transform($text) {
-		$this->setup();
-
-		# Remove UTF-8 BOM and marker character in input, if present.
-		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
-
-		# Standardize line endings:
-		#   DOS to Unix and Mac to Unix
-		$text = preg_replace('{\r\n?}', "\n", $text);
-
-		# Make sure $text ends with a couple of newlines:
-		$text .= "\n\n";
-
-		# Convert all tabs to spaces.
-		$text = $this->detab($text);
-
-		# Turn block-level HTML blocks into hash entries
-		$text = $this->hashHTMLBlocks($text);
-
-		# Strip any lines consisting only of spaces and tabs.
-		# This makes subsequent regexen easier to write, because we can
-		# match consecutive blank lines with /\n+/ instead of something
-		# contorted like /[ ]*\n+/ .
-		$text = preg_replace('/^[ ]+$/m', '', $text);
-
-		# Run document gamut methods.
-		foreach ($this->document_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		$this->teardown();
-
-		return $text . "\n";
-	}
-
-	/**
-	 * Define the document gamut
-	 * @var array
-	 */
-	protected $document_gamut = array(
-		// Strip link definitions, store in hashes.
-		"stripLinkDefinitions" => 20,
-		"runBasicBlockGamut"   => 30,
-	);
-
-	/**
-	 * Strips link definitions from text, stores the URLs and titles in
-	 * hash references
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function stripLinkDefinitions($text) {
-
-		$less_than_tab = $this->tab_width - 1;
-
-		// Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
+    /**
+     * Define the package version
+     * @var string
+     */
+    const MARKDOWNLIB_VERSION = "1.9.0";
+
+    /**
+     * Simple function interface - Initialize the parser and return the result
+     * of its transform method. This will work fine for derived classes too.
+     *
+     * @api
+     *
+     * @param  string $text
+     * @return string
+     */
+    public static function defaultTransform($text) {
+        // Take parser class on which this function was called.
+        $parser_class = \get_called_class();
+
+        // Try to take parser from the static parser list
+        static $parser_list;
+        $parser =& $parser_list[$parser_class];
+
+        // Create the parser it not already set
+        if (!$parser) {
+            $parser = new $parser_class;
+        }
+
+        // Transform text using parser.
+        return $parser->transform($text);
+    }
+
+    /**
+     * Configuration variables
+     */
+
+    /**
+     * Change to ">" for HTML output.
+     * @var string
+     */
+    public $empty_element_suffix = " />";
+
+    /**
+     * The width of indentation of the output markup
+     * @var int
+     */
+    public $tab_width = 4;
+
+    /**
+     * Change to `true` to disallow markup or entities.
+     * @var boolean
+     */
+    public $no_markup   = false;
+    public $no_entities = false;
+
+
+    /**
+     * Change to `true` to enable line breaks on \n without two trailling spaces
+     * @var boolean
+     */
+    public $hard_wrap = false;
+
+    /**
+     * Predefined URLs and titles for reference links and images.
+     * @var array
+     */
+    public $predef_urls   = array();
+    public $predef_titles = array();
+
+    /**
+     * Optional filter function for URLs
+     * @var callable|null
+     */
+    public $url_filter_func = null;
+
+    /**
+     * Optional header id="" generation callback function.
+     * @var callable|null
+     */
+    public $header_id_func = null;
+
+    /**
+     * Optional function for converting code block content to HTML
+     * @var callable|null
+     */
+    public $code_block_content_func = null;
+
+    /**
+     * Optional function for converting code span content to HTML.
+     * @var callable|null
+     */
+    public $code_span_content_func = null;
+
+    /**
+     * Class attribute to toggle "enhanced ordered list" behaviour
+     * setting this to true will allow ordered lists to start from the index
+     * number that is defined first.
+     *
+     * For example:
+     * 2. List item two
+     * 3. List item three
+     *
+     * Becomes:
+     * <ol start="2">
+     * <li>List item two</li>
+     * <li>List item three</li>
+     * </ol>
+     *
+     * @var bool
+     */
+    public $enhanced_ordered_list = false;
+
+    /**
+     * Parser implementation
+     */
+
+    /**
+     * Regex to match balanced [brackets].
+     * Needed to insert a maximum bracked depth while converting to PHP.
+     * @var int
+     */
+    protected $nested_brackets_depth = 6;
+    protected $nested_brackets_re;
+
+    protected $nested_url_parenthesis_depth = 4;
+    protected $nested_url_parenthesis_re;
+
+    /**
+     * Table of hash values for escaped characters:
+     * @var string
+     */
+    protected $escape_chars = '\`*_{}[]()>#+-.!';
+    protected $escape_chars_re;
+
+    /**
+     * Constructor function. Initialize appropriate member variables.
+     * @return void
+     */
+    public function __construct() {
+        $this->_initDetab();
+        $this->prepareItalicsAndBold();
+
+        $this->nested_brackets_re =
+            str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+            str_repeat('\])*', $this->nested_brackets_depth);
+
+        $this->nested_url_parenthesis_re =
+            str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+            str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+
+        $this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+
+        // Sort document, block, and span gamut in ascendent priority order.
+        asort($this->document_gamut);
+        asort($this->block_gamut);
+        asort($this->span_gamut);
+    }
+
+
+    /**
+     * Internal hashes used during transformation.
+     * @var array
+     */
+    protected $urls        = array();
+    protected $titles      = array();
+    protected $html_hashes = array();
+
+    /**
+     * Status flag to avoid invalid nesting.
+     * @var boolean
+     */
+    protected $in_anchor = false;
+
+    /**
+     * Status flag to avoid invalid nesting.
+     * @var boolean
+     */
+    protected $in_emphasis_processing = false;
+
+    /**
+     * Called before the transformation process starts to setup parser states.
+     * @return void
+     */
+    protected function setup() {
+        // Clear global hashes.
+        $this->urls        = $this->predef_urls;
+        $this->titles      = $this->predef_titles;
+        $this->html_hashes = array();
+        $this->in_anchor   = false;
+        $this->in_emphasis_processing = false;
+    }
+
+    /**
+     * Called after the transformation process to clear any variable which may
+     * be taking up memory unnecessarly.
+     * @return void
+     */
+    protected function teardown() {
+        $this->urls        = array();
+        $this->titles      = array();
+        $this->html_hashes = array();
+    }
+
+    /**
+     * Main function. Performs some preprocessing on the input text and pass
+     * it through the document gamut.
+     *
+     * @api
+     *
+     * @param  string $text
+     * @return string
+     */
+    public function transform($text) {
+        $this->setup();
+
+        # Remove UTF-8 BOM and marker character in input, if present.
+        $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+
+        # Standardize line endings:
+        #   DOS to Unix and Mac to Unix
+        $text = preg_replace('{\r\n?}', "\n", $text);
+
+        # Make sure $text ends with a couple of newlines:
+        $text .= "\n\n";
+
+        # Convert all tabs to spaces.
+        $text = $this->detab($text);
+
+        # Turn block-level HTML blocks into hash entries
+        $text = $this->hashHTMLBlocks($text);
+
+        # Strip any lines consisting only of spaces and tabs.
+        # This makes subsequent regexen easier to write, because we can
+        # match consecutive blank lines with /\n+/ instead of something
+        # contorted like /[ ]*\n+/ .
+        $text = preg_replace('/^[ ]+$/m', '', $text);
+
+        # Run document gamut methods.
+        foreach ($this->document_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        $this->teardown();
+
+        return $text . "\n";
+    }
+
+    /**
+     * Define the document gamut
+     * @var array
+     */
+    protected $document_gamut = array(
+        // Strip link definitions, store in hashes.
+        "stripLinkDefinitions" => 20,
+        "runBasicBlockGamut"   => 30,
+    );
+
+    /**
+     * Strips link definitions from text, stores the URLs and titles in
+     * hash references
+     * @param  string $text
+     * @return string
+     */
+    protected function stripLinkDefinitions($text) {
+
+        $less_than_tab = $this->tab_width - 1;
+
+        // Link defs are in the form: ^[id]: url "optional title"
+        $text = preg_replace_callback('{
 							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -304,61 +304,61 @@ 
 							)?	# title is optional
 							(?:\n+|\Z)
 			}xm',
-			array($this, '_stripLinkDefinitions_callback'),
-			$text
-		);
-		return $text;
-	}
-
-	/**
-	 * The callback to strip link definitions
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		return ''; // String that will replace the block
-	}
-
-	/**
-	 * Hashify HTML blocks
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function hashHTMLBlocks($text) {
-		if ($this->no_markup) {
-			return $text;
-		}
-
-		$less_than_tab = $this->tab_width - 1;
-
-		/**
-		 * Hashify HTML blocks:
-		 *
-		 * We only want to do this for block-level HTML tags, such as headers,
-		 * lists, and tables. That's because we still want to wrap <p>s around
-		 * "paragraphs" that are wrapped in non-block-level tags, such as
-		 * anchors, phrase emphasis, and spans. The list of tags we're looking
-		 * for is hard-coded:
-		 *
-		 * *  List "a" is made of tags which can be both inline or block-level.
-		 *    These will be treated block-level when the start tag is alone on
-		 *    its line, otherwise they're not matched here and will be taken as
-		 *    inline later.
-		 * *  List "b" is made of tags which are always block-level;
-		 */
-		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|style|form|fieldset|iframe|math|svg|'.
-						   'article|section|nav|aside|hgroup|header|footer|'.
-						   'figure';
-
-		// Regular expression for the content of a block tag.
-		$nested_tags_level = 4;
-		$attr = '
+            array($this, '_stripLinkDefinitions_callback'),
+            $text
+        );
+        return $text;
+    }
+
+    /**
+     * The callback to strip link definitions
+     * @param  array $matches
+     * @return string
+     */
+    protected function _stripLinkDefinitions_callback($matches) {
+        $link_id = strtolower($matches[1]);
+        $url = $matches[2] == '' ? $matches[3] : $matches[2];
+        $this->urls[$link_id] = $url;
+        $this->titles[$link_id] =& $matches[4];
+        return ''; // String that will replace the block
+    }
+
+    /**
+     * Hashify HTML blocks
+     * @param  string $text
+     * @return string
+     */
+    protected function hashHTMLBlocks($text) {
+        if ($this->no_markup) {
+            return $text;
+        }
+
+        $less_than_tab = $this->tab_width - 1;
+
+        /**
+         * Hashify HTML blocks:
+         *
+         * We only want to do this for block-level HTML tags, such as headers,
+         * lists, and tables. That's because we still want to wrap <p>s around
+         * "paragraphs" that are wrapped in non-block-level tags, such as
+         * anchors, phrase emphasis, and spans. The list of tags we're looking
+         * for is hard-coded:
+         *
+         * *  List "a" is made of tags which can be both inline or block-level.
+         *    These will be treated block-level when the start tag is alone on
+         *    its line, otherwise they're not matched here and will be taken as
+         *    inline later.
+         * *  List "b" is made of tags which are always block-level;
+         */
+        $block_tags_a_re = 'ins|del';
+        $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+                            'script|noscript|style|form|fieldset|iframe|math|svg|'.
+                            'article|section|nav|aside|hgroup|header|footer|'.
+                            'figure';
+
+        // Regular expression for the content of a block tag.
+        $nested_tags_level = 4;
+        $attr = '
 			(?>				# optional tag attributes
 			  \s			# starts with whitespace
 			  (?>
@@ -372,8 +372,8 @@ 
 			  )*
 			)?
 			';
-		$content =
-			str_repeat('
+        $content =
+            str_repeat('
 				(?>
 				  [^<]+			# content without tag
 				|
@@ -383,32 +383,32 @@ 
 					  />
 					|
 					  >', $nested_tags_level).	// end of opening tag
-					  '.*?'.					// last level nested tag content
-			str_repeat('
+                        '.*?'.					// last level nested tag content
+            str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
 				  |
 					<(?!/\2\s*>	# other tags with a different name
 				  )
 				)*',
-				$nested_tags_level);
-		$content2 = str_replace('\2', '\3', $content);
-
-		/**
-		 * First, look for nested blocks, e.g.:
-		 * 	<div>
-		 * 		<div>
-		 * 		tags for inner block must be indented.
-		 * 		</div>
-		 * 	</div>
-		 *
-		 * The outermost tags must start at the left margin for this to match,
-		 * and the inner nested divs must be indented.
-		 * We need to do this before the next, more liberal match, because the
-		 * next match will start at the first `<div>` and stop at the
-		 * first `</div>`.
-		 */
-		$text = preg_replace_callback('{(?>
+                $nested_tags_level);
+        $content2 = str_replace('\2', '\3', $content);
+
+        /**
+         * First, look for nested blocks, e.g.:
+         * 	<div>
+         * 		<div>
+         * 		tags for inner block must be indented.
+         * 		</div>
+         * 	</div>
+         *
+         * The outermost tags must start at the left margin for this to match,
+         * and the inner nested divs must be indented.
+         * We need to do this before the next, more liberal match, because the
+         * next match will start at the first `<div>` and stop at the
+         * first `</div>`.
+         */
+        $text = preg_replace_callback('{(?>
 			(?>
 				(?<=\n)			# Starting on its own line
 				|				# or
@@ -469,117 +469,117 @@ 
 
 			)
 			)}Sxmi',
-			array($this, '_hashHTMLBlocks_callback'),
-			$text
-		);
-
-		return $text;
-	}
-
-	/**
-	 * The callback for hashing HTML blocks
-	 * @param  string $matches
-	 * @return string
-	 */
-	protected function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
-		$key  = $this->hashBlock($text);
-		return "\n\n$key\n\n";
-	}
-
-	/**
-	 * Called whenever a tag must be hashed when a function insert an atomic
-	 * element in the text stream. Passing $text to through this function gives
-	 * a unique text-token which will be reverted back when calling unhash.
-	 *
-	 * The $boundary argument specify what character should be used to surround
-	 * the token. By convension, "B" is used for block elements that needs not
-	 * to be wrapped into paragraph tags at the end, ":" is used for elements
-	 * that are word separators and "X" is used in the general case.
-	 *
-	 * @param  string $text
-	 * @param  string $boundary
-	 * @return string
-	 */
-	protected function hashPart($text, $boundary = 'X') {
-		// Swap back any tag hash found in $text so we do not have to `unhash`
-		// multiple times at the end.
-		$text = $this->unhash($text);
-
-		// Then hash the block.
-		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
-		return $key; // String that will replace the tag.
-	}
-
-	/**
-	 * Shortcut function for hashPart with block-level boundaries.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function hashBlock($text) {
-		return $this->hashPart($text, 'B');
-	}
-
-	/**
-	 * Define the block gamut - these are all the transformations that form
-	 * block-level tags like paragraphs, headers, and list items.
-	 * @var array
-	 */
-	protected $block_gamut = array(
-		"doHeaders"         => 10,
-		"doHorizontalRules" => 20,
-		"doLists"           => 40,
-		"doCodeBlocks"      => 50,
-		"doBlockQuotes"     => 60,
-	);
-
-	/**
-	 * Run block gamut tranformations.
-	 *
-	 * We need to escape raw HTML in Markdown source before doing anything
-	 * else. This need to be done for each block, and not only at the
-	 * begining in the Markdown function since hashed blocks can be part of
-	 * list items and could have been indented. Indented blocks would have
-	 * been seen as a code block in a previous pass of hashHTMLBlocks.
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function runBlockGamut($text) {
-		$text = $this->hashHTMLBlocks($text);
-		return $this->runBasicBlockGamut($text);
-	}
-
-	/**
-	 * Run block gamut tranformations, without hashing HTML blocks. This is
-	 * useful when HTML blocks are known to be already hashed, like in the first
-	 * whole-document pass.
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function runBasicBlockGamut($text) {
-
-		foreach ($this->block_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		// Finally form paragraph and restore hashed blocks.
-		$text = $this->formParagraphs($text);
-
-		return $text;
-	}
-
-	/**
-	 * Convert horizontal rules
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doHorizontalRules($text) {
-		return preg_replace(
-			'{
+            array($this, '_hashHTMLBlocks_callback'),
+            $text
+        );
+
+        return $text;
+    }
+
+    /**
+     * The callback for hashing HTML blocks
+     * @param  string $matches
+     * @return string
+     */
+    protected function _hashHTMLBlocks_callback($matches) {
+        $text = $matches[1];
+        $key  = $this->hashBlock($text);
+        return "\n\n$key\n\n";
+    }
+
+    /**
+     * Called whenever a tag must be hashed when a function insert an atomic
+     * element in the text stream. Passing $text to through this function gives
+     * a unique text-token which will be reverted back when calling unhash.
+     *
+     * The $boundary argument specify what character should be used to surround
+     * the token. By convension, "B" is used for block elements that needs not
+     * to be wrapped into paragraph tags at the end, ":" is used for elements
+     * that are word separators and "X" is used in the general case.
+     *
+     * @param  string $text
+     * @param  string $boundary
+     * @return string
+     */
+    protected function hashPart($text, $boundary = 'X') {
+        // Swap back any tag hash found in $text so we do not have to `unhash`
+        // multiple times at the end.
+        $text = $this->unhash($text);
+
+        // Then hash the block.
+        static $i = 0;
+        $key = "$boundary\x1A" . ++$i . $boundary;
+        $this->html_hashes[$key] = $text;
+        return $key; // String that will replace the tag.
+    }
+
+    /**
+     * Shortcut function for hashPart with block-level boundaries.
+     * @param  string $text
+     * @return string
+     */
+    protected function hashBlock($text) {
+        return $this->hashPart($text, 'B');
+    }
+
+    /**
+     * Define the block gamut - these are all the transformations that form
+     * block-level tags like paragraphs, headers, and list items.
+     * @var array
+     */
+    protected $block_gamut = array(
+        "doHeaders"         => 10,
+        "doHorizontalRules" => 20,
+        "doLists"           => 40,
+        "doCodeBlocks"      => 50,
+        "doBlockQuotes"     => 60,
+    );
+
+    /**
+     * Run block gamut tranformations.
+     *
+     * We need to escape raw HTML in Markdown source before doing anything
+     * else. This need to be done for each block, and not only at the
+     * begining in the Markdown function since hashed blocks can be part of
+     * list items and could have been indented. Indented blocks would have
+     * been seen as a code block in a previous pass of hashHTMLBlocks.
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function runBlockGamut($text) {
+        $text = $this->hashHTMLBlocks($text);
+        return $this->runBasicBlockGamut($text);
+    }
+
+    /**
+     * Run block gamut tranformations, without hashing HTML blocks. This is
+     * useful when HTML blocks are known to be already hashed, like in the first
+     * whole-document pass.
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function runBasicBlockGamut($text) {
+
+        foreach ($this->block_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        // Finally form paragraph and restore hashed blocks.
+        $text = $this->formParagraphs($text);
+
+        return $text;
+    }
+
+    /**
+     * Convert horizontal rules
+     * @param  string $text
+     * @return string
+     */
+    protected function doHorizontalRules($text) {
+        return preg_replace(
+            '{
 				^[ ]{0,3}	# Leading space
 				([-*_])		# $1: First marker
 				(?>			# Repeated marker group
@@ -589,83 +589,83 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
-			$text
-		);
-	}
-
-	/**
-	 * These are all the transformations that occur *within* block-level
-	 * tags like paragraphs, headers, and list items.
-	 * @var array
-	 */
-	protected $span_gamut = array(
-		// Process character escapes, code spans, and inline HTML
-		// in one shot.
-		"parseSpan"           => -30,
-		// Process anchor and image tags. Images must come first,
-		// because ![foo][f] looks like an anchor.
-		"doImages"            =>  10,
-		"doAnchors"           =>  20,
-		// Make links out of things like `<https://example.com/>`
-		// Must come after doAnchors, because you can use < and >
-		// delimiters in inline links like [this](<url>).
-		"doAutoLinks"         =>  30,
-		"encodeAmpsAndAngles" =>  40,
-		"doItalicsAndBold"    =>  50,
-		"doHardBreaks"        =>  60,
-	);
-
-	/**
-	 * Run span gamut transformations
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function runSpanGamut($text) {
-		foreach ($this->span_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		return $text;
-	}
-
-	/**
-	 * Do hard breaks
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doHardBreaks($text) {
-		if ($this->hard_wrap) {
-			return preg_replace_callback('/ *\n/',
-				array($this, '_doHardBreaks_callback'), $text);
-		} else {
-			return preg_replace_callback('/ {2,}\n/',
-				array($this, '_doHardBreaks_callback'), $text);
-		}
-	}
-
-	/**
-	 * Trigger part hashing for the hard break (callback method)
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doHardBreaks_callback($matches) {
-		return $this->hashPart("<br$this->empty_element_suffix\n");
-	}
-
-	/**
-	 * Turn Markdown link shortcuts into XHTML <a> tags.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doAnchors($text) {
-		if ($this->in_anchor) {
-			return $text;
-		}
-		$this->in_anchor = true;
-
-		// First, handle reference-style links: [link text] [id]
-		$text = preg_replace_callback('{
+            "\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
+            $text
+        );
+    }
+
+    /**
+     * These are all the transformations that occur *within* block-level
+     * tags like paragraphs, headers, and list items.
+     * @var array
+     */
+    protected $span_gamut = array(
+        // Process character escapes, code spans, and inline HTML
+        // in one shot.
+        "parseSpan"           => -30,
+        // Process anchor and image tags. Images must come first,
+        // because ![foo][f] looks like an anchor.
+        "doImages"            =>  10,
+        "doAnchors"           =>  20,
+        // Make links out of things like `<https://example.com/>`
+        // Must come after doAnchors, because you can use < and >
+        // delimiters in inline links like [this](<url>).
+        "doAutoLinks"         =>  30,
+        "encodeAmpsAndAngles" =>  40,
+        "doItalicsAndBold"    =>  50,
+        "doHardBreaks"        =>  60,
+    );
+
+    /**
+     * Run span gamut transformations
+     * @param  string $text
+     * @return string
+     */
+    protected function runSpanGamut($text) {
+        foreach ($this->span_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Do hard breaks
+     * @param  string $text
+     * @return string
+     */
+    protected function doHardBreaks($text) {
+        if ($this->hard_wrap) {
+            return preg_replace_callback('/ *\n/',
+                array($this, '_doHardBreaks_callback'), $text);
+        } else {
+            return preg_replace_callback('/ {2,}\n/',
+                array($this, '_doHardBreaks_callback'), $text);
+        }
+    }
+
+    /**
+     * Trigger part hashing for the hard break (callback method)
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doHardBreaks_callback($matches) {
+        return $this->hashPart("<br$this->empty_element_suffix\n");
+    }
+
+    /**
+     * Turn Markdown link shortcuts into XHTML <a> tags.
+     * @param  string $text
+     * @return string
+     */
+    protected function doAnchors($text) {
+        if ($this->in_anchor) {
+            return $text;
+        }
+        $this->in_anchor = true;
+
+        // First, handle reference-style links: [link text] [id]
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -679,10 +679,10 @@ 
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
+            array($this, '_doAnchors_reference_callback'), $text);
 
-		// Next, inline-style links: [link text](url "optional title")
-		$text = preg_replace_callback('{
+        // Next, inline-style links: [link text](url "optional title")
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -704,102 +704,102 @@ 
 			  \)
 			)
 			}xs',
-			array($this, '_doAnchors_inline_callback'), $text);
+            array($this, '_doAnchors_inline_callback'), $text);
 
-		// Last, handle reference-style shortcuts: [link text]
-		// These must come last in case you've also got [link text][1]
-		// or [link text](/foo)
-		$text = preg_replace_callback('{
+        // Last, handle reference-style shortcuts: [link text]
+        // These must come last in case you've also got [link text][1]
+        // or [link text](/foo)
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-
-	/**
-	 * Callback method to parse referenced anchors
-	 * @param  string $matches
-	 * @return string
-	 */
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			// for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-
-		// lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeURLAttribute($url);
-
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		} else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-
-	/**
-	 * Callback method to parse inline anchors
-	 * @param  string $matches
-	 * @return string
-	 */
-	protected function _doAnchors_inline_callback($matches) {
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		// If the URL was of the form <s p a c e s> it got caught by the HTML
-		// tag parser and hashed. Need to reverse the process before using
-		// the URL.
-		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
-
-		$url = $this->encodeURLAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
-
-		return $this->hashPart($result);
-	}
-
-	/**
-	 * Turn Markdown image shortcuts into <img> tags.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doImages($text) {
-		// First, handle reference-style labeled images: ![alt text][id]
-		$text = preg_replace_callback('{
+            array($this, '_doAnchors_reference_callback'), $text);
+
+        $this->in_anchor = false;
+        return $text;
+    }
+
+    /**
+     * Callback method to parse referenced anchors
+     * @param  string $matches
+     * @return string
+     */
+    protected function _doAnchors_reference_callback($matches) {
+        $whole_match =  $matches[1];
+        $link_text   =  $matches[2];
+        $link_id     =& $matches[3];
+
+        if ($link_id == "") {
+            // for shortcut links like [this][] or [this].
+            $link_id = $link_text;
+        }
+
+        // lower-case and turn embedded newlines into spaces
+        $link_id = strtolower($link_id);
+        $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+        if (isset($this->urls[$link_id])) {
+            $url = $this->urls[$link_id];
+            $url = $this->encodeURLAttribute($url);
+
+            $result = "<a href=\"$url\"";
+            if ( isset( $this->titles[$link_id] ) ) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+
+            $link_text = $this->runSpanGamut($link_text);
+            $result .= ">$link_text</a>";
+            $result = $this->hashPart($result);
+        } else {
+            $result = $whole_match;
+        }
+        return $result;
+    }
+
+    /**
+     * Callback method to parse inline anchors
+     * @param  string $matches
+     * @return string
+     */
+    protected function _doAnchors_inline_callback($matches) {
+        $link_text		=  $this->runSpanGamut($matches[2]);
+        $url			=  $matches[3] === '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        // If the URL was of the form <s p a c e s> it got caught by the HTML
+        // tag parser and hashed. Need to reverse the process before using
+        // the URL.
+        $unhashed = $this->unhash($url);
+        if ($unhashed !== $url)
+            $url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+
+        $url = $this->encodeURLAttribute($url);
+
+        $result = "<a href=\"$url\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\"";
+        }
+
+        $link_text = $this->runSpanGamut($link_text);
+        $result .= ">$link_text</a>";
+
+        return $this->hashPart($result);
+    }
+
+    /**
+     * Turn Markdown image shortcuts into <img> tags.
+     * @param  string $text
+     * @return string
+     */
+    protected function doImages($text) {
+        // First, handle reference-style labeled images: ![alt text][id]
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -814,11 +814,11 @@ 
 
 			)
 			}xs',
-			array($this, '_doImages_reference_callback'), $text);
+            array($this, '_doImages_reference_callback'), $text);
 
-		// Next, handle inline images:  ![alt text](url "optional title")
-		// Don't forget: encode * and _
-		$text = preg_replace_callback('{
+        // Next, handle inline images:  ![alt text](url "optional title")
+        // Don't forget: encode * and _
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -841,93 +841,93 @@ 
 			  \)
 			)
 			}xs',
-			array($this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback to parse references image tags
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); // for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeURLAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		} else {
-			// If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Callback to parse inline image tags
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeURLAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
-		}
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-	/**
-	 * Parse Markdown heading elements to HTML
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doHeaders($text) {
-		/**
-		 * Setext-style headers:
-		 *	  Header 1
-		 *	  ========
-		 *
-		 *	  Header 2
-		 *	  --------
-		 */
-		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-			array($this, '_doHeaders_callback_setext'), $text);
-
-		/**
-		 * atx-style headers:
-		 *   # Header 1
-		 *   ## Header 2
-		 *   ## Header 2 with closing hashes ##
-		 *   ...
-		 *   ###### Header 6
-		 */
-		$text = preg_replace_callback('{
+            array($this, '_doImages_inline_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback to parse references image tags
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doImages_reference_callback($matches) {
+        $whole_match = $matches[1];
+        $alt_text    = $matches[2];
+        $link_id     = strtolower($matches[3]);
+
+        if ($link_id == "") {
+            $link_id = strtolower($alt_text); // for shortcut links like ![this][].
+        }
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        if (isset($this->urls[$link_id])) {
+            $url = $this->encodeURLAttribute($this->urls[$link_id]);
+            $result = "<img src=\"$url\" alt=\"$alt_text\"";
+            if (isset($this->titles[$link_id])) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+            $result .= $this->empty_element_suffix;
+            $result = $this->hashPart($result);
+        } else {
+            // If there's no such link ID, leave intact:
+            $result = $whole_match;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Callback to parse inline image tags
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doImages_inline_callback($matches) {
+        $whole_match	= $matches[1];
+        $alt_text		= $matches[2];
+        $url			= $matches[3] == '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        $url = $this->encodeURLAttribute($url);
+        $result = "<img src=\"$url\" alt=\"$alt_text\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\""; // $title already quoted
+        }
+        $result .= $this->empty_element_suffix;
+
+        return $this->hashPart($result);
+    }
+
+    /**
+     * Parse Markdown heading elements to HTML
+     * @param  string $text
+     * @return string
+     */
+    protected function doHeaders($text) {
+        /**
+         * Setext-style headers:
+         *	  Header 1
+         *	  ========
+         *
+         *	  Header 2
+         *	  --------
+         */
+        $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+            array($this, '_doHeaders_callback_setext'), $text);
+
+        /**
+         * atx-style headers:
+         *   # Header 1
+         *   ## Header 2
+         *   ## Header 2 with closing hashes ##
+         *   ...
+         *   ###### Header 6
+         */
+        $text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -935,87 +935,87 @@ 
 				\#*			# optional closing #\'s (not counted)
 				\n+
 			}xm',
-			array($this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Setext header parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doHeaders_callback_setext($matches) {
-		// Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
-			return $matches[0];
-		}
-
-		$level = $matches[2][0] == '=' ? 1 : 2;
-
-		// ID attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
-
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-	/**
-	 * ATX header parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doHeaders_callback_atx($matches) {
-		// ID attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[2]);
-
-		$level = strlen($matches[1]);
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-	/**
-	 * If a header_id_func property is set, we can use it to automatically
-	 * generate an id attribute.
-	 *
-	 * This method returns a string in the form id="foo", or an empty string
-	 * otherwise.
-	 * @param  string $headerValue
-	 * @return string
-	 */
-	protected function _generateIdFromHeaderValue($headerValue) {
-		if (!is_callable($this->header_id_func)) {
-			return "";
-		}
-
-		$idValue = call_user_func($this->header_id_func, $headerValue);
-		if (!$idValue) {
-			return "";
-		}
-
-		return ' id="' . $this->encodeAttribute($idValue) . '"';
-	}
-
-	/**
-	 * Form HTML ordered (numbered) and unordered (bulleted) lists.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doLists($text) {
-		$less_than_tab = $this->tab_width - 1;
-
-		// Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-
-		$markers_relist = array(
-			$marker_ul_re => $marker_ol_re,
-			$marker_ol_re => $marker_ul_re,
-			);
-
-		foreach ($markers_relist as $marker_re => $other_marker_re) {
-			// Re-usable pattern to match any entirel ul or ol list:
-			$whole_list_re = '
+            array($this, '_doHeaders_callback_atx'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Setext header parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doHeaders_callback_setext($matches) {
+        // Terrible hack to check we haven't found an empty list item.
+        if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
+            return $matches[0];
+        }
+
+        $level = $matches[2][0] == '=' ? 1 : 2;
+
+        // ID attribute generation
+        $idAtt = $this->_generateIdFromHeaderValue($matches[1]);
+
+        $block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+    /**
+     * ATX header parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doHeaders_callback_atx($matches) {
+        // ID attribute generation
+        $idAtt = $this->_generateIdFromHeaderValue($matches[2]);
+
+        $level = strlen($matches[1]);
+        $block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+    /**
+     * If a header_id_func property is set, we can use it to automatically
+     * generate an id attribute.
+     *
+     * This method returns a string in the form id="foo", or an empty string
+     * otherwise.
+     * @param  string $headerValue
+     * @return string
+     */
+    protected function _generateIdFromHeaderValue($headerValue) {
+        if (!is_callable($this->header_id_func)) {
+            return "";
+        }
+
+        $idValue = call_user_func($this->header_id_func, $headerValue);
+        if (!$idValue) {
+            return "";
+        }
+
+        return ' id="' . $this->encodeAttribute($idValue) . '"';
+    }
+
+    /**
+     * Form HTML ordered (numbered) and unordered (bulleted) lists.
+     * @param  string $text
+     * @return string
+     */
+    protected function doLists($text) {
+        $less_than_tab = $this->tab_width - 1;
+
+        // Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[\.]';
+
+        $markers_relist = array(
+            $marker_ul_re => $marker_ol_re,
+            $marker_ol_re => $marker_ul_re,
+            );
+
+        foreach ($markers_relist as $marker_re => $other_marker_re) {
+            // Re-usable pattern to match any entirel ul or ol list:
+            $whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
 					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
@@ -1042,109 +1042,109 @@ 
 				)
 			'; // mx
 
-			// We use a different prefix before nested lists than top-level lists.
-			//See extended comment in _ProcessListItems().
+            // We use a different prefix before nested lists than top-level lists.
+            //See extended comment in _ProcessListItems().
 
-			if ($this->list_level) {
-				$text = preg_replace_callback('{
+            if ($this->list_level) {
+                $text = preg_replace_callback('{
 						^
 						'.$whole_list_re.'
 					}mx',
-					array($this, '_doLists_callback'), $text);
-			} else {
-				$text = preg_replace_callback('{
+                    array($this, '_doLists_callback'), $text);
+            } else {
+                $text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
 					}mx',
-					array($this, '_doLists_callback'), $text);
-			}
-		}
-
-		return $text;
-	}
-
-	/**
-	 * List parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doLists_callback($matches) {
-		// Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-		$marker_ol_start_re = '[0-9]+';
-
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-
-		$list .= "\n";
-		$result = $this->processListItems($list, $marker_any_re);
-
-		$ol_start = 1;
-		if ($this->enhanced_ordered_list) {
-			// Get the start number for ordered list.
-			if ($list_type == 'ol') {
-				$ol_start_array = array();
-				$ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
-				if ($ol_start_check){
-					$ol_start = $ol_start_array[0];
-				}
-			}
-		}
-
-		if ($ol_start > 1 && $list_type == 'ol'){
-			$result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
-		} else {
-			$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		}
-		return "\n". $result ."\n\n";
-	}
-
-	/**
-	 * Nesting tracker for list levels
-	 * @var integer
-	 */
-	protected $list_level = 0;
-
-	/**
-	 * Process the contents of a single ordered or unordered list, splitting it
-	 * into individual list items.
-	 * @param  string $list_str
-	 * @param  string $marker_any_re
-	 * @return string
-	 */
-	protected function processListItems($list_str, $marker_any_re) {
-		/**
-		 * The $this->list_level global keeps track of when we're inside a list.
-		 * Each time we enter a list, we increment it; when we leave a list,
-		 * we decrement. If it's zero, we're not in a list anymore.
-		 *
-		 * We do this because when we're not inside a list, we want to treat
-		 * something like this:
-		 *
-		 *		I recommend upgrading to version
-		 *		8. Oops, now this line is treated
-		 *		as a sub-list.
-		 *
-		 * As a single paragraph, despite the fact that the second line starts
-		 * with a digit-period-space sequence.
-		 *
-		 * Whereas when we're inside a list (or sub-list), that line will be
-		 * treated as the start of a sub-list. What a kludge, huh? This is
-		 * an aspect of Markdown's syntax that's hard to parse perfectly
-		 * without resorting to mind-reading. Perhaps the solution is to
-		 * change the syntax rules such that sub-lists must start with a
-		 * starting cardinal number; e.g. "1." or "a.".
-		 */
-		$this->list_level++;
-
-		// Trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		$list_str = preg_replace_callback('{
+                    array($this, '_doLists_callback'), $text);
+            }
+        }
+
+        return $text;
+    }
+
+    /**
+     * List parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doLists_callback($matches) {
+        // Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[\.]';
+        $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+        $marker_ol_start_re = '[0-9]+';
+
+        $list = $matches[1];
+        $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
+
+        $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+
+        $list .= "\n";
+        $result = $this->processListItems($list, $marker_any_re);
+
+        $ol_start = 1;
+        if ($this->enhanced_ordered_list) {
+            // Get the start number for ordered list.
+            if ($list_type == 'ol') {
+                $ol_start_array = array();
+                $ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
+                if ($ol_start_check){
+                    $ol_start = $ol_start_array[0];
+                }
+            }
+        }
+
+        if ($ol_start > 1 && $list_type == 'ol'){
+            $result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
+        } else {
+            $result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+        }
+        return "\n". $result ."\n\n";
+    }
+
+    /**
+     * Nesting tracker for list levels
+     * @var integer
+     */
+    protected $list_level = 0;
+
+    /**
+     * Process the contents of a single ordered or unordered list, splitting it
+     * into individual list items.
+     * @param  string $list_str
+     * @param  string $marker_any_re
+     * @return string
+     */
+    protected function processListItems($list_str, $marker_any_re) {
+        /**
+         * The $this->list_level global keeps track of when we're inside a list.
+         * Each time we enter a list, we increment it; when we leave a list,
+         * we decrement. If it's zero, we're not in a list anymore.
+         *
+         * We do this because when we're not inside a list, we want to treat
+         * something like this:
+         *
+         *		I recommend upgrading to version
+         *		8. Oops, now this line is treated
+         *		as a sub-list.
+         *
+         * As a single paragraph, despite the fact that the second line starts
+         * with a digit-period-space sequence.
+         *
+         * Whereas when we're inside a list (or sub-list), that line will be
+         * treated as the start of a sub-list. What a kludge, huh? This is
+         * an aspect of Markdown's syntax that's hard to parse perfectly
+         * without resorting to mind-reading. Perhaps the solution is to
+         * change the syntax rules such that sub-lists must start with a
+         * starting cardinal number; e.g. "1." or "a.".
+         */
+        $this->list_level++;
+
+        // Trim trailing blank lines:
+        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+        $list_str = preg_replace_callback('{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
 			('.$marker_any_re.'				# list marker and space = $3
@@ -1154,46 +1154,46 @@ 
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
 			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
 			}xm',
-			array($this, '_processListItems_callback'), $list_str);
-
-		$this->list_level--;
-		return $list_str;
-	}
-
-	/**
-	 * List item parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
-
-		if ($leading_line || $tailing_blank_line ||
-			preg_match('/\n{2,}/', $item))
-		{
-			// Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		} else {
-			// Recursion for sub-lists:
-			$item = $this->doLists($this->outdent($item));
-			$item = $this->formParagraphs($item, false);
-		}
-
-		return "<li>" . $item . "</li>\n";
-	}
-
-	/**
-	 * Process Markdown `<pre><code>` blocks.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doCodeBlocks($text) {
-		$text = preg_replace_callback('{
+            array($this, '_processListItems_callback'), $list_str);
+
+        $this->list_level--;
+        return $list_str;
+    }
+
+    /**
+     * List item parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _processListItems_callback($matches) {
+        $item = $matches[4];
+        $leading_line =& $matches[1];
+        $leading_space =& $matches[2];
+        $marker_space = $matches[3];
+        $tailing_blank_line =& $matches[5];
+
+        if ($leading_line || $tailing_blank_line ||
+            preg_match('/\n{2,}/', $item))
+        {
+            // Replace marker with the appropriate whitespace indentation
+            $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+            $item = $this->runBlockGamut($this->outdent($item)."\n");
+        } else {
+            // Recursion for sub-lists:
+            $item = $this->doLists($this->outdent($item));
+            $item = $this->formParagraphs($item, false);
+        }
+
+        return "<li>" . $item . "</li>\n";
+    }
+
+    /**
+     * Process Markdown `<pre><code>` blocks.
+     * @param  string $text
+     * @return string
+     */
+    protected function doCodeBlocks($text) {
+        $text = preg_replace_callback('{
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
 				  (?>
@@ -1203,243 +1203,243 @@ 
 				)
 				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
-			array($this, '_doCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Code block parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
-
-		$codeblock = $this->outdent($codeblock);
-		if (is_callable($this->code_block_content_func)) {
-			$codeblock = call_user_func($this->code_block_content_func, $codeblock, "");
-		} else {
-			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		}
-
-		# trim leading newlines and trailing newlines
-		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
-		$codeblock = "<pre><code>$codeblock\n</code></pre>";
-		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
-	}
-
-	/**
-	 * Create a code span markup for $code. Called from handleSpanToken.
-	 * @param  string $code
-	 * @return string
-	 */
-	protected function makeCodeSpan($code) {
-		if (is_callable($this->code_span_content_func)) {
-			$code = call_user_func($this->code_span_content_func, $code);
-		} else {
-			$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-		}
-		return $this->hashPart("<code>$code</code>");
-	}
-
-	/**
-	 * Define the emphasis operators with their regex matches
-	 * @var array
-	 */
-	protected $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?![\.,:;]?\s)',
-		'*' => '(?<![\s*])\*(?!\*)',
-		'_' => '(?<![\s_])_(?!_)',
-	);
-
-	/**
-	 * Define the strong operators with their regex matches
-	 * @var array
-	 */
-	protected $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?![\.,:;]?\s)',
-		'**' => '(?<![\s*])\*\*(?!\*)',
-		'__' => '(?<![\s_])__(?!_)',
-	);
-
-	/**
-	 * Define the emphasis + strong operators with their regex matches
-	 * @var array
-	 */
-	protected $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?![\.,:;]?\s)',
-		'***' => '(?<![\s*])\*\*\*(?!\*)',
-		'___' => '(?<![\s_])___(?!_)',
-	);
-
-	/**
-	 * Container for prepared regular expressions
-	 * @var array
-	 */
-	protected $em_strong_prepared_relist;
-
-	/**
-	 * Prepare regular expressions for searching emphasis tokens in any
-	 * context.
-	 * @return void
-	 */
-	protected function prepareItalicsAndBold() {
-		foreach ($this->em_relist as $em => $em_re) {
-			foreach ($this->strong_relist as $strong => $strong_re) {
-				// Construct list of allowed token expressions.
-				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
-				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
-
-				// Construct master expression from list.
-				$token_re = '{(' . implode('|', $token_relist) . ')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
-			}
-		}
-	}
-
-	/**
-	 * Convert Markdown italics (emphasis) and bold (strong) to HTML
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doItalicsAndBold($text) {
-		if ($this->in_emphasis_processing) {
-			return $text; // avoid reentrency
-		}
-		$this->in_emphasis_processing = true;
-
-		$token_stack = array('');
-		$text_stack = array('');
-		$em = '';
-		$strong = '';
-		$tree_char_em = false;
-
-		while (1) {
-			// Get prepared regular expression for seraching emphasis tokens
-			// in current context.
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
-
-			// Each loop iteration search for the next emphasis token.
-			// Each token is then passed to handleSpanToken.
-			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
-
-			if (empty($token)) {
-				// Reached end of text span: empty stack without emitting.
-				// any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
-				}
-				break;
-			}
-
-			$token_len = strlen($token);
-			if ($tree_char_em) {
-				// Reached closing marker while inside a three-char emphasis.
-				if ($token_len == 3) {
-					// Three-char closing marker, close em and strong.
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong><em>$span</em></strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$em = '';
-					$strong = '';
-				} else {
-					// Other closing marker: close one em or strong and
-					// change current token state to match the other
-					$token_stack[0] = str_repeat($token[0], 3-$token_len);
-					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
-					$span = $this->runSpanGamut($span);
-					$span = "<$tag>$span</$tag>";
-					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; // $$tag stands for $em or $strong
-				}
-				$tree_char_em = false;
-			} else if ($token_len == 3) {
-				if ($em) {
-					// Reached closing marker for both em and strong.
-					// Closing strong marker:
-					for ($i = 0; $i < 2; ++$i) {
-						$shifted_token = array_shift($token_stack);
-						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<$tag>$span</$tag>";
-						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; // $$tag stands for $em or $strong
-					}
-				} else {
-					// Reached opening three-char emphasis marker. Push on token
-					// stack; will be handled by the special condition above.
-					$em = $token[0];
-					$strong = "$em$em";
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$tree_char_em = true;
-				}
-			} else if ($token_len == 2) {
-				if ($strong) {
-					// Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
-						$em = '';
-					}
-					// Closing strong marker:
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong>$span</strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$strong = '';
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$strong = $token;
-				}
-			} else {
-				// Here $token_len == 1
-				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
-						// Closing emphasis marker:
-						array_shift($token_stack);
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<em>$span</em>";
-						$text_stack[0] .= $this->hashPart($span);
-						$em = '';
-					} else {
-						$text_stack[0] .= $token;
-					}
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$em = $token;
-				}
-			}
-		}
-		$this->in_emphasis_processing = false;
-		return $text_stack[0];
-	}
-
-	/**
-	 * Parse Markdown blockquotes to HTML
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doBlockQuotes($text) {
-		$text = preg_replace_callback('/
+            array($this, '_doCodeBlocks_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Code block parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doCodeBlocks_callback($matches) {
+        $codeblock = $matches[1];
+
+        $codeblock = $this->outdent($codeblock);
+        if (is_callable($this->code_block_content_func)) {
+            $codeblock = call_user_func($this->code_block_content_func, $codeblock, "");
+        } else {
+            $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+        }
+
+        # trim leading newlines and trailing newlines
+        $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+        $codeblock = "<pre><code>$codeblock\n</code></pre>";
+        return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
+    }
+
+    /**
+     * Create a code span markup for $code. Called from handleSpanToken.
+     * @param  string $code
+     * @return string
+     */
+    protected function makeCodeSpan($code) {
+        if (is_callable($this->code_span_content_func)) {
+            $code = call_user_func($this->code_span_content_func, $code);
+        } else {
+            $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+        }
+        return $this->hashPart("<code>$code</code>");
+    }
+
+    /**
+     * Define the emphasis operators with their regex matches
+     * @var array
+     */
+    protected $em_relist = array(
+        ''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?![\.,:;]?\s)',
+        '*' => '(?<![\s*])\*(?!\*)',
+        '_' => '(?<![\s_])_(?!_)',
+    );
+
+    /**
+     * Define the strong operators with their regex matches
+     * @var array
+     */
+    protected $strong_relist = array(
+        ''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?![\.,:;]?\s)',
+        '**' => '(?<![\s*])\*\*(?!\*)',
+        '__' => '(?<![\s_])__(?!_)',
+    );
+
+    /**
+     * Define the emphasis + strong operators with their regex matches
+     * @var array
+     */
+    protected $em_strong_relist = array(
+        ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?![\.,:;]?\s)',
+        '***' => '(?<![\s*])\*\*\*(?!\*)',
+        '___' => '(?<![\s_])___(?!_)',
+    );
+
+    /**
+     * Container for prepared regular expressions
+     * @var array
+     */
+    protected $em_strong_prepared_relist;
+
+    /**
+     * Prepare regular expressions for searching emphasis tokens in any
+     * context.
+     * @return void
+     */
+    protected function prepareItalicsAndBold() {
+        foreach ($this->em_relist as $em => $em_re) {
+            foreach ($this->strong_relist as $strong => $strong_re) {
+                // Construct list of allowed token expressions.
+                $token_relist = array();
+                if (isset($this->em_strong_relist["$em$strong"])) {
+                    $token_relist[] = $this->em_strong_relist["$em$strong"];
+                }
+                $token_relist[] = $em_re;
+                $token_relist[] = $strong_re;
+
+                // Construct master expression from list.
+                $token_re = '{(' . implode('|', $token_relist) . ')}';
+                $this->em_strong_prepared_relist["$em$strong"] = $token_re;
+            }
+        }
+    }
+
+    /**
+     * Convert Markdown italics (emphasis) and bold (strong) to HTML
+     * @param  string $text
+     * @return string
+     */
+    protected function doItalicsAndBold($text) {
+        if ($this->in_emphasis_processing) {
+            return $text; // avoid reentrency
+        }
+        $this->in_emphasis_processing = true;
+
+        $token_stack = array('');
+        $text_stack = array('');
+        $em = '';
+        $strong = '';
+        $tree_char_em = false;
+
+        while (1) {
+            // Get prepared regular expression for seraching emphasis tokens
+            // in current context.
+            $token_re = $this->em_strong_prepared_relist["$em$strong"];
+
+            // Each loop iteration search for the next emphasis token.
+            // Each token is then passed to handleSpanToken.
+            $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+            $text_stack[0] .= $parts[0];
+            $token =& $parts[1];
+            $text =& $parts[2];
+
+            if (empty($token)) {
+                // Reached end of text span: empty stack without emitting.
+                // any more emphasis.
+                while ($token_stack[0]) {
+                    $text_stack[1] .= array_shift($token_stack);
+                    $text_stack[0] .= array_shift($text_stack);
+                }
+                break;
+            }
+
+            $token_len = strlen($token);
+            if ($tree_char_em) {
+                // Reached closing marker while inside a three-char emphasis.
+                if ($token_len == 3) {
+                    // Three-char closing marker, close em and strong.
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong><em>$span</em></strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $em = '';
+                    $strong = '';
+                } else {
+                    // Other closing marker: close one em or strong and
+                    // change current token state to match the other
+                    $token_stack[0] = str_repeat($token[0], 3-$token_len);
+                    $tag = $token_len == 2 ? "strong" : "em";
+                    $span = $text_stack[0];
+                    $span = $this->runSpanGamut($span);
+                    $span = "<$tag>$span</$tag>";
+                    $text_stack[0] = $this->hashPart($span);
+                    $$tag = ''; // $$tag stands for $em or $strong
+                }
+                $tree_char_em = false;
+            } else if ($token_len == 3) {
+                if ($em) {
+                    // Reached closing marker for both em and strong.
+                    // Closing strong marker:
+                    for ($i = 0; $i < 2; ++$i) {
+                        $shifted_token = array_shift($token_stack);
+                        $tag = strlen($shifted_token) == 2 ? "strong" : "em";
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<$tag>$span</$tag>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $$tag = ''; // $$tag stands for $em or $strong
+                    }
+                } else {
+                    // Reached opening three-char emphasis marker. Push on token
+                    // stack; will be handled by the special condition above.
+                    $em = $token[0];
+                    $strong = "$em$em";
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $tree_char_em = true;
+                }
+            } else if ($token_len == 2) {
+                if ($strong) {
+                    // Unwind any dangling emphasis marker:
+                    if (strlen($token_stack[0]) == 1) {
+                        $text_stack[1] .= array_shift($token_stack);
+                        $text_stack[0] .= array_shift($text_stack);
+                        $em = '';
+                    }
+                    // Closing strong marker:
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong>$span</strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $strong = '';
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $strong = $token;
+                }
+            } else {
+                // Here $token_len == 1
+                if ($em) {
+                    if (strlen($token_stack[0]) == 1) {
+                        // Closing emphasis marker:
+                        array_shift($token_stack);
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<em>$span</em>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $em = '';
+                    } else {
+                        $text_stack[0] .= $token;
+                    }
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $em = $token;
+                }
+            }
+        }
+        $this->in_emphasis_processing = false;
+        return $text_stack[0];
+    }
+
+    /**
+     * Parse Markdown blockquotes to HTML
+     * @param  string $text
+     * @return string
+     */
+    protected function doBlockQuotes($text) {
+        $text = preg_replace_callback('/
 			  (								# Wrap whole match in $1
 				(?>
 				  ^[ ]*>[ ]?			# ">" at the start of a line
@@ -1449,71 +1449,71 @@ 
 				)+
 			  )
 			/xm',
-			array($this, '_doBlockQuotes_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Blockquote parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
-		// trim one level of quoting - trim whitespace-only lines
-		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq); // recurse
-
-		$bq = preg_replace('/^/m', "  ", $bq);
-		// These leading spaces cause problem with <pre> content,
-		// so we need to fix that:
-		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
-			array($this, '_doBlockQuotes_callback2'), $bq);
-
-		return "\n" . $this->hashBlock("<blockquote>\n$bq\n</blockquote>") . "\n\n";
-	}
-
-	/**
-	 * Blockquote parsing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
-		$pre = preg_replace('/^  /m', '', $pre);
-		return $pre;
-	}
-
-	/**
-	 * Parse paragraphs
-	 *
-	 * @param  string $text String to process in paragraphs
-	 * @param  boolean $wrap_in_p Whether paragraphs should be wrapped in <p> tags
-	 * @return string
-	 */
-	protected function formParagraphs($text, $wrap_in_p = true) {
-		// Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		// Wrap <p> tags and unhashify HTML blocks
-		foreach ($grafs as $key => $value) {
-			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				// Is a paragraph.
-				$value = $this->runSpanGamut($value);
-				if ($wrap_in_p) {
-					$value = preg_replace('/^([ ]*)/', "<p>", $value);
-					$value .= "</p>";
-				}
-				$grafs[$key] = $this->unhash($value);
-			} else {
-				// Is a block.
-				// Modify elements of @grafs in-place...
-				$graf = $value;
-				$block = $this->html_hashes[$graf];
-				$graf = $block;
+            array($this, '_doBlockQuotes_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Blockquote parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doBlockQuotes_callback($matches) {
+        $bq = $matches[1];
+        // trim one level of quoting - trim whitespace-only lines
+        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+        $bq = $this->runBlockGamut($bq); // recurse
+
+        $bq = preg_replace('/^/m', "  ", $bq);
+        // These leading spaces cause problem with <pre> content,
+        // so we need to fix that:
+        $bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
+            array($this, '_doBlockQuotes_callback2'), $bq);
+
+        return "\n" . $this->hashBlock("<blockquote>\n$bq\n</blockquote>") . "\n\n";
+    }
+
+    /**
+     * Blockquote parsing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doBlockQuotes_callback2($matches) {
+        $pre = $matches[1];
+        $pre = preg_replace('/^  /m', '', $pre);
+        return $pre;
+    }
+
+    /**
+     * Parse paragraphs
+     *
+     * @param  string $text String to process in paragraphs
+     * @param  boolean $wrap_in_p Whether paragraphs should be wrapped in <p> tags
+     * @return string
+     */
+    protected function formParagraphs($text, $wrap_in_p = true) {
+        // Strip leading and trailing lines:
+        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+        // Wrap <p> tags and unhashify HTML blocks
+        foreach ($grafs as $key => $value) {
+            if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+                // Is a paragraph.
+                $value = $this->runSpanGamut($value);
+                if ($wrap_in_p) {
+                    $value = preg_replace('/^([ ]*)/', "<p>", $value);
+                    $value .= "</p>";
+                }
+                $grafs[$key] = $this->unhash($value);
+            } else {
+                // Is a block.
+                // Modify elements of @grafs in-place...
+                $graf = $value;
+                $block = $this->html_hashes[$graf];
+                $graf = $block;
 //				if (preg_match('{
 //					\A
 //					(							# $1 = <div> tag
@@ -1549,86 +1549,86 @@ 
 //
 //					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
 //				}
-				$grafs[$key] = $graf;
-			}
-		}
-
-		return implode("\n\n", $grafs);
-	}
-
-	/**
-	 * Encode text for a double-quoted HTML attribute. This function
-	 * is *not* suitable for attributes enclosed in single quotes.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function encodeAttribute($text) {
-		$text = $this->encodeAmpsAndAngles($text);
-		$text = str_replace('"', '&quot;', $text);
-		return $text;
-	}
-
-	/**
-	 * Encode text for a double-quoted HTML attribute containing a URL,
-	 * applying the URL filter if set. Also generates the textual
-	 * representation for the URL (removing mailto: or tel:) storing it in $text.
-	 * This function is *not* suitable for attributes enclosed in single quotes.
-	 *
-	 * @param  string $url
-	 * @param  string $text Passed by reference
-	 * @return string        URL
-	 */
-	protected function encodeURLAttribute($url, &$text = null) {
-		if (is_callable($this->url_filter_func)) {
-			$url = call_user_func($this->url_filter_func, $url);
-		}
-
-		if (preg_match('{^mailto:}i', $url)) {
-			$url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
-		} else if (preg_match('{^tel:}i', $url)) {
-			$url = $this->encodeAttribute($url);
-			$text = substr($url, 4);
-		} else {
-			$url = $this->encodeAttribute($url);
-			$text = $url;
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Smart processing for ampersands and angle brackets that need to
-	 * be encoded. Valid character entities are left alone unless the
-	 * no-entities mode is set.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function encodeAmpsAndAngles($text) {
-		if ($this->no_entities) {
-			$text = str_replace('&', '&amp;', $text);
-		} else {
-			// Ampersand-encoding based entirely on Nat Irons's Amputator
-			// MT plugin: <http://bumppo.net/projects/amputator/>
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
-								'&amp;', $text);
-		}
-		// Encode remaining <'s
-		$text = str_replace('<', '&lt;', $text);
-
-		return $text;
-	}
-
-	/**
-	 * Parse Markdown automatic links to anchor HTML tags
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i',
-			array($this, '_doAutoLinks_url_callback'), $text);
-
-		// Email addresses: <address@domain.foo>
-		$text = preg_replace_callback('{
+                $grafs[$key] = $graf;
+            }
+        }
+
+        return implode("\n\n", $grafs);
+    }
+
+    /**
+     * Encode text for a double-quoted HTML attribute. This function
+     * is *not* suitable for attributes enclosed in single quotes.
+     * @param  string $text
+     * @return string
+     */
+    protected function encodeAttribute($text) {
+        $text = $this->encodeAmpsAndAngles($text);
+        $text = str_replace('"', '&quot;', $text);
+        return $text;
+    }
+
+    /**
+     * Encode text for a double-quoted HTML attribute containing a URL,
+     * applying the URL filter if set. Also generates the textual
+     * representation for the URL (removing mailto: or tel:) storing it in $text.
+     * This function is *not* suitable for attributes enclosed in single quotes.
+     *
+     * @param  string $url
+     * @param  string $text Passed by reference
+     * @return string        URL
+     */
+    protected function encodeURLAttribute($url, &$text = null) {
+        if (is_callable($this->url_filter_func)) {
+            $url = call_user_func($this->url_filter_func, $url);
+        }
+
+        if (preg_match('{^mailto:}i', $url)) {
+            $url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
+        } else if (preg_match('{^tel:}i', $url)) {
+            $url = $this->encodeAttribute($url);
+            $text = substr($url, 4);
+        } else {
+            $url = $this->encodeAttribute($url);
+            $text = $url;
+        }
+
+        return $url;
+    }
+
+    /**
+     * Smart processing for ampersands and angle brackets that need to
+     * be encoded. Valid character entities are left alone unless the
+     * no-entities mode is set.
+     * @param  string $text
+     * @return string
+     */
+    protected function encodeAmpsAndAngles($text) {
+        if ($this->no_entities) {
+            $text = str_replace('&', '&amp;', $text);
+        } else {
+            // Ampersand-encoding based entirely on Nat Irons's Amputator
+            // MT plugin: <http://bumppo.net/projects/amputator/>
+            $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
+                                '&amp;', $text);
+        }
+        // Encode remaining <'s
+        $text = str_replace('<', '&lt;', $text);
+
+        return $text;
+    }
+
+    /**
+     * Parse Markdown automatic links to anchor HTML tags
+     * @param  string $text
+     * @return string
+     */
+    protected function doAutoLinks($text) {
+        $text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i',
+            array($this, '_doAutoLinks_url_callback'), $text);
+
+        // Email addresses: <address@domain.foo>
+        $text = preg_replace_callback('{
 			<
 			(?:mailto:)?
 			(
@@ -1646,99 +1646,99 @@ 
 			)
 			>
 			}xi',
-			array($this, '_doAutoLinks_email_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Parse URL callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeURLAttribute($matches[1], $text);
-		$link = "<a href=\"$url\">$text</a>";
-		return $this->hashPart($link);
-	}
-
-	/**
-	 * Parse email address callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doAutoLinks_email_callback($matches) {
-		$addr = $matches[1];
-		$url = $this->encodeURLAttribute("mailto:$addr", $text);
-		$link = "<a href=\"$url\">$text</a>";
-		return $this->hashPart($link);
-	}
-
-	/**
-	 * Input: some text to obfuscate, e.g. "mailto:foo@example.com"
-	 *
-	 * Output: the same text but with most characters encoded as either a
-	 *         decimal or hex entity, in the hopes of foiling most address
-	 *         harvesting spam bots. E.g.:
-	 *
-	 *        &#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
-	 *        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
-	 *        &#x6d;
-	 *
-	 * Note: the additional output $tail is assigned the same value as the
-	 * ouput, minus the number of characters specified by $head_length.
-	 *
-	 * Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	 * With some optimizations by Milian Wolff. Forced encoding of HTML
-	 * attribute special characters by Allan Odgaard.
-	 *
-	 * @param  string  $text
-	 * @param  string  $tail Passed by reference
-	 * @param  integer $head_length
-	 * @return string
-	 */
-	protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) {
-		if ($text == "") {
-			return $tail = "";
-		}
-
-		$chars = preg_split('/(?<!^)(?!$)/', $text);
-		$seed = (int)abs(crc32($text) / strlen($text)); // Deterministic seed.
-
-		foreach ($chars as $key => $char) {
-			$ord = ord($char);
-			// Ignore non-ascii chars.
-			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; // Pseudo-random function.
-				// roughly 10% raw, 45% hex, 45% dec
-				// '@' *must* be encoded. I insist.
-				// '"' and '>' have to be encoded inside the attribute
-				if ($r > 90 && strpos('@"&>', $char) === false) {
-					/* do nothing */
-				} else if ($r < 45) {
-					$chars[$key] = '&#x'.dechex($ord).';';
-				} else {
-					$chars[$key] = '&#'.$ord.';';
-				}
-			}
-		}
-
-		$text = implode('', $chars);
-		$tail = $head_length ? implode('', array_slice($chars, $head_length)) : $text;
-
-		return $text;
-	}
-
-	/**
-	 * Take the string $str and parse it into tokens, hashing embeded HTML,
-	 * escaped characters and handling code spans.
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function parseSpan($str) {
-		$output = '';
-
-		$span_re = '{
+            array($this, '_doAutoLinks_email_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Parse URL callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doAutoLinks_url_callback($matches) {
+        $url = $this->encodeURLAttribute($matches[1], $text);
+        $link = "<a href=\"$url\">$text</a>";
+        return $this->hashPart($link);
+    }
+
+    /**
+     * Parse email address callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doAutoLinks_email_callback($matches) {
+        $addr = $matches[1];
+        $url = $this->encodeURLAttribute("mailto:$addr", $text);
+        $link = "<a href=\"$url\">$text</a>";
+        return $this->hashPart($link);
+    }
+
+    /**
+     * Input: some text to obfuscate, e.g. "mailto:foo@example.com"
+     *
+     * Output: the same text but with most characters encoded as either a
+     *         decimal or hex entity, in the hopes of foiling most address
+     *         harvesting spam bots. E.g.:
+     *
+     *        &#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+     *        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+     *        &#x6d;
+     *
+     * Note: the additional output $tail is assigned the same value as the
+     * ouput, minus the number of characters specified by $head_length.
+     *
+     * Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+     * With some optimizations by Milian Wolff. Forced encoding of HTML
+     * attribute special characters by Allan Odgaard.
+     *
+     * @param  string  $text
+     * @param  string  $tail Passed by reference
+     * @param  integer $head_length
+     * @return string
+     */
+    protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) {
+        if ($text == "") {
+            return $tail = "";
+        }
+
+        $chars = preg_split('/(?<!^)(?!$)/', $text);
+        $seed = (int)abs(crc32($text) / strlen($text)); // Deterministic seed.
+
+        foreach ($chars as $key => $char) {
+            $ord = ord($char);
+            // Ignore non-ascii chars.
+            if ($ord < 128) {
+                $r = ($seed * (1 + $key)) % 100; // Pseudo-random function.
+                // roughly 10% raw, 45% hex, 45% dec
+                // '@' *must* be encoded. I insist.
+                // '"' and '>' have to be encoded inside the attribute
+                if ($r > 90 && strpos('@"&>', $char) === false) {
+                    /* do nothing */
+                } else if ($r < 45) {
+                    $chars[$key] = '&#x'.dechex($ord).';';
+                } else {
+                    $chars[$key] = '&#'.$ord.';';
+                }
+            }
+        }
+
+        $text = implode('', $chars);
+        $tail = $head_length ? implode('', array_slice($chars, $head_length)) : $text;
+
+        return $text;
+    }
+
+    /**
+     * Take the string $str and parse it into tokens, hashing embeded HTML,
+     * escaped characters and handling code spans.
+     * @param  string $str
+     * @return string
+     */
+    protected function parseSpan($str) {
+        $output = '';
+
+        $span_re = '{
 				(
 					\\\\'.$this->escape_chars_re.'
 				|
@@ -1764,146 +1764,146 @@ 
 				)
 				}xs';
 
-		while (1) {
-			// Each loop iteration seach for either the next tag, the next
-			// openning code span marker, or the next escaped character.
-			// Each token is then passed to handleSpanToken.
-			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-
-			// Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
-			}
-
-			// Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
-			} else {
-				break;
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Handle $token provided by parseSpan by determining its nature and
-	 * returning the corresponding value that should replace it.
-	 * @param  string $token
-	 * @param  string $str Passed by reference
-	 * @return string
-	 */
-	protected function handleSpanToken($token, &$str) {
-		switch ($token[0]) {
-			case "\\":
-				return $this->hashPart("&#". ord($token[1]). ";");
-			case "`":
-				// Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
-					$str, $matches))
-				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
-					return $this->hashPart($codespan);
-				}
-				return $token; // Return as text since no ending marker found.
-			default:
-				return $this->hashPart($token);
-		}
-	}
-
-	/**
-	 * Remove one level of line-leading tabs or spaces
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function outdent($text) {
-		return preg_replace('/^(\t|[ ]{1,' . $this->tab_width . '})/m', '', $text);
-	}
-
-
-	/**
-	 * String length function for detab. `_initDetab` will create a function to
-	 * handle UTF-8 if the default function does not exist.
-	 * @var string
-	 */
-	protected $utf8_strlen = 'mb_strlen';
-
-	/**
-	 * Replace tabs with the appropriate amount of spaces.
-	 *
-	 * For each line we separate the line in blocks delemited by tab characters.
-	 * Then we reconstruct every line by adding the  appropriate number of space
-	 * between each blocks.
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function detab($text) {
-		$text = preg_replace_callback('/^.*\t.*$/m',
-			array($this, '_detab_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Replace tabs callback
-	 * @param  string $matches
-	 * @return string
-	 */
-	protected function _detab_callback($matches) {
-		$line = $matches[0];
-		$strlen = $this->utf8_strlen; // strlen function for UTF-8.
-
-		// Split in blocks.
-		$blocks = explode("\t", $line);
-		// Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); // Do not add first block twice.
-		foreach ($blocks as $block) {
-			// Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width -
-				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
-		}
-		return $line;
-	}
-
-	/**
-	 * Check for the availability of the function in the `utf8_strlen` property
-	 * (initially `mb_strlen`). If the function is not available, create a
-	 * function that will loosely count the number of UTF-8 characters with a
-	 * regular expression.
-	 * @return void
-	 */
-	protected function _initDetab() {
-
-		if (function_exists($this->utf8_strlen)) {
-			return;
-		}
-
-		$this->utf8_strlen = function($text) {
-			return preg_match_all('/[\x00-\xBF]|[\xC0-\xFF][\x80-\xBF]*/', $text, $m);
-		};
-	}
-
-	/**
-	 * Swap back in all the tags hashed by _HashHTMLBlocks.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function unhash($text) {
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/',
-			array($this, '_unhash_callback'), $text);
-	}
-
-	/**
-	 * Unhashing callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
-	}
+        while (1) {
+            // Each loop iteration seach for either the next tag, the next
+            // openning code span marker, or the next escaped character.
+            // Each token is then passed to handleSpanToken.
+            $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+            // Create token from text preceding tag.
+            if ($parts[0] != "") {
+                $output .= $parts[0];
+            }
+
+            // Check if we reach the end.
+            if (isset($parts[1])) {
+                $output .= $this->handleSpanToken($parts[1], $parts[2]);
+                $str = $parts[2];
+            } else {
+                break;
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Handle $token provided by parseSpan by determining its nature and
+     * returning the corresponding value that should replace it.
+     * @param  string $token
+     * @param  string $str Passed by reference
+     * @return string
+     */
+    protected function handleSpanToken($token, &$str) {
+        switch ($token[0]) {
+            case "\\":
+                return $this->hashPart("&#". ord($token[1]). ";");
+            case "`":
+                // Search for end marker in remaining text.
+                if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
+                    $str, $matches))
+                {
+                    $str = $matches[2];
+                    $codespan = $this->makeCodeSpan($matches[1]);
+                    return $this->hashPart($codespan);
+                }
+                return $token; // Return as text since no ending marker found.
+            default:
+                return $this->hashPart($token);
+        }
+    }
+
+    /**
+     * Remove one level of line-leading tabs or spaces
+     * @param  string $text
+     * @return string
+     */
+    protected function outdent($text) {
+        return preg_replace('/^(\t|[ ]{1,' . $this->tab_width . '})/m', '', $text);
+    }
+
+
+    /**
+     * String length function for detab. `_initDetab` will create a function to
+     * handle UTF-8 if the default function does not exist.
+     * @var string
+     */
+    protected $utf8_strlen = 'mb_strlen';
+
+    /**
+     * Replace tabs with the appropriate amount of spaces.
+     *
+     * For each line we separate the line in blocks delemited by tab characters.
+     * Then we reconstruct every line by adding the  appropriate number of space
+     * between each blocks.
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function detab($text) {
+        $text = preg_replace_callback('/^.*\t.*$/m',
+            array($this, '_detab_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Replace tabs callback
+     * @param  string $matches
+     * @return string
+     */
+    protected function _detab_callback($matches) {
+        $line = $matches[0];
+        $strlen = $this->utf8_strlen; // strlen function for UTF-8.
+
+        // Split in blocks.
+        $blocks = explode("\t", $line);
+        // Add each blocks to the line.
+        $line = $blocks[0];
+        unset($blocks[0]); // Do not add first block twice.
+        foreach ($blocks as $block) {
+            // Calculate amount of space, insert spaces, insert block.
+            $amount = $this->tab_width -
+                $strlen($line, 'UTF-8') % $this->tab_width;
+            $line .= str_repeat(" ", $amount) . $block;
+        }
+        return $line;
+    }
+
+    /**
+     * Check for the availability of the function in the `utf8_strlen` property
+     * (initially `mb_strlen`). If the function is not available, create a
+     * function that will loosely count the number of UTF-8 characters with a
+     * regular expression.
+     * @return void
+     */
+    protected function _initDetab() {
+
+        if (function_exists($this->utf8_strlen)) {
+            return;
+        }
+
+        $this->utf8_strlen = function($text) {
+            return preg_match_all('/[\x00-\xBF]|[\xC0-\xFF][\x80-\xBF]*/', $text, $m);
+        };
+    }
+
+    /**
+     * Swap back in all the tags hashed by _HashHTMLBlocks.
+     * @param  string $text
+     * @return string
+     */
+    protected function unhash($text) {
+        return preg_replace_callback('/(.)\x1A[0-9]+\1/',
+            array($this, '_unhash_callback'), $text);
+    }
+
+    /**
+     * Unhashing callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _unhash_callback($matches) {
+        return $this->html_hashes[$matches[0]];
+    }
 }

Spacing +79 added lines, -79 removed lines

@@ -35,7 +35,7 @@ 
 
 		// Try to take parser from the static parser list
 		static $parser_list;
-		$parser =& $parser_list[$parser_class];
+		$parser = & $parser_list[$parser_class];
 
 		// Create the parser it not already set
 		if (!$parser) {
@@ -157,14 +157,14 @@ 
 		$this->prepareItalicsAndBold();
 
 		$this->nested_brackets_re =
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth) .
 			str_repeat('\])*', $this->nested_brackets_depth);
 
 		$this->nested_url_parenthesis_re =
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth) .
 			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
 
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+		$this->escape_chars_re = '[' . preg_quote($this->escape_chars) . ']';
 
 		// Sort document, block, and span gamut in ascendent priority order.
 		asort($this->document_gamut);
@@ -283,7 +283,7 @@ 
 
 		// Link defs are in the form: ^[id]: url "optional title"
 		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							^[ ]{0,'.$less_than_tab . '}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
 							  [ ]*
@@ -319,7 +319,7 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
+		$this->titles[$link_id] = & $matches[4];
 		return ''; // String that will replace the block
 	}
 
@@ -351,9 +351,9 @@ 
 		 * *  List "b" is made of tags which are always block-level;
 		 */
 		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|style|form|fieldset|iframe|math|svg|'.
-						   'article|section|nav|aside|hgroup|header|footer|'.
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|' .
+						   'script|noscript|style|form|fieldset|iframe|math|svg|' .
+						   'article|section|nav|aside|hgroup|header|footer|' .
 						   'figure';
 
 		// Regular expression for the content of a block tag.
@@ -378,12 +378,12 @@ 
 				  [^<]+			# content without tag
 				|
 				  <\2			# nested opening tag
-					'.$attr.'	# attributes
+					'.$attr . '	# attributes
 					(?>
 					  />
 					|
-					  >', $nested_tags_level).	// end of opening tag
-					  '.*?'.					// last level nested tag content
+					  >', $nested_tags_level) . // end of opening tag
+					  '.*?' . // last level nested tag content
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
@@ -419,20 +419,20 @@ 
 			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags
 			  # in between.
 
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_b_re.')# start tag = $2
-						'.$attr.'>			# attributes followed by > and \n
-						'.$content.'		# content, support nesting
+						[ ]{0,'.$less_than_tab . '}
+						<('.$block_tags_b_re . ')# start tag = $2
+						'.$attr . '>			# attributes followed by > and \n
+						'.$content . '		# content, support nesting
 						</\2>				# the matching end tag
 						[ ]*				# trailing spaces/tabs
 						(?=\n+|\Z)	# followed by a newline or end of document
 
 			| # Special version for tags of group a.
 
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_a_re.')# start tag = $3
-						'.$attr.'>[ ]*\n	# attributes followed by >
-						'.$content2.'		# content, support nesting
+						[ ]{0,'.$less_than_tab . '}
+						<('.$block_tags_a_re . ')# start tag = $3
+						'.$attr . '>[ ]*\n	# attributes followed by >
+						'.$content2 . '		# content, support nesting
 						</\3>				# the matching end tag
 						[ ]*				# trailing spaces/tabs
 						(?=\n+|\Z)	# followed by a newline or end of document
@@ -440,16 +440,16 @@ 
 			| # Special case just for <hr />. It was easier to make a special
 			  # case than to make the other regex more complicated.
 
-						[ ]{0,'.$less_than_tab.'}
+						[ ]{0,'.$less_than_tab . '}
 						<(hr)				# start tag = $2
-						'.$attr.'			# attributes
+						'.$attr . '			# attributes
 						/?>					# the matching end tag
 						[ ]*
 						(?=\n{2,}|\Z)		# followed by a blank line or end of document
 
 			| # Special case for standalone HTML comments:
 
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?s:
 						<!-- .*? -->
 					)
@@ -458,7 +458,7 @@ 
 
 			| # PHP and ASP-style processor instructions (<? and <%)
 
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?s:
 						<([?%])			# $2
 						.*?
@@ -589,7 +589,7 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
+			"\n" . $this->hashBlock("<hr$this->empty_element_suffix") . "\n",
 			$text
 		);
 	}
@@ -668,7 +668,7 @@ 
 		$text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -685,14 +685,14 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 			  \(			# literal paren
 				[ \n]*
 				(?:
 					<(.+?)>	# href = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
+					('.$this->nested_url_parenthesis_re . ')	# href = $4
 				)
 				[ \n]*
 				(			# $5
@@ -728,9 +728,9 @@ 
 	 * @return string
 	 */
 	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			// for shortcut links like [this][] or [this].
@@ -746,10 +746,10 @@ 
 			$url = $this->encodeURLAttribute($url);
 
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 
 			$link_text = $this->runSpanGamut($link_text);
@@ -767,9 +767,9 @@ 
 	 * @return string
 	 */
 	protected function _doAnchors_inline_callback($matches) {
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url = $matches[3] === '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		// If the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using
@@ -783,7 +783,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		$link_text = $this->runSpanGamut($link_text);
@@ -802,7 +802,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -821,7 +821,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 			  \s?			# One optional whitespace character
 			  \(			# literal paren
@@ -829,7 +829,7 @@ 
 				(?:
 					<(\S*)>	# src url = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
+					('.$this->nested_url_parenthesis_re . ')	# src url = $4
 				)
 				[ \n]*
 				(			# $5
@@ -867,7 +867,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
@@ -885,17 +885,17 @@ 
 	 * @return string
 	 */
 	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$alt_text = $matches[2];
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
+			$result .= " title=\"$title\""; // $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -956,7 +956,7 @@ 
 		// ID attribute generation
 		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
 
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
+		$block = "<h$level$idAtt>" . $this->runSpanGamut($matches[1]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 
@@ -970,7 +970,7 @@ 
 		$idAtt = $this->_generateIdFromHeaderValue($matches[2]);
 
 		$level = strlen($matches[1]);
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
+		$block = "<h$level$idAtt>" . $this->runSpanGamut($matches[2]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 
@@ -1018,8 +1018,8 @@ 
 			$whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
-					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
-					('.$marker_re.')			# $4 = first list item marker
+					([ ]{0,'.$less_than_tab . '})	# $3 = number of spaces
+					('.$marker_re . ')			# $4 = first list item marker
 					[ ]+
 				  )
 				  (?s:.+?)
@@ -1030,13 +1030,13 @@ 
 					  (?=\S)
 					  (?!						# Negative lookahead for another list item marker
 						[ ]*
-						'.$marker_re.'[ ]+
+						'.$marker_re . '[ ]+
 					  )
 					|
 					  (?=						# Lookahead for another kind of list
 					    \n
 						\3						# Must have the same indentation
-						'.$other_marker_re.'[ ]+
+						'.$other_marker_re . '[ ]+
 					  )
 				  )
 				)
@@ -1048,13 +1048,13 @@ 
 			if ($this->list_level) {
 				$text = preg_replace_callback('{
 						^
-						'.$whole_list_re.'
+						'.$whole_list_re . '
 					}mx',
 					array($this, '_doLists_callback'), $text);
 			} else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
-						'.$whole_list_re.'
+						'.$whole_list_re . '
 					}mx',
 					array($this, '_doLists_callback'), $text);
 			}
@@ -1078,7 +1078,7 @@ 
 		$list = $matches[1];
 		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
 
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		$marker_any_re = ($list_type == "ul" ? $marker_ul_re : $marker_ol_re);
 
 		$list .= "\n";
 		$result = $this->processListItems($list, $marker_any_re);
@@ -1089,18 +1089,18 @@ 
 			if ($list_type == 'ol') {
 				$ol_start_array = array();
 				$ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
-				if ($ol_start_check){
+				if ($ol_start_check) {
 					$ol_start = $ol_start_array[0];
 				}
 			}
 		}
 
-		if ($ol_start > 1 && $list_type == 'ol'){
+		if ($ol_start > 1 && $list_type == 'ol') {
 			$result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
 		} else {
 			$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
 		}
-		return "\n". $result ."\n\n";
+		return "\n" . $result . "\n\n";
 	}
 
 	/**
@@ -1147,12 +1147,12 @@ 
 		$list_str = preg_replace_callback('{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
-			('.$marker_any_re.'				# list marker and space = $3
+			('.$marker_any_re . '				# list marker and space = $3
 				(?:[ ]+|(?=\n))	# space only required if item is not empty
 			)
 			((?s:.*?))						# list item text   = $4
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
-			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+			(?= \n* (\z | \2 ('.$marker_any_re . ') (?:[ ]+|(?=\n))))
 			}xm',
 			array($this, '_processListItems_callback'), $list_str);
 
@@ -1167,17 +1167,17 @@ 
 	 */
 	protected function _processListItems_callback($matches) {
 		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
+		$leading_line = & $matches[1];
+		$leading_space = & $matches[2];
 		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
+		$tailing_blank_line = & $matches[5];
 
 		if ($leading_line || $tailing_blank_line ||
 			preg_match('/\n{2,}/', $item))
 		{
 			// Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
+			$item = $this->runBlockGamut($this->outdent($item) . "\n");
 		} else {
 			// Recursion for sub-lists:
 			$item = $this->doLists($this->outdent($item));
@@ -1197,11 +1197,11 @@ 
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
 				  (?>
-					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					[ ]{'.$this->tab_width . '}  # Lines must start with a tab or a tab-width of spaces
 					.*\n+
 				  )+
 				)
-				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+				((?=^[ ]{0,'.$this->tab_width . '}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
 			array($this, '_doCodeBlocks_callback'), $text);
 
@@ -1329,8 +1329,8 @@ 
 			// Each token is then passed to handleSpanToken.
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
 			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+			$token = & $parts[1];
+			$text = & $parts[2];
 
 			if (empty($token)) {
 				// Reached end of text span: empty stack without emitting.
@@ -1357,7 +1357,7 @@ 
 				} else {
 					// Other closing marker: close one em or strong and
 					// change current token state to match the other
-					$token_stack[0] = str_repeat($token[0], 3-$token_len);
+					$token_stack[0] = str_repeat($token[0], 3 - $token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
@@ -1703,22 +1703,22 @@ 
 		}
 
 		$chars = preg_split('/(?<!^)(?!$)/', $text);
-		$seed = (int)abs(crc32($text) / strlen($text)); // Deterministic seed.
+		$seed = (int)abs(crc32($text)/strlen($text)); // Deterministic seed.
 
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
 			// Ignore non-ascii chars.
 			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; // Pseudo-random function.
+				$r = ($seed*(1 + $key))%100; // Pseudo-random function.
 				// roughly 10% raw, 45% hex, 45% dec
 				// '@' *must* be encoded. I insist.
 				// '"' and '>' have to be encoded inside the attribute
 				if ($r > 90 && strpos('@"&>', $char) === false) {
 					/* do nothing */
 				} else if ($r < 45) {
-					$chars[$key] = '&#x'.dechex($ord).';';
+					$chars[$key] = '&#x' . dechex($ord) . ';';
 				} else {
-					$chars[$key] = '&#'.$ord.';';
+					$chars[$key] = '&#' . $ord . ';';
 				}
 			}
 		}
@@ -1740,11 +1740,11 @@ 
 
 		$span_re = '{
 				(
-					\\\\'.$this->escape_chars_re.'
+					\\\\'.$this->escape_chars_re . '
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1760,7 +1760,7 @@ 
 					<[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
 				|
 					</[-a-zA-Z0-9:_]+\s*> # closing tag
-			').'
+			') . '
 				)
 				}xs';
 
@@ -1797,10 +1797,10 @@ 
 	protected function handleSpanToken($token, &$str) {
 		switch ($token[0]) {
 			case "\\":
-				return $this->hashPart("&#". ord($token[1]). ";");
+				return $this->hashPart("&#" . ord($token[1]) . ";");
 			case "`":
 				// Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
+				if (preg_match('/^(.*?[^`])' . preg_quote($token) . '(?!`)(.*)$/sm',
 					$str, $matches))
 				{
 					$str = $matches[2];
@@ -1864,7 +1864,7 @@ 
 		foreach ($blocks as $block) {
 			// Calculate amount of space, insert spaces, insert block.
 			$amount = $this->tab_width -
-				$strlen($line, 'UTF-8') % $this->tab_width;
+				$strlen($line, 'UTF-8')%$this->tab_width;
 			$line .= str_repeat(" ", $amount) . $block;
 		}
 		return $line;

Braces +3 added lines, -2 removed lines

@@ -775,8 +775,9 @@
 		// tag parser and hashed. Need to reverse the process before using
 		// the URL.
 		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		if ($unhashed !== $url) {
+					$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		}
 
 		$url = $this->encodeURLAttribute($url);
 

a/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php

Indentation +1535 added lines, -1535 removed lines

@@ -14,287 +14,287 @@ 
  * Markdown Extra Parser Class
  */
 class MarkdownExtra extends \Michelf\Markdown {
-	/**
-	 * Configuration variables
-	 */
-
-	/**
-	 * Prefix for footnote ids.
-	 * @var string
-	 */
-	public $fn_id_prefix = "";
-
-	/**
-	 * Optional title attribute for footnote links.
-	 * @var string
-	 */
-	public $fn_link_title = "";
-
-	/**
-	 * Optional class attribute for footnote links and backlinks.
-	 * @var string
-	 */
-	public $fn_link_class     = "footnote-ref";
-	public $fn_backlink_class = "footnote-backref";
-
-	/**
-	 * Content to be displayed within footnote backlinks. The default is '↩';
-	 * the U+FE0E on the end is a Unicode variant selector used to prevent iOS
-	 * from displaying the arrow character as an emoji.
-	 * Optionally use '^^' and '%%' to refer to the footnote number and
-	 * reference number respectively. {@see parseFootnotePlaceholders()}
-	 * @var string
-	 */
-	public $fn_backlink_html = '↩︎';
-
-	/**
-	 * Optional title and aria-label attributes for footnote backlinks for
-	 * added accessibility (to ensure backlink uniqueness).
-	 * Use '^^' and '%%' to refer to the footnote number and reference number
-	 * respectively. {@see parseFootnotePlaceholders()}
-	 * @var string
-	 */
-	public $fn_backlink_title = "";
-	public $fn_backlink_label = "";
-
-	/**
-	 * Class name for table cell alignment (%% replaced left/center/right)
-	 * For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
-	 * If empty, the align attribute is used instead of a class name.
-	 * @var string
-	 */
-	public $table_align_class_tmpl = '';
-
-	/**
-	 * Optional class prefix for fenced code block.
-	 * @var string
-	 */
-	public $code_class_prefix = "";
-
-	/**
-	 * Class attribute for code blocks goes on the `code` tag;
-	 * setting this to true will put attributes on the `pre` tag instead.
-	 * @var boolean
-	 */
-	public $code_attr_on_pre = false;
-
-	/**
-	 * Predefined abbreviations.
-	 * @var array
-	 */
-	public $predef_abbr = array();
-
-	/**
-	 * Only convert atx-style headers if there's a space between the header and #
-	 * @var boolean
-	 */
-	public $hashtag_protection = false;
-
-	/**
-	 * Determines whether footnotes should be appended to the end of the document.
-	 * If true, footnote html can be retrieved from $this->footnotes_assembled.
-	 * @var boolean
-	 */
-	public $omit_footnotes = false;
-
-
-	/**
-	 * After parsing, the HTML for the list of footnotes appears here.
-	 * This is available only if $omit_footnotes == true.
-	 *
-	 * Note: when placing the content of `footnotes_assembled` on the page,
-	 * consider adding the attribute `role="doc-endnotes"` to the `div` or
-	 * `section` that will enclose the list of footnotes so they are
-	 * reachable to accessibility tools the same way they would be with the
-	 * default HTML output.
-	 * @var null|string
-	 */
-	public $footnotes_assembled = null;
-
-	/**
-	 * Parser implementation
-	 */
-
-	/**
-	 * Constructor function. Initialize the parser object.
-	 * @return void
-	 */
-	public function __construct() {
-		// Add extra escapable characters before parent constructor
-		// initialize the table.
-		$this->escape_chars .= ':|';
-
-		// Insert extra document, block, and span transformations.
-		// Parent constructor will do the sorting.
-		$this->document_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"stripFootnotes"     => 15,
-			"stripAbbreviations" => 25,
-			"appendFootnotes"    => 50,
-		);
-		$this->block_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"doTables"           => 15,
-			"doDefLists"         => 45,
-		);
-		$this->span_gamut += array(
-			"doFootnotes"        => 5,
-			"doAbbreviations"    => 70,
-		);
-
-		$this->enhanced_ordered_list = true;
-		parent::__construct();
-	}
-
-
-	/**
-	 * Extra variables used during extra transformations.
-	 * @var array
-	 */
-	protected $footnotes = array();
-	protected $footnotes_ordered = array();
-	protected $footnotes_ref_count = array();
-	protected $footnotes_numbers = array();
-	protected $abbr_desciptions = array();
-	/** @var string */
-	protected $abbr_word_re = '';
-
-	/**
-	 * Give the current footnote number.
-	 * @var integer
-	 */
-	protected $footnote_counter = 1;
+    /**
+     * Configuration variables
+     */
+
+    /**
+     * Prefix for footnote ids.
+     * @var string
+     */
+    public $fn_id_prefix = "";
+
+    /**
+     * Optional title attribute for footnote links.
+     * @var string
+     */
+    public $fn_link_title = "";
+
+    /**
+     * Optional class attribute for footnote links and backlinks.
+     * @var string
+     */
+    public $fn_link_class     = "footnote-ref";
+    public $fn_backlink_class = "footnote-backref";
+
+    /**
+     * Content to be displayed within footnote backlinks. The default is '↩';
+     * the U+FE0E on the end is a Unicode variant selector used to prevent iOS
+     * from displaying the arrow character as an emoji.
+     * Optionally use '^^' and '%%' to refer to the footnote number and
+     * reference number respectively. {@see parseFootnotePlaceholders()}
+     * @var string
+     */
+    public $fn_backlink_html = '↩︎';
+
+    /**
+     * Optional title and aria-label attributes for footnote backlinks for
+     * added accessibility (to ensure backlink uniqueness).
+     * Use '^^' and '%%' to refer to the footnote number and reference number
+     * respectively. {@see parseFootnotePlaceholders()}
+     * @var string
+     */
+    public $fn_backlink_title = "";
+    public $fn_backlink_label = "";
+
+    /**
+     * Class name for table cell alignment (%% replaced left/center/right)
+     * For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
+     * If empty, the align attribute is used instead of a class name.
+     * @var string
+     */
+    public $table_align_class_tmpl = '';
+
+    /**
+     * Optional class prefix for fenced code block.
+     * @var string
+     */
+    public $code_class_prefix = "";
+
+    /**
+     * Class attribute for code blocks goes on the `code` tag;
+     * setting this to true will put attributes on the `pre` tag instead.
+     * @var boolean
+     */
+    public $code_attr_on_pre = false;
+
+    /**
+     * Predefined abbreviations.
+     * @var array
+     */
+    public $predef_abbr = array();
+
+    /**
+     * Only convert atx-style headers if there's a space between the header and #
+     * @var boolean
+     */
+    public $hashtag_protection = false;
+
+    /**
+     * Determines whether footnotes should be appended to the end of the document.
+     * If true, footnote html can be retrieved from $this->footnotes_assembled.
+     * @var boolean
+     */
+    public $omit_footnotes = false;
+
+
+    /**
+     * After parsing, the HTML for the list of footnotes appears here.
+     * This is available only if $omit_footnotes == true.
+     *
+     * Note: when placing the content of `footnotes_assembled` on the page,
+     * consider adding the attribute `role="doc-endnotes"` to the `div` or
+     * `section` that will enclose the list of footnotes so they are
+     * reachable to accessibility tools the same way they would be with the
+     * default HTML output.
+     * @var null|string
+     */
+    public $footnotes_assembled = null;
+
+    /**
+     * Parser implementation
+     */
+
+    /**
+     * Constructor function. Initialize the parser object.
+     * @return void
+     */
+    public function __construct() {
+        // Add extra escapable characters before parent constructor
+        // initialize the table.
+        $this->escape_chars .= ':|';
+
+        // Insert extra document, block, and span transformations.
+        // Parent constructor will do the sorting.
+        $this->document_gamut += array(
+            "doFencedCodeBlocks" => 5,
+            "stripFootnotes"     => 15,
+            "stripAbbreviations" => 25,
+            "appendFootnotes"    => 50,
+        );
+        $this->block_gamut += array(
+            "doFencedCodeBlocks" => 5,
+            "doTables"           => 15,
+            "doDefLists"         => 45,
+        );
+        $this->span_gamut += array(
+            "doFootnotes"        => 5,
+            "doAbbreviations"    => 70,
+        );
+
+        $this->enhanced_ordered_list = true;
+        parent::__construct();
+    }
+
+
+    /**
+     * Extra variables used during extra transformations.
+     * @var array
+     */
+    protected $footnotes = array();
+    protected $footnotes_ordered = array();
+    protected $footnotes_ref_count = array();
+    protected $footnotes_numbers = array();
+    protected $abbr_desciptions = array();
+    /** @var string */
+    protected $abbr_word_re = '';
+
+    /**
+     * Give the current footnote number.
+     * @var integer
+     */
+    protected $footnote_counter = 1;
 
     /**
      * Ref attribute for links
      * @var array
      */
-	protected $ref_attr = array();
-
-	/**
-	 * Setting up Extra-specific variables.
-	 */
-	protected function setup() {
-		parent::setup();
-
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		$this->footnote_counter = 1;
-		$this->footnotes_assembled = null;
-
-		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
-			$this->abbr_word_re .= preg_quote($abbr_word);
-			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		}
-	}
-
-	/**
-	 * Clearing Extra-specific variables.
-	 */
-	protected function teardown() {
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-
-		if ( ! $this->omit_footnotes )
-			$this->footnotes_assembled = null;
-
-		parent::teardown();
-	}
-
-
-	/**
-	 * Extra attribute parser
-	 */
-
-	/**
-	 * Expression to use to catch attributes (includes the braces)
-	 * @var string
-	 */
-	protected $id_class_attr_catch_re = '\{((?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,})[ ]*\}';
-
-	/**
-	 * Expression to use when parsing in a context when no capture is desired
-	 * @var string
-	 */
-	protected $id_class_attr_nocatch_re = '\{(?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,}[ ]*\}';
-
-	/**
-	 * Parse attributes caught by the $this->id_class_attr_catch_re expression
-	 * and return the HTML-formatted list of attributes.
-	 *
-	 * Currently supported attributes are .class and #id.
-	 *
-	 * In addition, this method also supports supplying a default Id value,
-	 * which will be used to populate the id attribute in case it was not
-	 * overridden.
-	 * @param  string $tag_name
-	 * @param  string $attr
-	 * @param  mixed  $defaultIdValue
-	 * @param  array  $classes
-	 * @return string
-	 */
-	protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $classes = array()) {
-		if (empty($attr) && !$defaultIdValue && empty($classes)) {
-			return "";
-		}
-
-		// Split on components
-		preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches);
-		$elements = $matches[0];
-
-		// Handle classes and IDs (only first ID taken into account)
-		$attributes = array();
-		$id = false;
-		foreach ($elements as $element) {
-			if ($element[0] === '.') {
-				$classes[] = substr($element, 1);
-			} else if ($element[0] === '#') {
-				if ($id === false) $id = substr($element, 1);
-			} else if (strpos($element, '=') > 0) {
-				$parts = explode('=', $element, 2);
-				$attributes[] = $parts[0] . '="' . $parts[1] . '"';
-			}
-		}
-
-		if ($id === false || $id === '') {
-			$id = $defaultIdValue;
-		}
-
-		// Compose attributes as string
-		$attr_str = "";
-		if (!empty($id)) {
-			$attr_str .= ' id="'.$this->encodeAttribute($id) .'"';
-		}
-		if (!empty($classes)) {
-			$attr_str .= ' class="'. implode(" ", $classes) . '"';
-		}
-		if (!$this->no_markup && !empty($attributes)) {
-			$attr_str .= ' '.implode(" ", $attributes);
-		}
-		return $attr_str;
-	}
-
-	/**
-	 * Strips link definitions from text, stores the URLs and titles in
-	 * hash references.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function stripLinkDefinitions($text) {
-		$less_than_tab = $this->tab_width - 1;
-
-		// Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
+    protected $ref_attr = array();
+
+    /**
+     * Setting up Extra-specific variables.
+     */
+    protected function setup() {
+        parent::setup();
+
+        $this->footnotes = array();
+        $this->footnotes_ordered = array();
+        $this->footnotes_ref_count = array();
+        $this->footnotes_numbers = array();
+        $this->abbr_desciptions = array();
+        $this->abbr_word_re = '';
+        $this->footnote_counter = 1;
+        $this->footnotes_assembled = null;
+
+        foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+            if ($this->abbr_word_re)
+                $this->abbr_word_re .= '|';
+            $this->abbr_word_re .= preg_quote($abbr_word);
+            $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+        }
+    }
+
+    /**
+     * Clearing Extra-specific variables.
+     */
+    protected function teardown() {
+        $this->footnotes = array();
+        $this->footnotes_ordered = array();
+        $this->footnotes_ref_count = array();
+        $this->footnotes_numbers = array();
+        $this->abbr_desciptions = array();
+        $this->abbr_word_re = '';
+
+        if ( ! $this->omit_footnotes )
+            $this->footnotes_assembled = null;
+
+        parent::teardown();
+    }
+
+
+    /**
+     * Extra attribute parser
+     */
+
+    /**
+     * Expression to use to catch attributes (includes the braces)
+     * @var string
+     */
+    protected $id_class_attr_catch_re = '\{((?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,})[ ]*\}';
+
+    /**
+     * Expression to use when parsing in a context when no capture is desired
+     * @var string
+     */
+    protected $id_class_attr_nocatch_re = '\{(?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,}[ ]*\}';
+
+    /**
+     * Parse attributes caught by the $this->id_class_attr_catch_re expression
+     * and return the HTML-formatted list of attributes.
+     *
+     * Currently supported attributes are .class and #id.
+     *
+     * In addition, this method also supports supplying a default Id value,
+     * which will be used to populate the id attribute in case it was not
+     * overridden.
+     * @param  string $tag_name
+     * @param  string $attr
+     * @param  mixed  $defaultIdValue
+     * @param  array  $classes
+     * @return string
+     */
+    protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $classes = array()) {
+        if (empty($attr) && !$defaultIdValue && empty($classes)) {
+            return "";
+        }
+
+        // Split on components
+        preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches);
+        $elements = $matches[0];
+
+        // Handle classes and IDs (only first ID taken into account)
+        $attributes = array();
+        $id = false;
+        foreach ($elements as $element) {
+            if ($element[0] === '.') {
+                $classes[] = substr($element, 1);
+            } else if ($element[0] === '#') {
+                if ($id === false) $id = substr($element, 1);
+            } else if (strpos($element, '=') > 0) {
+                $parts = explode('=', $element, 2);
+                $attributes[] = $parts[0] . '="' . $parts[1] . '"';
+            }
+        }
+
+        if ($id === false || $id === '') {
+            $id = $defaultIdValue;
+        }
+
+        // Compose attributes as string
+        $attr_str = "";
+        if (!empty($id)) {
+            $attr_str .= ' id="'.$this->encodeAttribute($id) .'"';
+        }
+        if (!empty($classes)) {
+            $attr_str .= ' class="'. implode(" ", $classes) . '"';
+        }
+        if (!$this->no_markup && !empty($attributes)) {
+            $attr_str .= ' '.implode(" ", $attributes);
+        }
+        return $attr_str;
+    }
+
+    /**
+     * Strips link definitions from text, stores the URLs and titles in
+     * hash references.
+     * @param  string $text
+     * @return string
+     */
+    protected function stripLinkDefinitions($text) {
+        $less_than_tab = $this->tab_width - 1;
+
+        // Link defs are in the form: ^[id]: url "optional title"
+        $text = preg_replace_callback('{
 							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -317,138 +317,138 @@ 
 					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
 							(?:\n+|\Z)
 			}xm',
-			array($this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-
-	/**
-	 * Strip link definition callback
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
-		return ''; // String that will replace the block
-	}
-
-
-	/**
-	 * HTML block parser
-	 */
-
-	/**
-	 * Tags that are always treated as block tags
-	 * @var string
-	 */
-	protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure';
-
-	/**
-	 * Tags treated as block tags only if the opening tag is alone on its line
-	 * @var string
-	 */
-	protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-
-	/**
-	 * Tags where markdown="1" default to span mode:
-	 * @var string
-	 */
-	protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-
-	/**
-	 * Tags which must not have their contents modified, no matter where
-	 * they appear
-	 * @var string
-	 */
-	protected $clean_tags_re = 'script|style|math|svg';
-
-	/**
-	 * Tags that do not need to be closed.
-	 * @var string
-	 */
-	protected $auto_close_tags_re = 'hr|img|param|source|track';
-
-	/**
-	 * Hashify HTML Blocks and "clean tags".
-	 *
-	 * We only want to do this for block-level HTML tags, such as headers,
-	 * lists, and tables. That's because we still want to wrap <p>s around
-	 * "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-	 * phrase emphasis, and spans. The list of tags we're looking for is
-	 * hard-coded.
-	 *
-	 * This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-	 * _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
-	 * attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
-	 *  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-	 * These two functions are calling each other. It's recursive!
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function hashHTMLBlocks($text) {
-		if ($this->no_markup) {
-			return $text;
-		}
-
-		// Call the HTML-in-Markdown hasher.
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-
-		return $text;
-	}
-
-	/**
-	 * Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-	 *
-	 * *   $indent is the number of space to be ignored when checking for code
-	 *     blocks. This is important because if we don't take the indent into
-	 *     account, something like this (which looks right) won't work as expected:
-	 *
-	 *     <div>
-	 *         <div markdown="1">
-	 *         Hello World.  <-- Is this a Markdown code block or text?
-	 *         </div>  <-- Is this a Markdown code block or a real tag?
-	 *     <div>
-	 *
-	 *     If you don't like this, just don't indent the tag on which
-	 *     you apply the markdown="1" attribute.
-	 *
-	 * *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
-	 *     tag with that name. Nested tags supported.
-	 *
-	 * *   If $span is true, text inside must treated as span. So any double
-	 *     newline will be replaced by a single newline so that it does not create
-	 *     paragraphs.
-	 *
-	 * Returns an array of that form: ( processed text , remaining text )
-	 *
-	 * @param  string  $text
-	 * @param  integer $indent
-	 * @param  string  $enclosing_tag_re
-	 * @param  boolean $span
-	 * @return array
-	 */
-	protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
-										$enclosing_tag_re = '', $span = false)
-	{
-
-		if ($text === '') return array('', '');
-
-		// Regex to check for the presense of newlines around a block tag.
-		$newline_before_re = '/(?:^\n?|\n\n)*$/';
-		$newline_after_re =
-			'{
+            array($this, '_stripLinkDefinitions_callback'),
+            $text);
+        return $text;
+    }
+
+    /**
+     * Strip link definition callback
+     * @param  array $matches
+     * @return string
+     */
+    protected function _stripLinkDefinitions_callback($matches) {
+        $link_id = strtolower($matches[1]);
+        $url = $matches[2] == '' ? $matches[3] : $matches[2];
+        $this->urls[$link_id] = $url;
+        $this->titles[$link_id] =& $matches[4];
+        $this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
+        return ''; // String that will replace the block
+    }
+
+
+    /**
+     * HTML block parser
+     */
+
+    /**
+     * Tags that are always treated as block tags
+     * @var string
+     */
+    protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure';
+
+    /**
+     * Tags treated as block tags only if the opening tag is alone on its line
+     * @var string
+     */
+    protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
+
+    /**
+     * Tags where markdown="1" default to span mode:
+     * @var string
+     */
+    protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+
+    /**
+     * Tags which must not have their contents modified, no matter where
+     * they appear
+     * @var string
+     */
+    protected $clean_tags_re = 'script|style|math|svg';
+
+    /**
+     * Tags that do not need to be closed.
+     * @var string
+     */
+    protected $auto_close_tags_re = 'hr|img|param|source|track';
+
+    /**
+     * Hashify HTML Blocks and "clean tags".
+     *
+     * We only want to do this for block-level HTML tags, such as headers,
+     * lists, and tables. That's because we still want to wrap <p>s around
+     * "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+     * phrase emphasis, and spans. The list of tags we're looking for is
+     * hard-coded.
+     *
+     * This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+     * _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
+     * attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
+     *  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+     * These two functions are calling each other. It's recursive!
+     * @param  string $text
+     * @return string
+     */
+    protected function hashHTMLBlocks($text) {
+        if ($this->no_markup) {
+            return $text;
+        }
+
+        // Call the HTML-in-Markdown hasher.
+        list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+
+        return $text;
+    }
+
+    /**
+     * Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+     *
+     * *   $indent is the number of space to be ignored when checking for code
+     *     blocks. This is important because if we don't take the indent into
+     *     account, something like this (which looks right) won't work as expected:
+     *
+     *     <div>
+     *         <div markdown="1">
+     *         Hello World.  <-- Is this a Markdown code block or text?
+     *         </div>  <-- Is this a Markdown code block or a real tag?
+     *     <div>
+     *
+     *     If you don't like this, just don't indent the tag on which
+     *     you apply the markdown="1" attribute.
+     *
+     * *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
+     *     tag with that name. Nested tags supported.
+     *
+     * *   If $span is true, text inside must treated as span. So any double
+     *     newline will be replaced by a single newline so that it does not create
+     *     paragraphs.
+     *
+     * Returns an array of that form: ( processed text , remaining text )
+     *
+     * @param  string  $text
+     * @param  integer $indent
+     * @param  string  $enclosing_tag_re
+     * @param  boolean $span
+     * @return array
+     */
+    protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
+                                        $enclosing_tag_re = '', $span = false)
+    {
+
+        if ($text === '') return array('', '');
+
+        // Regex to check for the presense of newlines around a block tag.
+        $newline_before_re = '/(?:^\n?|\n\n)*$/';
+        $newline_after_re =
+            '{
 				^						# Start of text following the tag.
 				(?>[ ]*<!--.*?-->)?		# Optional comment.
 				[ ]*\n					# Must be followed by newline.
 			}xs';
 
-		// Regex to match any tag.
-		$block_tag_re =
-			'{
+        // Regex to match any tag.
+        $block_tag_re =
+            '{
 				(					# $2: Capture whole tag.
 					</?					# Any opening or closing tag.
 						(?>				# Tag name.
@@ -501,156 +501,156 @@ 
 			}xs';
 
 
-		$depth = 0;		// Current depth inside the tag tree.
-		$parsed = "";	// Parsed text that will be returned.
-
-		// Loop through every tag until we find the closing tag of the parent
-		// or loop until reaching the end of text if no parent tag specified.
-		do {
-			// Split the text using the first $tag_match pattern found.
-			// Text before  pattern will be first in the array, text after
-			// pattern will be at the end, and between will be any catches made
-			// by the pattern.
-			$parts = preg_split($block_tag_re, $text, 2,
-								PREG_SPLIT_DELIM_CAPTURE);
-
-			// If in Markdown span mode, add a empty-string span-level hash
-			// after each newline to prevent triggering any block element.
-			if ($span) {
-				$void = $this->hashPart("", ':');
-				$newline = "\n$void";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-			}
-
-			$parsed .= $parts[0]; // Text before current tag.
-
-			// If end of $text has been reached. Stop loop.
-			if (count($parts) < 3) {
-				$text = "";
-				break;
-			}
-
-			$tag  = $parts[1]; // Tag to handle.
-			$text = $parts[2]; // Remaining text after current tag.
-
-			// Check for: Fenced code block marker.
-			// Note: need to recheck the whole tag to disambiguate backtick
-			// fences from code spans
-			if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+)?[ ]*(?:' . $this->id_class_attr_nocatch_re . ')?[ ]*\n?$}', $tag, $capture)) {
-				// Fenced code block marker: find matching end marker.
-				$fence_indent = strlen($capture[1]); // use captured indent in re
-				$fence_re = $capture[2]; // use captured fence in re
-				if (preg_match('{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}', $text,
-					$matches))
-				{
-					// End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					// No end marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			// Check for: Indented code block.
-			else if ($tag[0] === "\n" || $tag[0] === " ") {
-				// Indented code block: pass it unchanged, will be handled
-				// later.
-				$parsed .= $tag;
-			}
-			// Check for: Code span marker
-			// Note: need to check this after backtick fenced code blocks
-			else if ($tag[0] === "`") {
-				// Find corresponding end marker.
-				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)' . $tag_re . '(?!`)}',
-					$text, $matches))
-				{
-					// End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					// Unmatched marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			// Check for: Opening Block level tag or
-			//            Opening Context Block tag (like ins and del)
-			//               used as a block tag (tag is alone on it's line).
-			else if (preg_match('{^<(?:' . $this->block_tags_re . ')\b}', $tag) ||
-				(	preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
-					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
-				)
-			{
-				// Need to parse tag and following text using the HTML parser.
-				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-
-				// Make sure it stays outside of any paragraph by adding newlines.
-				$parsed .= "\n\n$block_text\n\n";
-			}
-			// Check for: Clean tag (like script, math)
-			//            HTML Comments, processing instructions.
-			else if (preg_match('{^<(?:' . $this->clean_tags_re . ')\b}', $tag) ||
-				$tag[1] === '!' || $tag[1] === '?')
-			{
-				// Need to parse tag and following text using the HTML parser.
-				// (don't check for markdown attribute)
-				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-
-				$parsed .= $block_text;
-			}
-			// Check for: Tag with same name as enclosing tag.
-			else if ($enclosing_tag_re !== '' &&
-				// Same name as enclosing tag.
-				preg_match('{^</?(?:' . $enclosing_tag_re . ')\b}', $tag))
-			{
-				// Increase/decrease nested tag count.
-				if ($tag[1] === '/') {
-					$depth--;
-				} else if ($tag[strlen($tag)-2] !== '/') {
-					$depth++;
-				}
-
-				if ($depth < 0) {
-					// Going out of parent element. Clean up and break so we
-					// return to the calling function.
-					$text = $tag . $text;
-					break;
-				}
-
-				$parsed .= $tag;
-			}
-			else {
-				$parsed .= $tag;
-			}
-		} while ($depth >= 0);
-
-		return array($parsed, $text);
-	}
-
-	/**
-	 * Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-	 *
-	 * *   Calls $hash_method to convert any blocks.
-	 * *   Stops when the first opening tag closes.
-	 * *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-	 *     (it is not inside clean tags)
-	 *
-	 * Returns an array of that form: ( processed text , remaining text )
-	 * @param  string $text
-	 * @param  string $hash_method
-	 * @param  bool $md_attr Handle `markdown="1"` attribute
-	 * @return array
-	 */
-	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-		if ($text === '') return array('', '');
-
-		// Regex to match `markdown` attribute inside of a tag.
-		$markdown_attr_re = '
+        $depth = 0;		// Current depth inside the tag tree.
+        $parsed = "";	// Parsed text that will be returned.
+
+        // Loop through every tag until we find the closing tag of the parent
+        // or loop until reaching the end of text if no parent tag specified.
+        do {
+            // Split the text using the first $tag_match pattern found.
+            // Text before  pattern will be first in the array, text after
+            // pattern will be at the end, and between will be any catches made
+            // by the pattern.
+            $parts = preg_split($block_tag_re, $text, 2,
+                                PREG_SPLIT_DELIM_CAPTURE);
+
+            // If in Markdown span mode, add a empty-string span-level hash
+            // after each newline to prevent triggering any block element.
+            if ($span) {
+                $void = $this->hashPart("", ':');
+                $newline = "\n$void";
+                $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+            }
+
+            $parsed .= $parts[0]; // Text before current tag.
+
+            // If end of $text has been reached. Stop loop.
+            if (count($parts) < 3) {
+                $text = "";
+                break;
+            }
+
+            $tag  = $parts[1]; // Tag to handle.
+            $text = $parts[2]; // Remaining text after current tag.
+
+            // Check for: Fenced code block marker.
+            // Note: need to recheck the whole tag to disambiguate backtick
+            // fences from code spans
+            if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+)?[ ]*(?:' . $this->id_class_attr_nocatch_re . ')?[ ]*\n?$}', $tag, $capture)) {
+                // Fenced code block marker: find matching end marker.
+                $fence_indent = strlen($capture[1]); // use captured indent in re
+                $fence_re = $capture[2]; // use captured fence in re
+                if (preg_match('{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}', $text,
+                    $matches))
+                {
+                    // End marker found: pass text unchanged until marker.
+                    $parsed .= $tag . $matches[0];
+                    $text = substr($text, strlen($matches[0]));
+                }
+                else {
+                    // No end marker: just skip it.
+                    $parsed .= $tag;
+                }
+            }
+            // Check for: Indented code block.
+            else if ($tag[0] === "\n" || $tag[0] === " ") {
+                // Indented code block: pass it unchanged, will be handled
+                // later.
+                $parsed .= $tag;
+            }
+            // Check for: Code span marker
+            // Note: need to check this after backtick fenced code blocks
+            else if ($tag[0] === "`") {
+                // Find corresponding end marker.
+                $tag_re = preg_quote($tag);
+                if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)' . $tag_re . '(?!`)}',
+                    $text, $matches))
+                {
+                    // End marker found: pass text unchanged until marker.
+                    $parsed .= $tag . $matches[0];
+                    $text = substr($text, strlen($matches[0]));
+                }
+                else {
+                    // Unmatched marker: just skip it.
+                    $parsed .= $tag;
+                }
+            }
+            // Check for: Opening Block level tag or
+            //            Opening Context Block tag (like ins and del)
+            //               used as a block tag (tag is alone on it's line).
+            else if (preg_match('{^<(?:' . $this->block_tags_re . ')\b}', $tag) ||
+                (	preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
+                    preg_match($newline_before_re, $parsed) &&
+                    preg_match($newline_after_re, $text)	)
+                )
+            {
+                // Need to parse tag and following text using the HTML parser.
+                list($block_text, $text) =
+                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+
+                // Make sure it stays outside of any paragraph by adding newlines.
+                $parsed .= "\n\n$block_text\n\n";
+            }
+            // Check for: Clean tag (like script, math)
+            //            HTML Comments, processing instructions.
+            else if (preg_match('{^<(?:' . $this->clean_tags_re . ')\b}', $tag) ||
+                $tag[1] === '!' || $tag[1] === '?')
+            {
+                // Need to parse tag and following text using the HTML parser.
+                // (don't check for markdown attribute)
+                list($block_text, $text) =
+                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+
+                $parsed .= $block_text;
+            }
+            // Check for: Tag with same name as enclosing tag.
+            else if ($enclosing_tag_re !== '' &&
+                // Same name as enclosing tag.
+                preg_match('{^</?(?:' . $enclosing_tag_re . ')\b}', $tag))
+            {
+                // Increase/decrease nested tag count.
+                if ($tag[1] === '/') {
+                    $depth--;
+                } else if ($tag[strlen($tag)-2] !== '/') {
+                    $depth++;
+                }
+
+                if ($depth < 0) {
+                    // Going out of parent element. Clean up and break so we
+                    // return to the calling function.
+                    $text = $tag . $text;
+                    break;
+                }
+
+                $parsed .= $tag;
+            }
+            else {
+                $parsed .= $tag;
+            }
+        } while ($depth >= 0);
+
+        return array($parsed, $text);
+    }
+
+    /**
+     * Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+     *
+     * *   Calls $hash_method to convert any blocks.
+     * *   Stops when the first opening tag closes.
+     * *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+     *     (it is not inside clean tags)
+     *
+     * Returns an array of that form: ( processed text , remaining text )
+     * @param  string $text
+     * @param  string $hash_method
+     * @param  bool $md_attr Handle `markdown="1"` attribute
+     * @return array
+     */
+    protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+        if ($text === '') return array('', '');
+
+        // Regex to match `markdown` attribute inside of a tag.
+        $markdown_attr_re = '
 			{
 				\s*			# Eat whitespace before the `markdown` attribute
 				markdown
@@ -665,8 +665,8 @@ 
 				()				# $4: make $3 always defined (avoid warnings)
 			}xs';
 
-		// Regex to match any tag.
-		$tag_re = '{
+        // Regex to match any tag.
+        $tag_re = '{
 				(					# $2: Capture whole tag.
 					</?					# Any opening or closing tag.
 						[\w:$]+			# Tag name.
@@ -688,143 +688,143 @@ 
 				)
 			}xs';
 
-		$original_text = $text;		// Save original text in case of faliure.
-
-		$depth		= 0;	// Current depth inside the tag tree.
-		$block_text	= "";	// Temporary text holder for current text.
-		$parsed		= "";	// Parsed text that will be returned.
-		$base_tag_name_re = '';
-
-		// Get the name of the starting tag.
-		// (This pattern makes $base_tag_name_re safe without quoting.)
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
-
-		// Loop through every tag until we find the corresponding closing tag.
-		do {
-			// Split the text using the first $tag_match pattern found.
-			// Text before  pattern will be first in the array, text after
-			// pattern will be at the end, and between will be any catches made
-			// by the pattern.
-			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-
-			if (count($parts) < 3) {
-				// End of $text reached with unbalenced tag(s).
-				// In that case, we return original text unchanged and pass the
-				// first character as filtered to prevent an infinite loop in the
-				// parent function.
-				return array($original_text[0], substr($original_text, 1));
-			}
-
-			$block_text .= $parts[0]; // Text before current tag.
-			$tag         = $parts[1]; // Tag to handle.
-			$text        = $parts[2]; // Remaining text after current tag.
-
-			// Check for: Auto-close tag (like <hr/>)
-			//			 Comments and Processing Instructions.
-			if (preg_match('{^</?(?:' . $this->auto_close_tags_re . ')\b}', $tag) ||
-				$tag[1] === '!' || $tag[1] === '?')
-			{
-				// Just add the tag to the block as if it was text.
-				$block_text .= $tag;
-			}
-			else {
-				// Increase/decrease nested tag count. Only do so if
-				// the tag's name match base tag's.
-				if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
-					if ($tag[1] === '/') {
-						$depth--;
-					} else if ($tag[strlen($tag)-2] !== '/') {
-						$depth++;
-					}
-				}
-
-				// Check for `markdown="1"` attribute and handle it.
-				if ($md_attr &&
-					preg_match($markdown_attr_re, $tag, $attr_m) &&
-					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
-				{
-					// Remove `markdown` attribute from opening tag.
-					$tag = preg_replace($markdown_attr_re, '', $tag);
-
-					// Check if text inside this tag must be parsed in span mode.
-					$mode = $attr_m[2] . $attr_m[3];
-					$span_mode = $mode === 'span' || ($mode !== 'block' &&
-						preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag));
-
-					// Calculate indent before tag.
-					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-						$strlen = $this->utf8_strlen;
-						$indent = $strlen($matches[1], 'UTF-8');
-					} else {
-						$indent = 0;
-					}
-
-					// End preceding block with this tag.
-					$block_text .= $tag;
-					$parsed .= $this->$hash_method($block_text);
-
-					// Get enclosing tag name for the ParseMarkdown function.
-					// (This pattern makes $tag_name_re safe without quoting.)
-					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
-					$tag_name_re = $matches[1];
-
-					// Parse the content using the HTML-in-Markdown parser.
-					list ($block_text, $text)
-						= $this->_hashHTMLBlocks_inMarkdown($text, $indent,
-							$tag_name_re, $span_mode);
-
-					// Outdent markdown text.
-					if ($indent > 0) {
-						$block_text = preg_replace("/^[ ]{1,$indent}/m", "",
-													$block_text);
-					}
-
-					// Append tag content to parsed text.
-					if (!$span_mode) {
-						$parsed .= "\n\n$block_text\n\n";
-					} else {
-						$parsed .= (string) $block_text;
-					}
-
-					// Start over with a new block.
-					$block_text = "";
-				}
-				else $block_text .= $tag;
-			}
-
-		} while ($depth > 0);
-
-		// Hash last block text that wasn't processed inside the loop.
-		$parsed .= $this->$hash_method($block_text);
-
-		return array($parsed, $text);
-	}
-
-	/**
-	 * Called whenever a tag must be hashed when a function inserts a "clean" tag
-	 * in $text, it passes through this function and is automaticaly escaped,
-	 * blocking invalid nested overlap.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function hashClean($text) {
-		return $this->hashPart($text, 'C');
-	}
-
-	/**
-	 * Turn Markdown link shortcuts into XHTML <a> tags.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doAnchors($text) {
-		if ($this->in_anchor) {
-			return $text;
-		}
-		$this->in_anchor = true;
-
-		// First, handle reference-style links: [link text] [id]
-		$text = preg_replace_callback('{
+        $original_text = $text;		// Save original text in case of faliure.
+
+        $depth		= 0;	// Current depth inside the tag tree.
+        $block_text	= "";	// Temporary text holder for current text.
+        $parsed		= "";	// Parsed text that will be returned.
+        $base_tag_name_re = '';
+
+        // Get the name of the starting tag.
+        // (This pattern makes $base_tag_name_re safe without quoting.)
+        if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+            $base_tag_name_re = $matches[1];
+
+        // Loop through every tag until we find the corresponding closing tag.
+        do {
+            // Split the text using the first $tag_match pattern found.
+            // Text before  pattern will be first in the array, text after
+            // pattern will be at the end, and between will be any catches made
+            // by the pattern.
+            $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+            if (count($parts) < 3) {
+                // End of $text reached with unbalenced tag(s).
+                // In that case, we return original text unchanged and pass the
+                // first character as filtered to prevent an infinite loop in the
+                // parent function.
+                return array($original_text[0], substr($original_text, 1));
+            }
+
+            $block_text .= $parts[0]; // Text before current tag.
+            $tag         = $parts[1]; // Tag to handle.
+            $text        = $parts[2]; // Remaining text after current tag.
+
+            // Check for: Auto-close tag (like <hr/>)
+            //			 Comments and Processing Instructions.
+            if (preg_match('{^</?(?:' . $this->auto_close_tags_re . ')\b}', $tag) ||
+                $tag[1] === '!' || $tag[1] === '?')
+            {
+                // Just add the tag to the block as if it was text.
+                $block_text .= $tag;
+            }
+            else {
+                // Increase/decrease nested tag count. Only do so if
+                // the tag's name match base tag's.
+                if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
+                    if ($tag[1] === '/') {
+                        $depth--;
+                    } else if ($tag[strlen($tag)-2] !== '/') {
+                        $depth++;
+                    }
+                }
+
+                // Check for `markdown="1"` attribute and handle it.
+                if ($md_attr &&
+                    preg_match($markdown_attr_re, $tag, $attr_m) &&
+                    preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+                {
+                    // Remove `markdown` attribute from opening tag.
+                    $tag = preg_replace($markdown_attr_re, '', $tag);
+
+                    // Check if text inside this tag must be parsed in span mode.
+                    $mode = $attr_m[2] . $attr_m[3];
+                    $span_mode = $mode === 'span' || ($mode !== 'block' &&
+                        preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag));
+
+                    // Calculate indent before tag.
+                    if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+                        $strlen = $this->utf8_strlen;
+                        $indent = $strlen($matches[1], 'UTF-8');
+                    } else {
+                        $indent = 0;
+                    }
+
+                    // End preceding block with this tag.
+                    $block_text .= $tag;
+                    $parsed .= $this->$hash_method($block_text);
+
+                    // Get enclosing tag name for the ParseMarkdown function.
+                    // (This pattern makes $tag_name_re safe without quoting.)
+                    preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+                    $tag_name_re = $matches[1];
+
+                    // Parse the content using the HTML-in-Markdown parser.
+                    list ($block_text, $text)
+                        = $this->_hashHTMLBlocks_inMarkdown($text, $indent,
+                            $tag_name_re, $span_mode);
+
+                    // Outdent markdown text.
+                    if ($indent > 0) {
+                        $block_text = preg_replace("/^[ ]{1,$indent}/m", "",
+                                                    $block_text);
+                    }
+
+                    // Append tag content to parsed text.
+                    if (!$span_mode) {
+                        $parsed .= "\n\n$block_text\n\n";
+                    } else {
+                        $parsed .= (string) $block_text;
+                    }
+
+                    // Start over with a new block.
+                    $block_text = "";
+                }
+                else $block_text .= $tag;
+            }
+
+        } while ($depth > 0);
+
+        // Hash last block text that wasn't processed inside the loop.
+        $parsed .= $this->$hash_method($block_text);
+
+        return array($parsed, $text);
+    }
+
+    /**
+     * Called whenever a tag must be hashed when a function inserts a "clean" tag
+     * in $text, it passes through this function and is automaticaly escaped,
+     * blocking invalid nested overlap.
+     * @param  string $text
+     * @return string
+     */
+    protected function hashClean($text) {
+        return $this->hashPart($text, 'C');
+    }
+
+    /**
+     * Turn Markdown link shortcuts into XHTML <a> tags.
+     * @param  string $text
+     * @return string
+     */
+    protected function doAnchors($text) {
+        if ($this->in_anchor) {
+            return $text;
+        }
+        $this->in_anchor = true;
+
+        // First, handle reference-style links: [link text] [id]
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -838,10 +838,10 @@ 
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
+            array($this, '_doAnchors_reference_callback'), $text);
 
-		// Next, inline-style links: [link text](url "optional title")
-		$text = preg_replace_callback('{
+        // Next, inline-style links: [link text](url "optional title")
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -864,106 +864,106 @@ 
 			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
-			array($this, '_doAnchors_inline_callback'), $text);
+            array($this, '_doAnchors_inline_callback'), $text);
 
-		// Last, handle reference-style shortcuts: [link text]
-		// These must come last in case you've also got [link text][1]
-		// or [link text](/foo)
-		$text = preg_replace_callback('{
+        // Last, handle reference-style shortcuts: [link text]
+        // These must come last in case you've also got [link text][1]
+        // or [link text](/foo)
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-
-	/**
-	 * Callback for reference anchors
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			// for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-
-		// lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeURLAttribute($url);
-
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
-
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-
-	/**
-	 * Callback for inline anchors
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doAnchors_inline_callback($matches) {
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
-
-		// if the URL was of the form <s p a c e s> it got caught by the HTML
-		// tag parser and hashed. Need to reverse the process before using the URL.
-		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
-
-		$url = $this->encodeURLAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-		$result .= $attr;
-
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
-
-		return $this->hashPart($result);
-	}
-
-	/**
-	 * Turn Markdown image shortcuts into <img> tags.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doImages($text) {
-		// First, handle reference-style labeled images: ![alt text][id]
-		$text = preg_replace_callback('{
+            array($this, '_doAnchors_reference_callback'), $text);
+
+        $this->in_anchor = false;
+        return $text;
+    }
+
+    /**
+     * Callback for reference anchors
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doAnchors_reference_callback($matches) {
+        $whole_match =  $matches[1];
+        $link_text   =  $matches[2];
+        $link_id     =& $matches[3];
+
+        if ($link_id == "") {
+            // for shortcut links like [this][] or [this].
+            $link_id = $link_text;
+        }
+
+        // lower-case and turn embedded newlines into spaces
+        $link_id = strtolower($link_id);
+        $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+        if (isset($this->urls[$link_id])) {
+            $url = $this->urls[$link_id];
+            $url = $this->encodeURLAttribute($url);
+
+            $result = "<a href=\"$url\"";
+            if ( isset( $this->titles[$link_id] ) ) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+            if (isset($this->ref_attr[$link_id]))
+                $result .= $this->ref_attr[$link_id];
+
+            $link_text = $this->runSpanGamut($link_text);
+            $result .= ">$link_text</a>";
+            $result = $this->hashPart($result);
+        }
+        else {
+            $result = $whole_match;
+        }
+        return $result;
+    }
+
+    /**
+     * Callback for inline anchors
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doAnchors_inline_callback($matches) {
+        $link_text		=  $this->runSpanGamut($matches[2]);
+        $url			=  $matches[3] === '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+        $attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+
+        // if the URL was of the form <s p a c e s> it got caught by the HTML
+        // tag parser and hashed. Need to reverse the process before using the URL.
+        $unhashed = $this->unhash($url);
+        if ($unhashed !== $url)
+            $url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+
+        $url = $this->encodeURLAttribute($url);
+
+        $result = "<a href=\"$url\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\"";
+        }
+        $result .= $attr;
+
+        $link_text = $this->runSpanGamut($link_text);
+        $result .= ">$link_text</a>";
+
+        return $this->hashPart($result);
+    }
+
+    /**
+     * Turn Markdown image shortcuts into <img> tags.
+     * @param  string $text
+     * @return string
+     */
+    protected function doImages($text) {
+        // First, handle reference-style labeled images: ![alt text][id]
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -978,11 +978,11 @@ 
 
 			)
 			}xs',
-			array($this, '_doImages_reference_callback'), $text);
+            array($this, '_doImages_reference_callback'), $text);
 
-		// Next, handle inline images:  ![alt text](url "optional title")
-		// Don't forget: encode * and _
-		$text = preg_replace_callback('{
+        // Next, handle inline images:  ![alt text](url "optional title")
+        // Don't forget: encode * and _
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -1006,101 +1006,101 @@ 
 			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
-			array($this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback for referenced images
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id === "") {
-			$link_id = strtolower($alt_text); // for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeURLAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id])) {
-				$result .= $this->ref_attr[$link_id];
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			// If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Callback for inline images
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doImages_inline_callback($matches) {
-		$alt_text		= $matches[2];
-		$url			= $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeURLAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
-		}
-		$result .= $attr;
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-	/**
-	 * Process markdown headers. Redefined to add ID and class attribute support.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doHeaders($text) {
-		// Setext-style headers:
-		//  Header 1  {#header1}
-		//	  ========
-		//
-		//	  Header 2  {#header2 .class1 .class2}
-		//	  --------
-		//
-		$text = preg_replace_callback(
-			'{
+            array($this, '_doImages_inline_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback for referenced images
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doImages_reference_callback($matches) {
+        $whole_match = $matches[1];
+        $alt_text    = $matches[2];
+        $link_id     = strtolower($matches[3]);
+
+        if ($link_id === "") {
+            $link_id = strtolower($alt_text); // for shortcut links like ![this][].
+        }
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        if (isset($this->urls[$link_id])) {
+            $url = $this->encodeURLAttribute($this->urls[$link_id]);
+            $result = "<img src=\"$url\" alt=\"$alt_text\"";
+            if (isset($this->titles[$link_id])) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+            if (isset($this->ref_attr[$link_id])) {
+                $result .= $this->ref_attr[$link_id];
+            }
+            $result .= $this->empty_element_suffix;
+            $result = $this->hashPart($result);
+        }
+        else {
+            // If there's no such link ID, leave intact:
+            $result = $whole_match;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Callback for inline images
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doImages_inline_callback($matches) {
+        $alt_text		= $matches[2];
+        $url			= $matches[3] === '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+        $attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        $url = $this->encodeURLAttribute($url);
+        $result = "<img src=\"$url\" alt=\"$alt_text\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\""; // $title already quoted
+        }
+        $result .= $attr;
+        $result .= $this->empty_element_suffix;
+
+        return $this->hashPart($result);
+    }
+
+    /**
+     * Process markdown headers. Redefined to add ID and class attribute support.
+     * @param  string $text
+     * @return string
+     */
+    protected function doHeaders($text) {
+        // Setext-style headers:
+        //  Header 1  {#header1}
+        //	  ========
+        //
+        //	  Header 2  {#header2 .class1 .class2}
+        //	  --------
+        //
+        $text = preg_replace_callback(
+            '{
 				(^.+?)								# $1: Header text
 				(?:[ ]+ ' . $this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
 				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
 			}mx',
-			array($this, '_doHeaders_callback_setext'), $text);
-
-		// atx-style headers:
-		//	# Header 1        {#header1}
-		//	## Header 2       {#header2}
-		//	## Header 2 with closing hashes ##  {#header3.class1.class2}
-		//	...
-		//	###### Header 6   {.class2}
-		//
-		$text = preg_replace_callback('{
+            array($this, '_doHeaders_callback_setext'), $text);
+
+        // atx-style headers:
+        //	# Header 1        {#header1}
+        //	## Header 2       {#header2}
+        //	## Header 2 with closing hashes ##  {#header3.class1.class2}
+        //	...
+        //	###### Header 6   {.class2}
+        //
+        $text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]'.($this->hashtag_protection ? '+' : '*').'
 				(.+?)		# $2 = Header text
@@ -1110,58 +1110,58 @@ 
 				[ ]*
 				\n+
 			}xm',
-			array($this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback for setext headers
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doHeaders_callback_setext($matches) {
-		if ($matches[3] === '-' && preg_match('{^- }', $matches[1])) {
-			return $matches[0];
-		}
-
-		$level = $matches[3][0] === '=' ? 1 : 2;
-
-		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null;
-
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2], $defaultId);
-		$block = "<h$level$attr>" . $this->runSpanGamut($matches[1]) . "</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-	/**
-	 * Callback for atx headers
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-
-		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[2]) : null;
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3], $defaultId);
-		$block = "<h$level$attr>" . $this->runSpanGamut($matches[2]) . "</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-	/**
-	 * Form HTML tables.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doTables($text) {
-		$less_than_tab = $this->tab_width - 1;
-		// Find tables with leading pipe.
-		//
-		//	| Header 1 | Header 2
-		//	| -------- | --------
-		//	| Cell 1   | Cell 2
-		//	| Cell 3   | Cell 4
-		$text = preg_replace_callback('
+            array($this, '_doHeaders_callback_atx'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback for setext headers
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doHeaders_callback_setext($matches) {
+        if ($matches[3] === '-' && preg_match('{^- }', $matches[1])) {
+            return $matches[0];
+        }
+
+        $level = $matches[3][0] === '=' ? 1 : 2;
+
+        $defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null;
+
+        $attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2], $defaultId);
+        $block = "<h$level$attr>" . $this->runSpanGamut($matches[1]) . "</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+    /**
+     * Callback for atx headers
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doHeaders_callback_atx($matches) {
+        $level = strlen($matches[1]);
+
+        $defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[2]) : null;
+        $attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3], $defaultId);
+        $block = "<h$level$attr>" . $this->runSpanGamut($matches[2]) . "</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+    /**
+     * Form HTML tables.
+     * @param  string $text
+     * @return string
+     */
+    protected function doTables($text) {
+        $less_than_tab = $this->tab_width - 1;
+        // Find tables with leading pipe.
+        //
+        //	| Header 1 | Header 2
+        //	| -------- | --------
+        //	| Cell 1   | Cell 2
+        //	| Cell 3   | Cell 4
+        $text = preg_replace_callback('
 			{
 				^							# Start of a line
 				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
@@ -1179,15 +1179,15 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-			array($this, '_doTable_leadingPipe_callback'), $text);
-
-		// Find tables without leading pipe.
-		//
-		//	Header 1 | Header 2
-		//	-------- | --------
-		//	Cell 1   | Cell 2
-		//	Cell 3   | Cell 4
-		$text = preg_replace_callback('
+            array($this, '_doTable_leadingPipe_callback'), $text);
+
+        // Find tables without leading pipe.
+        //
+        //	Header 1 | Header 2
+        //	-------- | --------
+        //	Cell 1   | Cell 2
+        //	Cell 3   | Cell 4
+        $text = preg_replace_callback('
 			{
 				^							# Start of a line
 				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
@@ -1203,120 +1203,120 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-			array($this, '_DoTable_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback for removing the leading pipe for each row
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		$content	= preg_replace('/^ *[|]/m', '', $content);
-
-		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-	}
-
-	/**
-	 * Make the align attribute in a table
-	 * @param  string $alignname
-	 * @return string
-	 */
-	protected function _doTable_makeAlignAttr($alignname) {
-		if (empty($this->table_align_class_tmpl)) {
-			return " align=\"$alignname\"";
-		}
-
-		$classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
-		return " class=\"$classname\"";
-	}
-
-	/**
-	 * Calback for processing tables
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		// Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
-
-		// Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
-		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('right');
-			else if (preg_match('/^ *:-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('center');
-			else if (preg_match('/^ *:-+ *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('left');
-			else
-				$attr[$n] = '';
-		}
-
-		// Parsing span elements, including code spans, character escapes,
-		// and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		$attr       = array_pad($attr, $col_count, '');
-
-		// Write column headers.
-		$text = "<table>\n";
-		$text .= "<thead>\n";
-		$text .= "<tr>\n";
-		foreach ($headers as $n => $header) {
-			$text .= "  <th$attr[$n]>" . $this->runSpanGamut(trim($header)) . "</th>\n";
-		}
-		$text .= "</tr>\n";
-		$text .= "</thead>\n";
-
-		// Split content by row.
-		$rows = explode("\n", trim($content, "\n"));
-
-		$text .= "<tbody>\n";
-		foreach ($rows as $row) {
-			// Parsing span elements, including code spans, character escapes,
-			// and inline HTML tags, so that pipes inside those gets ignored.
-			$row = $this->parseSpan($row);
-
-			// Split row by cell.
-			$row_cells = preg_split('/ *[|] */', $row, $col_count);
-			$row_cells = array_pad($row_cells, $col_count, '');
-
-			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell) {
-				$text .= "  <td$attr[$n]>" . $this->runSpanGamut(trim($cell)) . "</td>\n";
-			}
-			$text .= "</tr>\n";
-		}
-		$text .= "</tbody>\n";
-		$text .= "</table>";
-
-		return $this->hashBlock($text) . "\n";
-	}
-
-	/**
-	 * Form HTML definition lists.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doDefLists($text) {
-		$less_than_tab = $this->tab_width - 1;
-
-		// Re-usable pattern to match any entire dl list:
-		$whole_list_re = '(?>
+            array($this, '_DoTable_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback for removing the leading pipe for each row
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doTable_leadingPipe_callback($matches) {
+        $head		= $matches[1];
+        $underline	= $matches[2];
+        $content	= $matches[3];
+
+        $content	= preg_replace('/^ *[|]/m', '', $content);
+
+        return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+    }
+
+    /**
+     * Make the align attribute in a table
+     * @param  string $alignname
+     * @return string
+     */
+    protected function _doTable_makeAlignAttr($alignname) {
+        if (empty($this->table_align_class_tmpl)) {
+            return " align=\"$alignname\"";
+        }
+
+        $classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
+        return " class=\"$classname\"";
+    }
+
+    /**
+     * Calback for processing tables
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doTable_callback($matches) {
+        $head		= $matches[1];
+        $underline	= $matches[2];
+        $content	= $matches[3];
+
+        // Remove any tailing pipes for each line.
+        $head		= preg_replace('/[|] *$/m', '', $head);
+        $underline	= preg_replace('/[|] *$/m', '', $underline);
+        $content	= preg_replace('/[|] *$/m', '', $content);
+
+        // Reading alignement from header underline.
+        $separators	= preg_split('/ *[|] */', $underline);
+        foreach ($separators as $n => $s) {
+            if (preg_match('/^ *-+: *$/', $s))
+                $attr[$n] = $this->_doTable_makeAlignAttr('right');
+            else if (preg_match('/^ *:-+: *$/', $s))
+                $attr[$n] = $this->_doTable_makeAlignAttr('center');
+            else if (preg_match('/^ *:-+ *$/', $s))
+                $attr[$n] = $this->_doTable_makeAlignAttr('left');
+            else
+                $attr[$n] = '';
+        }
+
+        // Parsing span elements, including code spans, character escapes,
+        // and inline HTML tags, so that pipes inside those gets ignored.
+        $head		= $this->parseSpan($head);
+        $headers	= preg_split('/ *[|] */', $head);
+        $col_count	= count($headers);
+        $attr       = array_pad($attr, $col_count, '');
+
+        // Write column headers.
+        $text = "<table>\n";
+        $text .= "<thead>\n";
+        $text .= "<tr>\n";
+        foreach ($headers as $n => $header) {
+            $text .= "  <th$attr[$n]>" . $this->runSpanGamut(trim($header)) . "</th>\n";
+        }
+        $text .= "</tr>\n";
+        $text .= "</thead>\n";
+
+        // Split content by row.
+        $rows = explode("\n", trim($content, "\n"));
+
+        $text .= "<tbody>\n";
+        foreach ($rows as $row) {
+            // Parsing span elements, including code spans, character escapes,
+            // and inline HTML tags, so that pipes inside those gets ignored.
+            $row = $this->parseSpan($row);
+
+            // Split row by cell.
+            $row_cells = preg_split('/ *[|] */', $row, $col_count);
+            $row_cells = array_pad($row_cells, $col_count, '');
+
+            $text .= "<tr>\n";
+            foreach ($row_cells as $n => $cell) {
+                $text .= "  <td$attr[$n]>" . $this->runSpanGamut(trim($cell)) . "</td>\n";
+            }
+            $text .= "</tr>\n";
+        }
+        $text .= "</tbody>\n";
+        $text .= "</table>";
+
+        return $this->hashBlock($text) . "\n";
+    }
+
+    /**
+     * Form HTML definition lists.
+     * @param  string $text
+     * @return string
+     */
+    protected function doDefLists($text) {
+        $less_than_tab = $this->tab_width - 1;
+
+        // Re-usable pattern to match any entire dl list:
+        $whole_list_re = '(?>
 			(								# $1 = whole list
 			  (								# $2
 				[ ]{0,' . $less_than_tab . '}
@@ -1343,46 +1343,46 @@ 
 			)
 		)'; // mx
 
-		$text = preg_replace_callback('{
+        $text = preg_replace_callback('{
 				(?>\A\n?|(?<=\n\n))
 				' . $whole_list_re . '
 			}mx',
-			array($this, '_doDefLists_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback for processing definition lists
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doDefLists_callback($matches) {
-		// Re-usable patterns to match list item bullets and number markers:
-		$list = $matches[1];
-
-		// Turn double returns into triple returns, so that we can make a
-		// paragraph for the last item in a list, if necessary:
-		$result = trim($this->processDefListItems($list));
-		$result = "<dl>\n" . $result . "\n</dl>";
-		return $this->hashBlock($result) . "\n\n";
-	}
-
-	/**
-	 * Process the contents of a single definition list, splitting it
-	 * into individual term and definition list items.
-	 * @param  string $list_str
-	 * @return string
-	 */
-	protected function processDefListItems($list_str) {
-
-		$less_than_tab = $this->tab_width - 1;
-
-		// Trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		// Process definition terms.
-		$list_str = preg_replace_callback('{
+            array($this, '_doDefLists_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback for processing definition lists
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doDefLists_callback($matches) {
+        // Re-usable patterns to match list item bullets and number markers:
+        $list = $matches[1];
+
+        // Turn double returns into triple returns, so that we can make a
+        // paragraph for the last item in a list, if necessary:
+        $result = trim($this->processDefListItems($list));
+        $result = "<dl>\n" . $result . "\n</dl>";
+        return $this->hashBlock($result) . "\n\n";
+    }
+
+    /**
+     * Process the contents of a single definition list, splitting it
+     * into individual term and definition list items.
+     * @param  string $list_str
+     * @return string
+     */
+    protected function processDefListItems($list_str) {
+
+        $less_than_tab = $this->tab_width - 1;
+
+        // Trim trailing blank lines:
+        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+        // Process definition terms.
+        $list_str = preg_replace_callback('{
 			(?>\A\n?|\n\n+)						# leading line
 			(									# definition terms = $1
 				[ ]{0,' . $less_than_tab . '}	# leading whitespace
@@ -1393,10 +1393,10 @@ 
 			(?=\n?[ ]{0,3}:[ ])					# lookahead for following line feed
 												#   with a definition mark.
 			}xm',
-			array($this, '_processDefListItems_callback_dt'), $list_str);
+            array($this, '_processDefListItems_callback_dt'), $list_str);
 
-		// Process actual definitions.
-		$list_str = preg_replace_callback('{
+        // Process actual definitions.
+        $list_str = preg_replace_callback('{
 			\n(\n+)?							# leading line = $1
 			(									# marker space = $2
 				[ ]{0,' . $less_than_tab . '}	# whitespace before colon
@@ -1410,63 +1410,63 @@ 
 				)
 			)
 			}xm',
-			array($this, '_processDefListItems_callback_dd'), $list_str);
-
-		return $list_str;
-	}
-
-	/**
-	 * Callback for <dt> elements in definition lists
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _processDefListItems_callback_dt($matches) {
-		$terms = explode("\n", trim($matches[1]));
-		$text = '';
-		foreach ($terms as $term) {
-			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n<dt>" . $term . "</dt>";
-		}
-		return $text . "\n";
-	}
-
-	/**
-	 * Callback for <dd> elements in definition lists
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _processDefListItems_callback_dd($matches) {
-		$leading_line	= $matches[1];
-		$marker_space	= $matches[2];
-		$def			= $matches[3];
-
-		if ($leading_line || preg_match('/\n{2,}/', $def)) {
-			// Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
-		}
-		else {
-			$def = rtrim($def);
-			$def = $this->runSpanGamut($this->outdent($def));
-		}
-
-		return "\n<dd>" . $def . "</dd>\n";
-	}
-
-	/**
-	 * Adding the fenced code block syntax to regular Markdown:
-	 *
-	 * ~~~
-	 * Code block
-	 * ~~~
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doFencedCodeBlocks($text) {
-
-		$text = preg_replace_callback('{
+            array($this, '_processDefListItems_callback_dd'), $list_str);
+
+        return $list_str;
+    }
+
+    /**
+     * Callback for <dt> elements in definition lists
+     * @param  array $matches
+     * @return string
+     */
+    protected function _processDefListItems_callback_dt($matches) {
+        $terms = explode("\n", trim($matches[1]));
+        $text = '';
+        foreach ($terms as $term) {
+            $term = $this->runSpanGamut(trim($term));
+            $text .= "\n<dt>" . $term . "</dt>";
+        }
+        return $text . "\n";
+    }
+
+    /**
+     * Callback for <dd> elements in definition lists
+     * @param  array $matches
+     * @return string
+     */
+    protected function _processDefListItems_callback_dd($matches) {
+        $leading_line	= $matches[1];
+        $marker_space	= $matches[2];
+        $def			= $matches[3];
+
+        if ($leading_line || preg_match('/\n{2,}/', $def)) {
+            // Replace marker with the appropriate whitespace indentation
+            $def = str_repeat(' ', strlen($marker_space)) . $def;
+            $def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+            $def = "\n". $def ."\n";
+        }
+        else {
+            $def = rtrim($def);
+            $def = $this->runSpanGamut($this->outdent($def));
+        }
+
+        return "\n<dd>" . $def . "</dd>\n";
+    }
+
+    /**
+     * Adding the fenced code block syntax to regular Markdown:
+     *
+     * ~~~
+     * Code block
+     * ~~~
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function doFencedCodeBlocks($text) {
+
+        $text = preg_replace_callback('{
 				(?:\n|\A)
 				# 1: Opening marker
 				(
@@ -1493,123 +1493,123 @@ 
 				# Closing marker.
 				\1 [ ]* (?= \n )
 			}xm',
-			array($this, '_doFencedCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-
-	/**
-	 * Callback to process fenced code blocks
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doFencedCodeBlocks_callback($matches) {
-		$classname =& $matches[2];
-		$attrs     =& $matches[3];
-		$codeblock = $matches[4];
-
-		if ($this->code_block_content_func) {
-			$codeblock = call_user_func($this->code_block_content_func, $codeblock, $classname);
-		} else {
-			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		}
-
-		$codeblock = preg_replace_callback('/^\n+/',
-			array($this, '_doFencedCodeBlocks_newlines'), $codeblock);
-
-		$classes = array();
-		if ($classname !== "") {
-			if ($classname[0] === '.') {
-				$classname = substr($classname, 1);
-			}
-			$classes[] = $this->code_class_prefix . $classname;
-		}
-		$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs, null, $classes);
-		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
-		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-		$codeblock  = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
-
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-
-	/**
-	 * Replace new lines in fenced code blocks
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doFencedCodeBlocks_newlines($matches) {
-		return str_repeat("<br$this->empty_element_suffix",
-			strlen($matches[0]));
-	}
-
-	/**
-	 * Redefining emphasis markers so that emphasis by underscore does not
-	 * work in the middle of a word.
-	 * @var array
-	 */
-	protected $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?![\.,:;]?\s)',
-		'*' => '(?<![\s*])\*(?!\*)',
-		'_' => '(?<![\s_])_(?![a-zA-Z0-9_])',
-	);
-	protected $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?![\.,:;]?\s)',
-		'**' => '(?<![\s*])\*\*(?!\*)',
-		'__' => '(?<![\s_])__(?![a-zA-Z0-9_])',
-	);
-	protected $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?![\.,:;]?\s)',
-		'***' => '(?<![\s*])\*\*\*(?!\*)',
-		'___' => '(?<![\s_])___(?![a-zA-Z0-9_])',
-	);
-
-	/**
-	 * Parse text into paragraphs
-	 * @param  string $text String to process in paragraphs
-	 * @param  boolean $wrap_in_p Whether paragraphs should be wrapped in <p> tags
-	 * @return string       HTML output
-	 */
-	protected function formParagraphs($text, $wrap_in_p = true) {
-		// Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		// Wrap <p> tags and unhashify HTML blocks
-		foreach ($grafs as $key => $value) {
-			$value = trim($this->runSpanGamut($value));
-
-			// Check if this should be enclosed in a paragraph.
-			// Clean tag hashes & block tag hashes are left alone.
-			$is_p = $wrap_in_p && !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-
-			if ($is_p) {
-				$value = "<p>$value</p>";
-			}
-			$grafs[$key] = $value;
-		}
-
-		// Join grafs in one text, then unhash HTML tags.
-		$text = implode("\n\n", $grafs);
-
-		// Finish by removing any tag hashes still present in $text.
-		$text = $this->unhash($text);
-
-		return $text;
-	}
-
-
-	/**
-	 * Footnotes - Strips link definitions from text, stores the URLs and
-	 * titles in hash references.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function stripFootnotes($text) {
-		$less_than_tab = $this->tab_width - 1;
-
-		// Link defs are in the form: [^id]: url "optional title"
-		$text = preg_replace_callback('{
+            array($this, '_doFencedCodeBlocks_callback'), $text);
+
+        return $text;
+    }
+
+    /**
+     * Callback to process fenced code blocks
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doFencedCodeBlocks_callback($matches) {
+        $classname =& $matches[2];
+        $attrs     =& $matches[3];
+        $codeblock = $matches[4];
+
+        if ($this->code_block_content_func) {
+            $codeblock = call_user_func($this->code_block_content_func, $codeblock, $classname);
+        } else {
+            $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+        }
+
+        $codeblock = preg_replace_callback('/^\n+/',
+            array($this, '_doFencedCodeBlocks_newlines'), $codeblock);
+
+        $classes = array();
+        if ($classname !== "") {
+            if ($classname[0] === '.') {
+                $classname = substr($classname, 1);
+            }
+            $classes[] = $this->code_class_prefix . $classname;
+        }
+        $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs, null, $classes);
+        $pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
+        $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
+        $codeblock  = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
+
+        return "\n\n".$this->hashBlock($codeblock)."\n\n";
+    }
+
+    /**
+     * Replace new lines in fenced code blocks
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doFencedCodeBlocks_newlines($matches) {
+        return str_repeat("<br$this->empty_element_suffix",
+            strlen($matches[0]));
+    }
+
+    /**
+     * Redefining emphasis markers so that emphasis by underscore does not
+     * work in the middle of a word.
+     * @var array
+     */
+    protected $em_relist = array(
+        ''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?![\.,:;]?\s)',
+        '*' => '(?<![\s*])\*(?!\*)',
+        '_' => '(?<![\s_])_(?![a-zA-Z0-9_])',
+    );
+    protected $strong_relist = array(
+        ''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?![\.,:;]?\s)',
+        '**' => '(?<![\s*])\*\*(?!\*)',
+        '__' => '(?<![\s_])__(?![a-zA-Z0-9_])',
+    );
+    protected $em_strong_relist = array(
+        ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?![\.,:;]?\s)',
+        '***' => '(?<![\s*])\*\*\*(?!\*)',
+        '___' => '(?<![\s_])___(?![a-zA-Z0-9_])',
+    );
+
+    /**
+     * Parse text into paragraphs
+     * @param  string $text String to process in paragraphs
+     * @param  boolean $wrap_in_p Whether paragraphs should be wrapped in <p> tags
+     * @return string       HTML output
+     */
+    protected function formParagraphs($text, $wrap_in_p = true) {
+        // Strip leading and trailing lines:
+        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+        // Wrap <p> tags and unhashify HTML blocks
+        foreach ($grafs as $key => $value) {
+            $value = trim($this->runSpanGamut($value));
+
+            // Check if this should be enclosed in a paragraph.
+            // Clean tag hashes & block tag hashes are left alone.
+            $is_p = $wrap_in_p && !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+
+            if ($is_p) {
+                $value = "<p>$value</p>";
+            }
+            $grafs[$key] = $value;
+        }
+
+        // Join grafs in one text, then unhash HTML tags.
+        $text = implode("\n\n", $grafs);
+
+        // Finish by removing any tag hashes still present in $text.
+        $text = $this->unhash($text);
+
+        return $text;
+    }
+
+
+    /**
+     * Footnotes - Strips link definitions from text, stores the URLs and
+     * titles in hash references.
+     * @param  string $text
+     * @return string
+     */
+    protected function stripFootnotes($text) {
+        $less_than_tab = $this->tab_width - 1;
+
+        // Link defs are in the form: [^id]: url "optional title"
+        $text = preg_replace_callback('{
 			^[ ]{0,' . $less_than_tab . '}\[\^(.+?)\][ ]?:	# note_id = $1
 			  [ ]*
 			  \n?					# maybe *one* newline
@@ -1624,270 +1624,270 @@ 
 				)*
 			)
 			}xm',
-			array($this, '_stripFootnotes_callback'),
-			$text);
-		return $text;
-	}
-
-	/**
-	 * Callback for stripping footnotes
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
-		$this->footnotes[$note_id] = $this->outdent($matches[2]);
-		return ''; // String that will replace the block
-	}
-
-	/**
-	 * Replace footnote references in $text [^id] with a special text-token
-	 * which will be replaced by the actual footnote marker in appendFootnotes.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doFootnotes($text) {
-		if (!$this->in_anchor) {
-			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-		}
-		return $text;
-	}
-
-	/**
-	 * Append footnote list to text
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function appendFootnotes($text) {
-		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
-			array($this, '_appendFootnotes_callback'), $text);
-
-		if ( ! empty( $this->footnotes_ordered ) ) {
-			$this->_doFootnotes();
-			if ( ! $this->omit_footnotes ) {
-				$text .= "\n\n";
-				$text .= "<div class=\"footnotes\" role=\"doc-endnotes\">\n";
-				$text .= "<hr" . $this->empty_element_suffix . "\n";
-				$text .= $this->footnotes_assembled;
-				$text .= "</div>";
-			}
-		}
-		return $text;
-	}
-
-
-	/**
-	 * Generates the HTML for footnotes.  Called by appendFootnotes, even if
-	 * footnotes are not being appended.
-	 * @return void
-	 */
-	protected function _doFootnotes() {
-		$attr = array();
-		if ($this->fn_backlink_class !== "") {
-			$class = $this->fn_backlink_class;
-			$class = $this->encodeAttribute($class);
-			$attr['class'] = " class=\"$class\"";
-		}
-		$attr['role'] = " role=\"doc-backlink\"";
-		$num = 0;
-
-		$text = "<ol>\n\n";
-		while (!empty($this->footnotes_ordered)) {
-			$footnote = reset($this->footnotes_ordered);
-			$note_id = key($this->footnotes_ordered);
-			unset($this->footnotes_ordered[$note_id]);
-			$ref_count = $this->footnotes_ref_count[$note_id];
-			unset($this->footnotes_ref_count[$note_id]);
-			unset($this->footnotes[$note_id]);
-
-			$footnote .= "\n"; // Need to append newline before parsing.
-			$footnote = $this->runBlockGamut("$footnote\n");
-			$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
-				array($this, '_appendFootnotes_callback'), $footnote);
-
-			$num++;
-			$note_id = $this->encodeAttribute($note_id);
-
-			// Prepare backlink, multiple backlinks if multiple references
-			// Do not create empty backlinks if the html is blank
-			$backlink = "";
-			if (!empty($this->fn_backlink_html)) {
-				for ($ref_num = 1; $ref_num <= $ref_count; ++$ref_num) {
-					if (!empty($this->fn_backlink_title)) {
-						$attr['title'] = ' title="' . $this->encodeAttribute($this->fn_backlink_title) . '"';
-					}
-					if (!empty($this->fn_backlink_label)) {
-						$attr['label'] = ' aria-label="' . $this->encodeAttribute($this->fn_backlink_label) . '"';
-					}
-					$parsed_attr = $this->parseFootnotePlaceholders(
-						implode('', $attr),
-						$num,
-						$ref_num
-					);
-					$backlink_text = $this->parseFootnotePlaceholders(
-						$this->fn_backlink_html,
-						$num,
-						$ref_num
-					);
-					$ref_count_mark = $ref_num > 1 ? $ref_num : '';
-					$backlink .= " <a href=\"#fnref$ref_count_mark:$note_id\"$parsed_attr>$backlink_text</a>";
-				}
-				$backlink = trim($backlink);
-			}
-
-			// Add backlink to last paragraph; create new paragraph if needed.
-			if (!empty($backlink)) {
-				if (preg_match('{</p>$}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
-				} else {
-					$footnote .= "\n\n<p>$backlink</p>";
-				}
-			}
-
-			$text .= "<li id=\"fn:$note_id\" role=\"doc-endnote\">\n";
-			$text .= $footnote . "\n";
-			$text .= "</li>\n\n";
-		}
-		$text .= "</ol>\n";
-
-		$this->footnotes_assembled = $text;
-	}
-
-	/**
-	 * Callback for appending footnotes
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
-
-		// Create footnote marker only if it has a corresponding footnote *and*
-		// the footnote hasn't been used by another marker.
-		if (isset($this->footnotes[$node_id])) {
-			$num =& $this->footnotes_numbers[$node_id];
-			if (!isset($num)) {
-				// Transfer footnote content to the ordered list and give it its
-				// number
-				$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-				$this->footnotes_ref_count[$node_id] = 1;
-				$num = $this->footnote_counter++;
-				$ref_count_mark = '';
-			} else {
-				$ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
-			}
-
-			$attr = "";
-			if ($this->fn_link_class !== "") {
-				$class = $this->fn_link_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_link_title !== "") {
-				$title = $this->fn_link_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			$attr .= " role=\"doc-noteref\"";
-
-			$attr = str_replace("%%", $num, $attr);
-			$node_id = $this->encodeAttribute($node_id);
-
-			return
-				"<sup id=\"fnref$ref_count_mark:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
-				"</sup>";
-		}
-
-		return "[^" . $matches[1] . "]";
-	}
-
-	/**
-	 * Build footnote label by evaluating any placeholders.
-	 * - ^^  footnote number
-	 * - %%  footnote reference number (Nth reference to footnote number)
-	 * @param  string $label
-	 * @param  int    $footnote_number
-	 * @param  int    $reference_number
-	 * @return string
-	 */
-	protected function parseFootnotePlaceholders($label, $footnote_number, $reference_number) {
-		return str_replace(
-			array('^^', '%%'),
-			array($footnote_number, $reference_number),
-			$label
-		);
-	}
-
-
-	/**
-	 * Abbreviations - strips abbreviations from text, stores titles in hash
-	 * references.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function stripAbbreviations($text) {
-		$less_than_tab = $this->tab_width - 1;
-
-		// Link defs are in the form: [id]*: url "optional title"
-		$text = preg_replace_callback('{
+            array($this, '_stripFootnotes_callback'),
+            $text);
+        return $text;
+    }
+
+    /**
+     * Callback for stripping footnotes
+     * @param  array $matches
+     * @return string
+     */
+    protected function _stripFootnotes_callback($matches) {
+        $note_id = $this->fn_id_prefix . $matches[1];
+        $this->footnotes[$note_id] = $this->outdent($matches[2]);
+        return ''; // String that will replace the block
+    }
+
+    /**
+     * Replace footnote references in $text [^id] with a special text-token
+     * which will be replaced by the actual footnote marker in appendFootnotes.
+     * @param  string $text
+     * @return string
+     */
+    protected function doFootnotes($text) {
+        if (!$this->in_anchor) {
+            $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+        }
+        return $text;
+    }
+
+    /**
+     * Append footnote list to text
+     * @param  string $text
+     * @return string
+     */
+    protected function appendFootnotes($text) {
+        $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+            array($this, '_appendFootnotes_callback'), $text);
+
+        if ( ! empty( $this->footnotes_ordered ) ) {
+            $this->_doFootnotes();
+            if ( ! $this->omit_footnotes ) {
+                $text .= "\n\n";
+                $text .= "<div class=\"footnotes\" role=\"doc-endnotes\">\n";
+                $text .= "<hr" . $this->empty_element_suffix . "\n";
+                $text .= $this->footnotes_assembled;
+                $text .= "</div>";
+            }
+        }
+        return $text;
+    }
+
+
+    /**
+     * Generates the HTML for footnotes.  Called by appendFootnotes, even if
+     * footnotes are not being appended.
+     * @return void
+     */
+    protected function _doFootnotes() {
+        $attr = array();
+        if ($this->fn_backlink_class !== "") {
+            $class = $this->fn_backlink_class;
+            $class = $this->encodeAttribute($class);
+            $attr['class'] = " class=\"$class\"";
+        }
+        $attr['role'] = " role=\"doc-backlink\"";
+        $num = 0;
+
+        $text = "<ol>\n\n";
+        while (!empty($this->footnotes_ordered)) {
+            $footnote = reset($this->footnotes_ordered);
+            $note_id = key($this->footnotes_ordered);
+            unset($this->footnotes_ordered[$note_id]);
+            $ref_count = $this->footnotes_ref_count[$note_id];
+            unset($this->footnotes_ref_count[$note_id]);
+            unset($this->footnotes[$note_id]);
+
+            $footnote .= "\n"; // Need to append newline before parsing.
+            $footnote = $this->runBlockGamut("$footnote\n");
+            $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+                array($this, '_appendFootnotes_callback'), $footnote);
+
+            $num++;
+            $note_id = $this->encodeAttribute($note_id);
+
+            // Prepare backlink, multiple backlinks if multiple references
+            // Do not create empty backlinks if the html is blank
+            $backlink = "";
+            if (!empty($this->fn_backlink_html)) {
+                for ($ref_num = 1; $ref_num <= $ref_count; ++$ref_num) {
+                    if (!empty($this->fn_backlink_title)) {
+                        $attr['title'] = ' title="' . $this->encodeAttribute($this->fn_backlink_title) . '"';
+                    }
+                    if (!empty($this->fn_backlink_label)) {
+                        $attr['label'] = ' aria-label="' . $this->encodeAttribute($this->fn_backlink_label) . '"';
+                    }
+                    $parsed_attr = $this->parseFootnotePlaceholders(
+                        implode('', $attr),
+                        $num,
+                        $ref_num
+                    );
+                    $backlink_text = $this->parseFootnotePlaceholders(
+                        $this->fn_backlink_html,
+                        $num,
+                        $ref_num
+                    );
+                    $ref_count_mark = $ref_num > 1 ? $ref_num : '';
+                    $backlink .= " <a href=\"#fnref$ref_count_mark:$note_id\"$parsed_attr>$backlink_text</a>";
+                }
+                $backlink = trim($backlink);
+            }
+
+            // Add backlink to last paragraph; create new paragraph if needed.
+            if (!empty($backlink)) {
+                if (preg_match('{</p>$}', $footnote)) {
+                    $footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+                } else {
+                    $footnote .= "\n\n<p>$backlink</p>";
+                }
+            }
+
+            $text .= "<li id=\"fn:$note_id\" role=\"doc-endnote\">\n";
+            $text .= $footnote . "\n";
+            $text .= "</li>\n\n";
+        }
+        $text .= "</ol>\n";
+
+        $this->footnotes_assembled = $text;
+    }
+
+    /**
+     * Callback for appending footnotes
+     * @param  array $matches
+     * @return string
+     */
+    protected function _appendFootnotes_callback($matches) {
+        $node_id = $this->fn_id_prefix . $matches[1];
+
+        // Create footnote marker only if it has a corresponding footnote *and*
+        // the footnote hasn't been used by another marker.
+        if (isset($this->footnotes[$node_id])) {
+            $num =& $this->footnotes_numbers[$node_id];
+            if (!isset($num)) {
+                // Transfer footnote content to the ordered list and give it its
+                // number
+                $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+                $this->footnotes_ref_count[$node_id] = 1;
+                $num = $this->footnote_counter++;
+                $ref_count_mark = '';
+            } else {
+                $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
+            }
+
+            $attr = "";
+            if ($this->fn_link_class !== "") {
+                $class = $this->fn_link_class;
+                $class = $this->encodeAttribute($class);
+                $attr .= " class=\"$class\"";
+            }
+            if ($this->fn_link_title !== "") {
+                $title = $this->fn_link_title;
+                $title = $this->encodeAttribute($title);
+                $attr .= " title=\"$title\"";
+            }
+            $attr .= " role=\"doc-noteref\"";
+
+            $attr = str_replace("%%", $num, $attr);
+            $node_id = $this->encodeAttribute($node_id);
+
+            return
+                "<sup id=\"fnref$ref_count_mark:$node_id\">".
+                "<a href=\"#fn:$node_id\"$attr>$num</a>".
+                "</sup>";
+        }
+
+        return "[^" . $matches[1] . "]";
+    }
+
+    /**
+     * Build footnote label by evaluating any placeholders.
+     * - ^^  footnote number
+     * - %%  footnote reference number (Nth reference to footnote number)
+     * @param  string $label
+     * @param  int    $footnote_number
+     * @param  int    $reference_number
+     * @return string
+     */
+    protected function parseFootnotePlaceholders($label, $footnote_number, $reference_number) {
+        return str_replace(
+            array('^^', '%%'),
+            array($footnote_number, $reference_number),
+            $label
+        );
+    }
+
+
+    /**
+     * Abbreviations - strips abbreviations from text, stores titles in hash
+     * references.
+     * @param  string $text
+     * @return string
+     */
+    protected function stripAbbreviations($text) {
+        $less_than_tab = $this->tab_width - 1;
+
+        // Link defs are in the form: [id]*: url "optional title"
+        $text = preg_replace_callback('{
 			^[ ]{0,' . $less_than_tab . '}\*\[(.+?)\][ ]?:	# abbr_id = $1
 			(.*)					# text = $2 (no blank lines allowed)
 			}xm',
-			array($this, '_stripAbbreviations_callback'),
-			$text);
-		return $text;
-	}
-
-	/**
-	 * Callback for stripping abbreviations
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _stripAbbreviations_callback($matches) {
-		$abbr_word = $matches[1];
-		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re) {
-			$this->abbr_word_re .= '|';
-		}
-		$this->abbr_word_re .= preg_quote($abbr_word);
-		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		return ''; // String that will replace the block
-	}
-
-	/**
-	 * Find defined abbreviations in text and wrap them in <abbr> elements.
-	 * @param  string $text
-	 * @return string
-	 */
-	protected function doAbbreviations($text) {
-		if ($this->abbr_word_re) {
-			// cannot use the /x modifier because abbr_word_re may
-			// contain significant spaces:
-			$text = preg_replace_callback('{' .
-				'(?<![\w\x1A])' .
-				'(?:' . $this->abbr_word_re . ')' .
-				'(?![\w\x1A])' .
-				'}',
-				array($this, '_doAbbreviations_callback'), $text);
-		}
-		return $text;
-	}
-
-	/**
-	 * Callback for processing abbreviations
-	 * @param  array $matches
-	 * @return string
-	 */
-	protected function _doAbbreviations_callback($matches) {
-		$abbr = $matches[0];
-		if (isset($this->abbr_desciptions[$abbr])) {
-			$desc = $this->abbr_desciptions[$abbr];
-			if (empty($desc)) {
-				return $this->hashPart("<abbr>$abbr</abbr>");
-			}
-			$desc = $this->encodeAttribute($desc);
-			return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
-		}
-		return $matches[0];
-	}
+            array($this, '_stripAbbreviations_callback'),
+            $text);
+        return $text;
+    }
+
+    /**
+     * Callback for stripping abbreviations
+     * @param  array $matches
+     * @return string
+     */
+    protected function _stripAbbreviations_callback($matches) {
+        $abbr_word = $matches[1];
+        $abbr_desc = $matches[2];
+        if ($this->abbr_word_re) {
+            $this->abbr_word_re .= '|';
+        }
+        $this->abbr_word_re .= preg_quote($abbr_word);
+        $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+        return ''; // String that will replace the block
+    }
+
+    /**
+     * Find defined abbreviations in text and wrap them in <abbr> elements.
+     * @param  string $text
+     * @return string
+     */
+    protected function doAbbreviations($text) {
+        if ($this->abbr_word_re) {
+            // cannot use the /x modifier because abbr_word_re may
+            // contain significant spaces:
+            $text = preg_replace_callback('{' .
+                '(?<![\w\x1A])' .
+                '(?:' . $this->abbr_word_re . ')' .
+                '(?![\w\x1A])' .
+                '}',
+                array($this, '_doAbbreviations_callback'), $text);
+        }
+        return $text;
+    }
+
+    /**
+     * Callback for processing abbreviations
+     * @param  array $matches
+     * @return string
+     */
+    protected function _doAbbreviations_callback($matches) {
+        $abbr = $matches[0];
+        if (isset($this->abbr_desciptions[$abbr])) {
+            $desc = $this->abbr_desciptions[$abbr];
+            if (empty($desc)) {
+                return $this->hashPart("<abbr>$abbr</abbr>");
+            }
+            $desc = $this->encodeAttribute($desc);
+            return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+        }
+        return $matches[0];
+    }
 }

Spacing +63 added lines, -63 removed lines

@@ -205,7 +205,7 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
+		if (!$this->omit_footnotes)
 			$this->footnotes_assembled = null;
 
 		parent::teardown();
@@ -273,13 +273,13 @@ 
 		// Compose attributes as string
 		$attr_str = "";
 		if (!empty($id)) {
-			$attr_str .= ' id="'.$this->encodeAttribute($id) .'"';
+			$attr_str .= ' id="' . $this->encodeAttribute($id) . '"';
 		}
 		if (!empty($classes)) {
-			$attr_str .= ' class="'. implode(" ", $classes) . '"';
+			$attr_str .= ' class="' . implode(" ", $classes) . '"';
 		}
 		if (!$this->no_markup && !empty($attributes)) {
-			$attr_str .= ' '.implode(" ", $attributes);
+			$attr_str .= ' ' . implode(" ", $attributes);
 		}
 		return $attr_str;
 	}
@@ -295,7 +295,7 @@ 
 
 		// Link defs are in the form: ^[id]: url "optional title"
 		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							^[ ]{0,'.$less_than_tab . '}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
 							  [ ]*
@@ -314,7 +314,7 @@ 
 								[")]
 								[ ]*
 							)?	# title is optional
-					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
+					(?:[ ]* '.$this->id_class_attr_catch_re . ' )?  # $5 = extra id & class attr
 							(?:\n+|\Z)
 			}xm',
 			array($this, '_stripLinkDefinitions_callback'),
@@ -331,8 +331,8 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
+		$this->titles[$link_id] = & $matches[4];
+		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy = & $matches[5]);
 		return ''; // String that will replace the block
 	}
 
@@ -395,7 +395,7 @@ 
 		}
 
 		// Call the HTML-in-Markdown hasher.
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -472,7 +472,7 @@ 
 					<\?.*?\?> | <%.*?%>	# Processing instruction
 				|
 					<!\[CDATA\[.*?\]\]>	# CData Block
-				' . ( !$span ? ' # If not in span.
+				' . (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
@@ -490,7 +490,7 @@ 
 					(?: ' . $this->id_class_attr_nocatch_re . ' )? # extra attributes
 					[ ]*
 					(?= \n )
-				' : '' ) . ' # End (if not is span).
+				' : '') . ' # End (if not is span).
 				|
 					# Code span marker
 					# Note, this regex needs to go after backtick fenced
@@ -501,8 +501,8 @@ 
 			}xs';
 
 
-		$depth = 0;		// Current depth inside the tag tree.
-		$parsed = "";	// Parsed text that will be returned.
+		$depth = 0; // Current depth inside the tag tree.
+		$parsed = ""; // Parsed text that will be returned.
 
 		// Loop through every tag until we find the closing tag of the parent
 		// or loop until reaching the end of text if no parent tag specified.
@@ -579,9 +579,9 @@ 
 			//            Opening Context Block tag (like ins and del)
 			//               used as a block tag (tag is alone on it's line).
 			else if (preg_match('{^<(?:' . $this->block_tags_re . ')\b}', $tag) ||
-				(	preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
+				(preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
 					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
+					preg_match($newline_after_re, $text))
 				)
 			{
 				// Need to parse tag and following text using the HTML parser.
@@ -611,7 +611,7 @@ 
 				// Increase/decrease nested tag count.
 				if ($tag[1] === '/') {
 					$depth--;
-				} else if ($tag[strlen($tag)-2] !== '/') {
+				} else if ($tag[strlen($tag) - 2] !== '/') {
 					$depth++;
 				}
 
@@ -688,11 +688,11 @@ 
 				)
 			}xs';
 
-		$original_text = $text;		// Save original text in case of faliure.
+		$original_text = $text; // Save original text in case of faliure.
 
-		$depth		= 0;	// Current depth inside the tag tree.
-		$block_text	= "";	// Temporary text holder for current text.
-		$parsed		= "";	// Parsed text that will be returned.
+		$depth = 0; // Current depth inside the tag tree.
+		$block_text = ""; // Temporary text holder for current text.
+		$parsed = ""; // Parsed text that will be returned.
 		$base_tag_name_re = '';
 
 		// Get the name of the starting tag.
@@ -734,7 +734,7 @@ 
 				if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
 					if ($tag[1] === '/') {
 						$depth--;
-					} else if ($tag[strlen($tag)-2] !== '/') {
+					} else if ($tag[strlen($tag) - 2] !== '/') {
 						$depth++;
 					}
 				}
@@ -784,7 +784,7 @@ 
 					if (!$span_mode) {
 						$parsed .= "\n\n$block_text\n\n";
 					} else {
-						$parsed .= (string) $block_text;
+						$parsed .= (string)$block_text;
 					}
 
 					// Start over with a new block.
@@ -888,9 +888,9 @@ 
 	 * @return string
 	 */
 	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			// for shortcut links like [this][] or [this].
@@ -906,10 +906,10 @@ 
 			$url = $this->encodeURLAttribute($url);
 
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			if (isset($this->ref_attr[$link_id]))
 				$result .= $this->ref_attr[$link_id];
@@ -930,10 +930,10 @@ 
 	 * @return string
 	 */
 	protected function _doAnchors_inline_callback($matches) {
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url			= $matches[3] === '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
+		$attr  = $this->doExtraAttributes("a", $dummy = & $matches[8]);
 
 		// if the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using the URL.
@@ -946,7 +946,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		$result .= $attr;
 
@@ -1032,7 +1032,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			if (isset($this->ref_attr[$link_id])) {
 				$result .= $this->ref_attr[$link_id];
@@ -1054,17 +1054,17 @@ 
 	 * @return string
 	 */
 	protected function _doImages_inline_callback($matches) {
-		$alt_text		= $matches[2];
+		$alt_text = $matches[2];
 		$url			= $matches[3] === '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+		$title = & $matches[7];
+		$attr  = $this->doExtraAttributes("img", $dummy = & $matches[8]);
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
+			$result .= " title=\"$title\""; // $title already quoted
 		}
 		$result .= $attr;
 		$result .= $this->empty_element_suffix;
@@ -1102,7 +1102,7 @@ 
 		//
 		$text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
-				[ ]'.($this->hashtag_protection ? '+' : '*').'
+				[ ]'.($this->hashtag_protection ? '+' : '*') . '
 				(.+?)		# $2 = Header text
 				[ ]*
 				\#*			# optional closing #\'s (not counted)
@@ -1129,7 +1129,7 @@ 
 
 		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null;
 
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2], $defaultId);
+		$attr  = $this->doExtraAttributes("h$level", $dummy = & $matches[2], $defaultId);
 		$block = "<h$level$attr>" . $this->runSpanGamut($matches[1]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
@@ -1143,7 +1143,7 @@ 
 		$level = strlen($matches[1]);
 
 		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[2]) : null;
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3], $defaultId);
+		$attr  = $this->doExtraAttributes("h$level", $dummy = & $matches[3], $defaultId);
 		$block = "<h$level$attr>" . $this->runSpanGamut($matches[2]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
@@ -1214,8 +1214,8 @@ 
 	 * @return string
 	 */
 	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
+		$head = $matches[1];
+		$underline = $matches[2];
 		$content	= $matches[3];
 
 		$content	= preg_replace('/^ *[|]/m', '', $content);
@@ -1243,14 +1243,14 @@ 
 	 * @return string
 	 */
 	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
+		$head = $matches[1];
+		$underline = $matches[2];
+		$content = $matches[3];
 
 		// Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
+		$head = preg_replace('/[|] *$/m', '', $head);
+		$underline = preg_replace('/[|] *$/m', '', $underline);
+		$content = preg_replace('/[|] *$/m', '', $content);
 
 		// Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
@@ -1267,10 +1267,10 @@ 
 
 		// Parsing span elements, including code spans, character escapes,
 		// and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		$attr       = array_pad($attr, $col_count, '');
+		$head = $this->parseSpan($head);
+		$headers = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
+		$attr = array_pad($attr, $col_count, '');
 
 		// Write column headers.
 		$text = "<table>\n";
@@ -1438,13 +1438,13 @@ 
 	protected function _processDefListItems_callback_dd($matches) {
 		$leading_line	= $matches[1];
 		$marker_space	= $matches[2];
-		$def			= $matches[3];
+		$def = $matches[3];
 
 		if ($leading_line || preg_match('/\n{2,}/', $def)) {
 			// Replace marker with the appropriate whitespace indentation
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
+			$def = "\n" . $def . "\n";
 		}
 		else {
 			$def = rtrim($def);
@@ -1504,8 +1504,8 @@ 
 	 * @return string
 	 */
 	protected function _doFencedCodeBlocks_callback($matches) {
-		$classname =& $matches[2];
-		$attrs     =& $matches[3];
+		$classname = & $matches[2];
+		$attrs     = & $matches[3];
 		$codeblock = $matches[4];
 
 		if ($this->code_block_content_func) {
@@ -1527,9 +1527,9 @@ 
 		$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs, null, $classes);
 		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
 		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-		$codeblock  = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
+		$codeblock = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
 
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 
 	/**
@@ -1662,9 +1662,9 @@ 
 		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
 			array($this, '_appendFootnotes_callback'), $text);
 
-		if ( ! empty( $this->footnotes_ordered ) ) {
+		if (!empty($this->footnotes_ordered)) {
 			$this->_doFootnotes();
-			if ( ! $this->omit_footnotes ) {
+			if (!$this->omit_footnotes) {
 				$text .= "\n\n";
 				$text .= "<div class=\"footnotes\" role=\"doc-endnotes\">\n";
 				$text .= "<hr" . $this->empty_element_suffix . "\n";
@@ -1764,7 +1764,7 @@ 
 		// Create footnote marker only if it has a corresponding footnote *and*
 		// the footnote hasn't been used by another marker.
 		if (isset($this->footnotes[$node_id])) {
-			$num =& $this->footnotes_numbers[$node_id];
+			$num = & $this->footnotes_numbers[$node_id];
 			if (!isset($num)) {
 				// Transfer footnote content to the ordered list and give it its
 				// number
@@ -1793,8 +1793,8 @@ 
 			$node_id = $this->encodeAttribute($node_id);
 
 			return
-				"<sup id=\"fnref$ref_count_mark:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"<sup id=\"fnref$ref_count_mark:$node_id\">" .
+				"<a href=\"#fn:$node_id\"$attr>$num</a>" .
 				"</sup>";
 		}
 

Braces +42 added lines, -36 removed lines

@@ -187,8 +187,9 @@ 
 		$this->footnotes_assembled = null;
 
 		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
+			if ($this->abbr_word_re) {
+							$this->abbr_word_re .= '|';
+			}
 			$this->abbr_word_re .= preg_quote($abbr_word);
 			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		}
@@ -205,8 +206,9 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
-			$this->footnotes_assembled = null;
+		if ( ! $this->omit_footnotes ) {
+					$this->footnotes_assembled = null;
+		}
 
 		parent::teardown();
 	}
@@ -259,7 +261,9 @@ 
 			if ($element[0] === '.') {
 				$classes[] = substr($element, 1);
 			} else if ($element[0] === '#') {
-				if ($id === false) $id = substr($element, 1);
+				if ($id === false) {
+				    $id = substr($element, 1);
+				}
 			} else if (strpos($element, '=') > 0) {
 				$parts = explode('=', $element, 2);
 				$attributes[] = $parts[0] . '="' . $parts[1] . '"';
@@ -435,7 +439,9 @@ 
 										$enclosing_tag_re = '', $span = false)
 	{
 
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		// Regex to check for the presense of newlines around a block tag.
 		$newline_before_re = '/(?:^\n?|\n\n)*$/';
@@ -546,8 +552,7 @@ 
 					// End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					// No end marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -569,8 +574,7 @@ 
 					// End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					// Unmatched marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -623,8 +627,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -647,7 +650,9 @@ 
 	 * @return array
 	 */
 	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		// Regex to match `markdown` attribute inside of a tag.
 		$markdown_attr_re = '
@@ -697,8 +702,9 @@ 
 
 		// Get the name of the starting tag.
 		// (This pattern makes $base_tag_name_re safe without quoting.)
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+					$base_tag_name_re = $matches[1];
+		}
 
 		// Loop through every tag until we find the corresponding closing tag.
 		do {
@@ -727,8 +733,7 @@ 
 			{
 				// Just add the tag to the block as if it was text.
 				$block_text .= $tag;
-			}
-			else {
+			} else {
 				// Increase/decrease nested tag count. Only do so if
 				// the tag's name match base tag's.
 				if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
@@ -789,8 +794,9 @@ 
 
 					// Start over with a new block.
 					$block_text = "";
+				} else {
+				    $block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -911,14 +917,14 @@ 
 				$title = $this->encodeAttribute($title);
 				$result .=  " title=\"$title\"";
 			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
+			if (isset($this->ref_attr[$link_id])) {
+							$result .= $this->ref_attr[$link_id];
+			}
 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -938,8 +944,9 @@ 
 		// if the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using the URL.
 		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		if ($unhashed !== $url) {
+					$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		}
 
 		$url = $this->encodeURLAttribute($url);
 
@@ -1039,8 +1046,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			// If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -1255,14 +1261,15 @@ 
 		// Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('right');
-			else if (preg_match('/^ *:-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('center');
-			else if (preg_match('/^ *:-+ *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('left');
-			else
-				$attr[$n] = '';
+			if (preg_match('/^ *-+: *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('right');
+			} else if (preg_match('/^ *:-+: *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('center');
+			} else if (preg_match('/^ *:-+ *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('left');
+			} else {
+							$attr[$n] = '';
+			}
 		}
 
 		// Parsing span elements, including code spans, character escapes,
@@ -1445,8 +1452,7 @@ 
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
 			$def = "\n". $def ."\n";
-		}
-		else {
+		} else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}

a/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php

Indentation +20 added lines, -20 removed lines

@@ -14,25 +14,25 @@
  * Markdown Parser Interface
  */
 interface MarkdownInterface {
-	/**
-	 * Initialize the parser and return the result of its transform method.
-	 * This will work fine for derived classes too.
-	 *
-	 * @api
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	public static function defaultTransform($text);
+    /**
+     * Initialize the parser and return the result of its transform method.
+     * This will work fine for derived classes too.
+     *
+     * @api
+     *
+     * @param  string $text
+     * @return string
+     */
+    public static function defaultTransform($text);
 
-	/**
-	 * Main function. Performs some preprocessing on the input text
-	 * and pass it through the document gamut.
-	 *
-	 * @api
-	 *
-	 * @param  string $text
-	 * @return string
-	 */
-	public function transform($text);
+    /**
+     * Main function. Performs some preprocessing on the input text
+     * and pass it through the document gamut.
+     *
+     * @api
+     *
+     * @param  string $text
+     * @return string
+     */
+    public function transform($text);
 }