michelf / php-markdown

Michelf/MarkdownExtra.php

Indentation +4 added lines, -4 removed lines

@@ -154,10 +154,10 @@
 	 */
 	protected $footnote_counter = 1;
 
-    /**
-     * Ref attribute for links
-     * @var array
-     */
+	/**
+	 * Ref attribute for links
+	 * @var array
+	 */
 	protected $ref_attr = array();
 
 	/**

Spacing +62 added lines, -62 removed lines

@@ -194,7 +194,7 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
+		if (!$this->omit_footnotes)
 			$this->footnotes_assembled = "";
 
 		parent::teardown();
@@ -262,13 +262,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;
 	}
@@ -284,7 +284,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
 							  [ ]*
@@ -303,7 +303,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'),
@@ -320,8 +320,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
 	}
 
@@ -384,7 +384,7 @@ 
 		}
 
 		// Call the HTML-in-Markdown hasher.
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -461,7 +461,7 @@ 
 					<\?.*?\?> | <%.*?%>	# Processing instruction
 				|
 					<!\[CDATA\[.*?\]\]>	# CData Block
-				' . ( !$span ? ' # If not in span.
+				' . (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
@@ -479,7 +479,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
@@ -490,8 +490,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.
@@ -568,9 +568,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.
@@ -600,7 +600,7 @@ 
 				// Increase/decrease nested tag count.
 				if ($tag{1} === '/') {
 					$depth--;
-				} else if ($tag{strlen($tag)-2} !== '/') {
+				} else if ($tag{strlen($tag) - 2} !== '/') {
 					$depth++;
 				}
 
@@ -677,11 +677,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.
@@ -723,7 +723,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++;
 					}
 				}
@@ -877,9 +877,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].
@@ -895,10 +895,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];
@@ -919,10 +919,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.
@@ -935,7 +935,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		$result .= $attr;
 
@@ -1021,7 +1021,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];
@@ -1043,17 +1043,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;
@@ -1091,7 +1091,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)
@@ -1118,7 +1118,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";
 	}
@@ -1132,7 +1132,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";
 	}
@@ -1203,8 +1203,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);
@@ -1233,14 +1233,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);
@@ -1257,10 +1257,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";
@@ -1428,13 +1428,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);
@@ -1494,8 +1494,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) {
@@ -1517,9 +1517,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";
 	}
 
 	/**
@@ -1652,9 +1652,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";
@@ -1736,7 +1736,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
@@ -1765,8 +1765,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

@@ -176,8 +176,9 @@ 
 		$this->footnotes_assembled = "";
 
 		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);
 		}
@@ -194,8 +195,9 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
-			$this->footnotes_assembled = "";
+		if ( ! $this->omit_footnotes ) {
+					$this->footnotes_assembled = "";
+		}
 
 		parent::teardown();
 	}
@@ -248,7 +250,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] . '"';
@@ -424,7 +428,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)*$/';
@@ -535,8 +541,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;
 				}
@@ -558,8 +563,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;
 				}
@@ -612,8 +616,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -636,7 +639,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 = '
@@ -686,8 +691,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 {
@@ -716,8 +722,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)) {
@@ -778,8 +783,9 @@ 
 
 					// Start over with a new block.
 					$block_text = "";
+				} else {
+					$block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -900,14 +906,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;
@@ -927,8 +933,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);
 
@@ -1028,8 +1035,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			// If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -1245,14 +1251,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,
@@ -1435,8 +1442,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));
 		}