Icybee / Patron

lib/Hooks.php

Spacing +7 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$count = null;
 		$limit = null;
-		$page =  null;
+		$page = null;
 		$range = null;
 		$noarrows = null;
 		$with = null;
@@ -166,10 +166,8 @@ 
 
 		if (!is_array($entries) && !is_object($entries))
 		{
-			$patron->error
-			(
-				'Invalid source for %param. Source must either be an array or a traversable object. Given: !entries', array
-				(
+			$patron->error(
+				'Invalid source for %param. Source must either be an array or a traversable object. Given: !entries', array(
 					'%param' => 'in', '!entries' => $entries
 				)
 			);
@@ -330,7 +328,7 @@ 
 
 			if ($name != 'when')
 			{
-				$patron->error('Unexpected child: :node', [ ':node' => $node ]);
+				$patron->error('Unexpected child: :node', [':node' => $node]);
 
 				return null;
 			}
@@ -716,16 +714,16 @@ 
 	{
 		$app->events->attach(function(MarkupCollection\AlterEvent $event, MarkupCollection $markups) use ($app) {
 
-			foreach((array) $app->configs['patron.markups'] as $name => $definition)
+			foreach ((array) $app->configs['patron.markups'] as $name => $definition)
 			{
-				$markups[$name] = $definition + [ 1 => [ ] ];
+				$markups[$name] = $definition + [1 => []];
 			}
 
 		});
 
 		$app->events->attach(function(FunctionCollection\AlterEvent $event, FunctionCollection $markups) use ($app) {
 
-			foreach((array) $app->configs['patron.functions'] as $name => $definition)
+			foreach ((array) $app->configs['patron.functions'] as $name => $definition)
 			{
 				$markups[$name] = $definition;
 			}

lib/ControlNode.php

Spacing +2 added lines, -2 removed lines

@@ -136,11 +136,11 @@
 		# call hook
 		#
 
-		$engine->trace_enter([ 'markup', $name ]);
+		$engine->trace_enter(['markup', $name]);
 
 		if ($binding)
 		{
-			array_push($engine->context_markup, [ $engine->context['self'], $engine->context['this'] ]);
+			array_push($engine->context_markup, [$engine->context['self'], $engine->context['this']]);
 
 			$engine->context['self'] = [
 

lib/MarkupCollection.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	{
 		if (!$this->offsetExists($name))
 		{
-			throw new MarkupNotDefined([ $name, $this ]);
+			throw new MarkupNotDefined([$name, $this]);
 		}
 
 		return $this->collection[$name];

config/event.php

Spacing +2 added lines, -2 removed lines

@@ -4,10 +4,10 @@
 
 use ICanBoogie;
 
-$hooks = Hooks::class . '::';
+$hooks = Hooks::class.'::';
 
 return [
 
-	ICanBoogie\Core::class . '::boot' => $hooks . 'on_core_boot'
+	ICanBoogie\Core::class.'::boot' => $hooks.'on_core_boot'
 
 ];

res/markups.php

Spacing +24 added lines, -24 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace Patron;
 
-$hooks = Hooks::class . '::';
+$hooks = Hooks::class.'::';
 
 return [
 
@@ -12,9 +12,9 @@ 
 
 	'template' => [
 
-		$hooks . 'markup_template', [
+		$hooks.'markup_template', [
 
-			'name' => [ 'required' => true ]
+			'name' => ['required' => true]
 
 		],
 
@@ -24,9 +24,9 @@ 
 
 	'call-template' => [
 
-		$hooks . 'markup_call_template', [
+		$hooks.'markup_call_template', [
 
-			'name' => [ 'required' => true ]
+			'name' => ['required' => true]
 
 		],
 
@@ -36,18 +36,18 @@ 
 
 	'decorate' => [
 
-		$hooks . 'markup_decorate', [
+		$hooks.'markup_decorate', [
 
-			'with' => [ 'required' => true ]
+			'with' => ['required' => true]
 
 		]
 	],
 
 	'foreach' => [
 
-		$hooks . 'markup_foreach', [
+		$hooks.'markup_foreach', [
 
-			'in' => [ 'default' => 'this', 'expression' => true ],
+			'in' => ['default' => 'this', 'expression' => true],
 			'as' => null
 
 		]
@@ -55,10 +55,10 @@ 
 
 	'variable' => [
 
-		$hooks . 'markup_variable', [
+		$hooks.'markup_variable', [
 
-			'name' => [ 'required' => true ],
-			'select' => [ 'expression' => true ]
+			'name' => ['required' => true],
+			'select' => ['expression' => true]
 
 		],
 
@@ -67,16 +67,16 @@ 
 
 	'with' => [
 
-		$hooks . 'markup_with', [
+		$hooks.'markup_with', [
 
-			'select' => [ 'expression' => true ]
+			'select' => ['expression' => true]
 
 		]
 	],
 
 	'choose' => [
 
-		$hooks . 'markup_choose', [
+		$hooks.'markup_choose', [
 
 
 		],
@@ -87,10 +87,10 @@ 
 
 	'if' => [
 
-		$hooks . 'markup_if', [
+		$hooks.'markup_if', [
 
-			'test' => [ 'expression' => [ 'silent' => true ] ],
-			'select' => [ 'expression' => [ 'silent' => true ] ],
+			'test' => ['expression' => ['silent' => true]],
+			'select' => ['expression' => ['silent' => true]],
 			'equals' => null
 
 		],
@@ -101,9 +101,9 @@ 
 
 	'translate' => [
 
-		$hooks . 'markup_translate', [
+		$hooks.'markup_translate', [
 
-			'native' => [ 'required' => true ]
+			'native' => ['required' => true]
 
 		]
 	],
@@ -114,13 +114,13 @@ 
 
 	'pager' => [
 
-		$hooks . 'markup_pager', [
+		$hooks.'markup_pager', [
 
 			'count' => null,
 			'page' => null,
 			'limit' => null,
 			'with' => null,
-			'range' => [ 'expression' => true ],
+			'range' => ['expression' => true],
 			'noarrows' => false
 
 		]
@@ -128,7 +128,7 @@ 
 
 	'document:css' => [
 
-		$hooks . 'markup_document_css', [
+		$hooks.'markup_document_css', [
 
 			'href' => null,
 			'weight' => 100
@@ -138,7 +138,7 @@ 
 
 	'document:js' => [
 
-		$hooks . 'markup_document_js', [
+		$hooks.'markup_document_js', [
 
 			'href' => null,
 			'weight' => 100

res/functions.php

Spacing +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
 
 	'markdown' => function($text) {
 
-		require_once dirname(__DIR__) . '/lib/textmark/textmark.php';
+		require_once dirname(__DIR__).'/lib/textmark/textmark.php';
 
 		return \Markdown($text);
 

lib/Engine.php

Spacing +16 added lines, -16 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string $expression
 	 * @param bool $silent
 	 */
-	public function evaluate($expression, $silent=false, $context=null)
+	public function evaluate($expression, $silent = false, $context = null)
 	{
 		$evaluator = $this->evaluator;
 
@@ -125,11 +125,11 @@ 
 		array_shift($this->trace);
 	}
 
-	public function error($alert, array $args=[])
+	public function error($alert, array $args = [])
 	{
 		if ($alert instanceof \ICanBoogie\Exception\Config)
 		{
-			$this->errors[] = '<div class="alert alert-danger">' . $alert->getMessage() . '</div>';
+			$this->errors[] = '<div class="alert alert-danger">'.$alert->getMessage().'</div>';
 
 			return;
 		}
@@ -166,12 +166,12 @@ 
 					}
 				}
 
-				$trace_html .= sprintf('#%02d: in %s "%s"', $i--, $which, $message) . '<br />';
+				$trace_html .= sprintf('#%02d: in %s "%s"', $i--, $which, $message).'<br />';
 			}
 
 			if ($trace_html)
 			{
-				$trace_html = '<pre>' . $trace_html . '</pre>';
+				$trace_html = '<pre>'.$trace_html.'</pre>';
 			}
 		}
 
@@ -179,7 +179,7 @@ 
 		#
 		#
 
-		$this->errors[] = '<div class="alert alert-danger">' . $alert . $trace_html . '</div>';
+		$this->errors[] = '<div class="alert alert-danger">'.$alert.$trace_html.'</div>';
 	}
 
 	public function handle_exception(\Exception $e)
@@ -278,7 +278,7 @@ 
 		}
 
 		$tries = [];
-		$template_pathname = $template_resolver->resolve($name, [ '.patron', '.html' ], $tries);
+		$template_pathname = $template_resolver->resolve($name, ['.patron', '.html'], $tries);
 
 		if ($template_pathname)
 		{
@@ -286,7 +286,7 @@ 
 		}
 
 		$template_name = TemplateName::from($name);
-		$template_pathname = $template_resolver->resolve($template_name->as_partial, [ '.patron', '.html' ], $tries);
+		$template_pathname = $template_resolver->resolve($template_name->as_partial, ['.patron', '.html'], $tries);
 
 		if ($template_pathname)
 		{
@@ -301,7 +301,7 @@ 
 		$content = file_get_contents($pathname);
 		$nodes = $this->get_compiled($content);
 
-		return new Template($nodes, [ 'file' => $pathname ]);
+		return new Template($nodes, ['file' => $pathname]);
 	}
 
 	protected function get_template($name)
@@ -322,14 +322,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function callTemplate($name, array $args=[])
+	public function callTemplate($name, array $args = [])
 	{
 		$template = $this->get_template($name);
 
 		if (!$template)
 		{
 			$er = 'Unknown template %name';
-			$params = [ '%name' => $name ];
+			$params = ['%name' => $name];
 
 			if ($this->templates)
 			{
@@ -342,7 +342,7 @@ 
 			return null;
 		}
 
-		$this->trace_enter([ 'template', $name, $template ]);
+		$this->trace_enter(['template', $name, $template]);
 
 		$this->context['self']['arguments'] = $args;
 
@@ -365,7 +365,7 @@ 
 
 	protected function init_context()
 	{
-		$this->context = new \BlueTihi\Context([ 'self' => null, 'this' => null ]);
+		$this->context = new \BlueTihi\Context(['self' => null, 'this' => null]);
 	}
 
 	/*
@@ -388,7 +388,7 @@ 
 		return $compiler($template);
 	}
 
-	public function __invoke($template, $bind=null, array $options=[])
+	public function __invoke($template, $bind = null, array $options = [])
 	{
 		if (!$template)
 		{
@@ -448,12 +448,12 @@ 
 				$template = $this->get_compiled($template);
 			}
 
-			$template = new Template($template, [ 'file' => $file ]);
+			$template = new Template($template, ['file' => $file]);
 		}
 
 		if ($template->file)
 		{
-			$this->trace_enter([ 'file', $template->file ]);
+			$this->trace_enter(['file', $template->file]);
 		}
 
 		$rc = '';

lib/HTMLParser.php

Spacing +15 added lines, -19 removed lines

@@ -23,7 +23,7 @@ 
 	protected $error_handler;
 	protected $namespace;
 
-	public function __construct(array $tags=[])
+	public function __construct(array $tags = [])
 	{
 		$tags += [
 
@@ -38,7 +38,7 @@ 
 		$this->error_handler = $tags[self::T_ERROR_HANDLER];
 	}
 
-	public function parse($html, $namespace=null, $encoding='utf-8')
+	public function parse($html, $namespace = null, $encoding = 'utf-8')
 	{
 		$this->encoding = $encoding;
 		$this->namespace = $namespace;
@@ -63,9 +63,8 @@ 
 		# note that i+2 might end with a '/' indicating an auto-closing markup
 		#
 
-		$this->matches = preg_split
-		(
-			'#<(/?)' . $namespace . '([^>]*)>#', $html, -1, PREG_SPLIT_DELIM_CAPTURE
+		$this->matches = preg_split(
+			'#<(/?)'.$namespace.'([^>]*)>#', $html, -1, PREG_SPLIT_DELIM_CAPTURE
 		);
 
 		#
@@ -93,13 +92,13 @@ 
 		# here we escape comments
 		#
 
-		$html = preg_replace_callback('#<\!--.+-->#sU', [ $this, 'escapeSpecials_callback' ], $html);
+		$html = preg_replace_callback('#<\!--.+-->#sU', [$this, 'escapeSpecials_callback'], $html);
 
 		#
 		# and processing options
 		#
 
-		$html = preg_replace_callback('#<\?.+\?>#sU', [ $this, 'escapeSpecials_callback' ], $html);
+		$html = preg_replace_callback('#<\?.+\?>#sU', [$this, 'escapeSpecials_callback'], $html);
 
 		return $html;
 	}
@@ -110,10 +109,9 @@ 
 
 		$text = $m[0];
 
-		$text = str_replace
-		(
-			[ '<', '>' ],
-			[ "\x01", "\x02" ],
+		$text = str_replace(
+			['<', '>'],
+			["\x01", "\x02"],
 			$text
 		);
 
@@ -122,10 +120,9 @@ 
 
 	protected function unescapeSpecials($tree)
 	{
-		return is_array($tree) ? array_map([ $this, 'unescapeSpecials' ], $tree) : str_replace
-		(
-			[ "\x01", "\x02" ],
-			[ '<', '>' ],
+		return is_array($tree) ? array_map([$this, 'unescapeSpecials'], $tree) : str_replace(
+			["\x01", "\x02"],
+			['<', '>'],
 			$tree
 		);
 	}
@@ -246,20 +243,19 @@ 
 			$args[$m[1]] = html_entity_decode($m[2], ENT_QUOTES, $this->encoding);
 		}
 
-		return [ 'name' => $name, 'args' => $args ];
+		return ['name' => $name, 'args' => $args];
 	}
 
 	protected function error($markup, $expected)
 	{
 		$this->malformed = true;
 
-		call_user_func
-		(
+		call_user_func(
 			$this->error_handler, $expected
 			? 'unexpected closing markup %markup, should be %expected'
 			: 'unexpected closing markup %markup, when none was opened', [
 
-				'%markup' => $this->namespace . $markup, '%expected' => $expected
+				'%markup' => $this->namespace.$markup, '%expected' => $expected
 
 			]
 		);

lib/markdown/markdown.php

Spacing +67 added lines, -70 removed lines

@@ -11,7 +11,7 @@ 
 # <http://daringfireball.net/projects/markdown/>
 #
 
-define( 'MARKDOWN_VERSION',  "1.0.1o" ); # Sun 8 Jan 2012
+define('MARKDOWN_VERSION', "1.0.1o"); # Sun 8 Jan 2012
 
 
 #
@@ -19,18 +19,18 @@ 
 #
 
 # Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+@define('MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />");
 
 # Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
+@define('MARKDOWN_TAB_WIDTH', 4);
 
 # Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+@define('MARKDOWN_FN_LINK_TITLE', "");
+@define('MARKDOWN_FN_BACKLINK_TITLE', "");
 
 # Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+@define('MARKDOWN_FN_LINK_CLASS', "");
+@define('MARKDOWN_FN_BACKLINK_CLASS', "");
 
 
 #
@@ -38,8 +38,8 @@ 
 #
 
 # Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
+@define('MARKDOWN_WP_POSTS', true);
+@define('MARKDOWN_WP_COMMENTS', true);
 
 
 
@@ -47,7 +47,7 @@ 
 
 if (!defined('MARKDOWN_PARSER_CLASS'))
 {
-	define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+	define('MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser');
 }
 
 function Markdown($text) {
@@ -86,19 +86,19 @@ 
 	# - Run Markdown on excerpt, then remove all tags.
 	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
 	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
+		remove_filter('the_content', 'wpautop');
         remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+		remove_filter('the_excerpt', 'wpautop');
+		add_filter('the_content', 'mdwp_MarkdownPost', 6);
         add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt', 'mdwp_add_p');
 		add_filter('the_excerpt_rss', 'mdwp_strip_p');
 
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
+		remove_filter('content_save_pre', 'balanceTags', 50);
+		remove_filter('excerpt_save_pre', 'balanceTags', 50);
+		add_filter('the_content', 'balanceTags', 50);
 		add_filter('get_the_excerpt', 'balanceTags', 9);
 	}
 
@@ -112,7 +112,7 @@ 
 		if (is_single() || is_page() || is_feed()) {
 			$parser->fn_id_prefix = "";
 		} else {
-			$parser->fn_id_prefix = get_the_ID() . ".";
+			$parser->fn_id_prefix = get_the_ID().".";
 		}
 		return $parser->transform($text);
 	}
@@ -128,7 +128,7 @@ 
 		add_filter('pre_comment_content', 'Markdown', 6);
 		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
 		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_text', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
 
@@ -193,13 +193,13 @@ 
 	@include_once 'smartypants.php';
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
+		function TextileThis($text, $lite = '', $encode = '') {
 			if ($lite == '' && $encode == '')    $text = Markdown($text);
 			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
+		function TextileRestricted($text, $lite = '', $noimage = '') {
 			return $this->TextileThis($text, $lite);
 		}
 		# Workaround to ensure compatibility with TextPattern 4.0.3.
@@ -339,16 +339,14 @@ 
 
 		$this->teardown();
 
-		return $text . "\n";
+		return $text."\n";
 	}
 
-	public $early_gamut = array
-	(
+	public $early_gamut = array(
 		'doFencedCodeBlocks' => 5
 	);
 
-	var $document_gamut = array
-	(
+	var $document_gamut = array(
 		# Strip link definitions, store in hashes.
 		"stripLinkDefinitions" => 20,
 
@@ -359,8 +357,7 @@ 
 	 * @var array These are all the transformations that form block-level tags like paragraphs, headers, and
 	 * list items.
 	 */
-	public $block_gamut = array
-	(
+	public $block_gamut = array(
 		"doHeaders"         => 10,
 		"doHorizontalRules" => 20,
 
@@ -407,7 +404,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
 	}
 
@@ -460,8 +457,8 @@ 
 					(?>
 					  />
 					|
-					  >', $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
 					)
@@ -573,7 +570,7 @@ 
 
 		# Then hash the block.
 		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
+		$key = "$boundary\x1A".++$i.$boundary;
 		$this->html_hashes[$key] = $text;
 		return $key; # String that will replace the tag.
 	}
@@ -756,9 +753,9 @@ 
 		return $text;
 	}
 	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].
@@ -774,10 +771,10 @@ 
 			$url = $this->encodeAttribute($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);
@@ -790,17 +787,17 @@ 
 		return $result;
 	}
 	function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$url = $this->encodeAttribute($url);
 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		$link_text = $this->runSpanGamut($link_text);
@@ -881,7 +878,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);
@@ -894,17 +891,17 @@ 
 		return $result;
 	}
 	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->encodeAttribute($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;
 
@@ -949,12 +946,12 @@ 
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
 		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 
@@ -1033,13 +1030,13 @@ 
 		$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);
 
-		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
+		$result = $this->hashBlock("<$list_type>\n".$result."</$list_type>");
+		return "\n".$result."\n\n";
 	}
 
 	var $list_level = 0;
@@ -1092,16 +1089,16 @@ 
 	}
 	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 = $leading_space.str_repeat(' ', strlen($marker_space)).$item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
 		}
 		else {
@@ -1111,7 +1108,7 @@ 
 			$item = $this->runSpanGamut($item);
 		}
 
-		return "<li>" . $item . "</li>\n";
+		return "<li>".$item."</li>\n";
 	}
 
 
@@ -1204,7 +1201,7 @@ 
 				$token_relist[] = $strong_re;
 
 				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
+				$token_re = '{('.implode('|', $token_relist).')}';
 				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
 			}
 		}
@@ -1230,8 +1227,8 @@ 
 			#
 			$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.
@@ -1258,7 +1255,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);
@@ -1352,7 +1349,7 @@ 
 		$bq = $matches[1];
 		# trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); # recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
 		# These leading spaces cause problem with <pre> content,
@@ -1360,7 +1357,7 @@ 
 		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
 			array(&$this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+		return "\n".$this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
 	}
 	function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
@@ -1462,7 +1459,7 @@ 
 			# 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);;
+								'&amp;', $text); ;
 		}
 		# Encode remaining <'s
 		$text = str_replace('<', '&lt;', $text);
@@ -1526,9 +1523,9 @@ 
 	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
 	#   With some optimizations by Milian Wolff.
 	#
-		$addr = "mailto:" . $addr;
+		$addr = "mailto:".$addr;
 		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		$seed = (int) abs(crc32($addr) / strlen($addr)); # Deterministic seed.
 
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
@@ -1564,7 +1561,7 @@ 
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1615,7 +1612,7 @@ 
 	{
 		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',
@@ -1670,7 +1667,7 @@ 
 			# Calculate amount of space, insert spaces, insert block.
 			$amount = $this->tab_width -
 				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
+			$line .= str_repeat(" ", $amount).$block;
 		}
 		return $line;
 	}