michelf / php-markdown

Michelf/MarkdownExtra.php

Spacing +67 added lines, -67 removed lines

@@ -188,7 +188,7 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
+		if (!$this->omit_footnotes)
 			$this->footnotes_assembled = null;
 
 		parent::teardown();
@@ -259,17 +259,17 @@ 
 		// Compose attributes as string
 		$attr_str = "";
 		if (!empty($id)) {
-			$attr_str .= ' id="'.$this->encodeAttribute($id) .'"';
+			$attr_str .= ' id="' . $this->encodeAttribute($id) . '"';
 			// make specified tags focusable for assistive technologies anchor targets
 			if ($this->id_focusable_tags_re && preg_match($this->id_focusable_tags_re, $tag_name)) {
 				$attr_str .= ' tabindex="-1"';
 			}
 		}
 		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;
 	}
@@ -285,7 +285,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
 							  [ ]*
@@ -304,7 +304,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'),
@@ -321,8 +321,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
 	}
 
@@ -379,7 +379,7 @@ 
 		}
 
 		// Call the HTML-in-Markdown hasher.
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -456,7 +456,7 @@ 
 					<\?.*?\?> | <%.*?%>	# Processing instruction
 				|
 					<!\[CDATA\[.*?\]\]>	# CData Block
-				' . ( !$span ? ' # If not in span.
+				' . (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
@@ -474,7 +474,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
@@ -485,8 +485,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.
@@ -563,9 +563,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.
@@ -595,7 +595,7 @@ 
 				// Increase/decrease nested tag count.
 				if ($tag[1] === '/') {
 					$depth--;
-				} else if ($tag[strlen($tag)-2] !== '/') {
+				} else if ($tag[strlen($tag) - 2] !== '/') {
 					$depth++;
 				}
 
@@ -673,11 +673,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.
@@ -719,7 +719,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++;
 					}
 				}
@@ -873,9 +873,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].
@@ -891,10 +891,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];
@@ -915,11 +915,11 @@ 
 	 * @return string
 	 */
 	protected function _doAnchors_inline_callback($matches) {
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] === '' ? $matches[4] : $matches[3];
-		$title_quote		=& $matches[6];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url			= $matches[3] === '' ? $matches[4] : $matches[3];
+		$title_quote = & $matches[6];
+		$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.
@@ -932,7 +932,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title) && $title_quote) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		$result .= $attr;
 
@@ -1018,7 +1018,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];
@@ -1040,18 +1040,18 @@ 
 	 * @return string
 	 */
 	protected function _doImages_inline_callback($matches) {
-		$alt_text		= $matches[2];
+		$alt_text = $matches[2];
 		$url			= $matches[3] === '' ? $matches[4] : $matches[3];
-		$title_quote		=& $matches[6];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+		$title_quote = & $matches[6];
+		$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_quote) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
+			$result .= " title=\"$title\""; // $title already quoted
 		}
 		$result .= $attr;
 		$result .= $this->empty_element_suffix;
@@ -1089,7 +1089,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)
@@ -1116,7 +1116,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";
 	}
@@ -1130,7 +1130,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";
 	}
@@ -1164,7 +1164,7 @@ 
 						[|] .* \n			# Row content.
 					)*
 				)
-				('.$this->id_class_attr_catch_re.')?	 # $4 = id/class attributes
+				('.$this->id_class_attr_catch_re . ')?	 # $4 = id/class attributes
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
 			array($this, '_doTable_leadingPipe_callback'), $text);
@@ -1189,7 +1189,7 @@ 
 						.* [|] .* \n		# Row content
 					)*
 				)
-				('.$this->id_class_attr_catch_re.')?	 # $4 = id/class attributes
+				('.$this->id_class_attr_catch_re . ')?	 # $4 = id/class attributes
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
 			array($this, '_DoTable_callback'), $text);
@@ -1203,10 +1203,10 @@ 
 	 * @return string
 	 */
 	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
+		$head = $matches[1];
+		$underline = $matches[2];
 		$content	= $matches[3];
-		$id_class	= $matches[4] ?? null;
+		$id_class = $matches[4] ?? null;
 
 		$content	= preg_replace('/^ *[|]/m', '', $content);
 
@@ -1233,16 +1233,16 @@ 
 	 * @return string
 	 */
 	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-		$id_class	= $matches[4] ?? null;
+		$head = $matches[1];
+		$underline = $matches[2];
+		$content = $matches[3];
+		$id_class = $matches[4] ?? null;
 		$attr		= [];
 
 		// Remove any tailing pipes for each line.
 		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
+		$underline = preg_replace('/[|] *$/m', '', $underline);
+		$content = preg_replace('/[|] *$/m', '', $content);
 
 		// Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
@@ -1259,10 +1259,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.
 		$table_attr_str = $this->doExtraAttributes('table', $id_class, null, []);
@@ -1431,13 +1431,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);
@@ -1497,8 +1497,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) {
@@ -1520,9 +1520,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";
 	}
 
 	/**
@@ -1655,9 +1655,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";
@@ -1757,7 +1757,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
@@ -1786,8 +1786,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>";
 		}