michelf / php-markdown

Michelf/MarkdownExtra.php

Spacing +70 added lines, -70 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++;
 					}
 				}
@@ -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,11 +930,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.
@@ -947,7 +947,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title) && $title_quote) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		$result .= $attr;
 
@@ -1031,13 +1031,13 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if (isset($width)) $result .= " width=\"$width\"";
+			if (isset($height)) $result .= " height=\"$height\"";
+			if (isset($width) && isset($height)) $result .= " loading=\"lazy\"";
 			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];
@@ -1059,22 +1059,22 @@ 
 	 * @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\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if (isset($width)) $result .= " width=\"$width\"";
+		if (isset($height)) $result .= " height=\"$height\"";
+		if (isset($width) && isset($height)) $result .= " loading=\"lazy\"";
 		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;
@@ -1112,7 +1112,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)
@@ -1139,7 +1139,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";
 	}
@@ -1153,7 +1153,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";
 	}
@@ -1224,8 +1224,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);
@@ -1253,14 +1253,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);
@@ -1277,10 +1277,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";
@@ -1448,13 +1448,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);
@@ -1514,8 +1514,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) {
@@ -1537,9 +1537,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";
 	}
 
 	/**
@@ -1672,9 +1672,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";
@@ -1774,7 +1774,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
@@ -1803,8 +1803,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 +60 added lines, -42 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;
@@ -939,8 +945,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);
 
@@ -1031,9 +1038,15 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if(isset($width)) {
+				$result .= " width=\"$width\"";
+			}
+			if(isset($height)) {
+				$result .= " height=\"$height\"";
+			}
+			if(isset($width) && isset($height)) {
+				$result .= " loading=\"lazy\"";
+			}
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
@@ -1044,8 +1057,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			// If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -1069,9 +1081,15 @@ 
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if(isset($width)) {
+			$result .= " width=\"$width\"";
+		}
+		if(isset($height)) {
+			$result .= " height=\"$height\"";
+		}
+		if(isset($width) && isset($height)) {
+			$result .= " loading=\"lazy\"";
+		}
 		if (isset($title) && $title_quote) {
 			$title = $this->encodeAttribute($title);
 			$result .=  " title=\"$title\""; // $title already quoted
@@ -1265,14 +1283,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,
@@ -1455,8 +1474,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));
 		}

Michelf/Markdown.php

Spacing +83 added lines, -83 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|details|summary';
 
 		// 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
@@ -865,13 +865,13 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if (isset($width)) $result .= " width=\"$width\"";
+			if (isset($height)) $result .= " height=\"$height\"";
+			if (isset($width) && isset($height)) $result .= " loading=\"lazy\"";
 			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);
@@ -889,21 +889,21 @@ 
 	 * @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\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if (isset($width)) $result .= " width=\"$width\"";
+		if (isset($height)) $result .= " height=\"$height\"";
+		if (isset($width) && isset($height)) $result .= " loading=\"lazy\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; // $title already quoted
+			$result .= " title=\"$title\""; // $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -964,7 +964,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";
 	}
 
@@ -978,7 +978,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";
 	}
 
@@ -1026,8 +1026,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:.+?)
@@ -1038,13 +1038,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 . '[ ]+
 					  )
 				  )
 				)
@@ -1056,13 +1056,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);
 			}
@@ -1086,7 +1086,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);
@@ -1097,18 +1097,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";
 	}
 
 	/**
@@ -1155,12 +1155,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);
 
@@ -1175,17 +1175,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));
@@ -1205,11 +1205,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);
 
@@ -1337,8 +1337,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.
@@ -1365,7 +1365,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);
@@ -1711,7 +1711,7 @@ 
 		}
 
 		$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);
@@ -1724,9 +1724,9 @@ 
 				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 . ';';
 				}
 			}
 		}
@@ -1748,11 +1748,11 @@ 
 
 		$span_re = '{
 				(
-					\\\\'.$this->escape_chars_re.'
+					\\\\'.$this->escape_chars_re . '
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1768,7 +1768,7 @@ 
 					<[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
 				|
 					</[-a-zA-Z0-9:_]+\s*> # closing tag
-			').'
+			') . '
 				)
 				}xs';
 
@@ -1805,10 +1805,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];

Braces +21 added lines, -8 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);
 
@@ -865,9 +866,15 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if(isset($width)) {
+				$result .= " width=\"$width\"";
+			}
+			if(isset($height)) {
+				$result .= " height=\"$height\"";
+			}
+			if(isset($width) && isset($height)) {
+				$result .= " loading=\"lazy\"";
+			}
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
@@ -898,9 +905,15 @@ 
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if(isset($width)) {
+			$result .= " width=\"$width\"";
+		}
+		if(isset($height)) {
+			$result .= " height=\"$height\"";
+		}
+		if(isset($width) && isset($height)) {
+			$result .= " loading=\"lazy\"";
+		}
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
 			$result .=  " title=\"$title\""; // $title already quoted