Icybee / Patron

lib/Engine.php

Doc Comments +13 added lines, -1 removed lines

@@ -115,6 +115,9 @@ 
 	protected $trace = [];
 	protected $errors = [];
 
+	/**
+	 * @param string[] $a
+	 */
 	public function trace_enter($a)
 	{
 		array_unshift($this->trace, $a);
@@ -205,6 +208,9 @@ 
 		return $rc;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function get_file()
 	{
 		foreach ($this->trace as $trace)
@@ -233,6 +239,9 @@ 
 
 	protected $templates = [];
 
+	/**
+	 * @param string $name
+	 */
 	public function addTemplate($name, $template)
 	{
 		if (isset($this->templates[$name]))
@@ -317,7 +326,7 @@ 
 	/**
 	 * Calls a template.
 	 *
-	 * @param $name
+	 * @param string $name
 	 * @param array $args
 	 *
 	 * @return string
@@ -376,6 +385,9 @@ 
 	**
 	*/
 
+	/**
+	 * @return Node[]
+	 */
 	protected function get_compiled($template)
 	{
 		static $compiler;

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/Evaluator.php

Doc Comments +4 added lines

@@ -264,6 +264,10 @@
 		return $parts;
 	}
 
+	/**
+	 * @param string $expression
+	 * @param boolean $silent
+	 */
 	protected function evaluate($context, $expression, $tokens, $silent)
 	{
 		$expression_path = [];

Spacing +15 added lines, -16 removed lines

@@ -65,7 +65,7 @@ 
 	{
 		if ($str{0} == '@')
 		{
-			$str = 'this.' . substr($str, 1);
+			$str = 'this.'.substr($str, 1);
 		}
 
 		$str .= '.';
@@ -84,7 +84,7 @@ 
 
 		$parts = [];
 
-		for ($i = 0 ; $i < $length ; $i++)
+		for ($i = 0; $i < $length; $i++)
 		{
 			$c = $str{$i};
 
@@ -280,8 +280,7 @@ 
 				{
 					if (!is_array($context) && !is_object($context))
 					{
-						throw new \InvalidArgumentException(\ICanBoogie\format
-						(
+						throw new \InvalidArgumentException(\ICanBoogie\format(
 							'Unexpected variable type: %type (%value) for %identifier in expression %expression, should be either an array or an object', [
 
 								'%type' => gettype($context),
@@ -325,7 +324,7 @@ 
 
 					if ($args_evaluate)
 					{
-						$this->engine->error('we should evaluate %eval', [ '%eval' => $args_evaluate ]);
+						$this->engine->error('we should evaluate %eval', ['%eval' => $args_evaluate]);
 					}
 
 					#
@@ -334,7 +333,7 @@ 
 
 					if (is_object($context) && method_exists($context, $method))
 					{
-						$context = call_user_func_array([ $context, $method ], $args);
+						$context = call_user_func_array([$context, $method], $args);
 
 						break;
 					}
@@ -355,24 +354,24 @@ 
 					{
 						if (is_string($context))
 						{
-							if (function_exists('str' . $method))
+							if (function_exists('str'.$method))
 							{
-								$callback = 'str' . $method;
+								$callback = 'str'.$method;
 							}
-							else if (function_exists('str_' . $method))
+							else if (function_exists('str_'.$method))
 							{
-								$callback = 'str_' . $method;
+								$callback = 'str_'.$method;
 							}
 						}
 						else if (is_array($context) || is_object($context))
 						{
-							if (function_exists('ICanBoogie\array_' . $method))
+							if (function_exists('ICanBoogie\array_'.$method))
 							{
-								$callback = 'ICanBoogie\array_' . $method;
+								$callback = 'ICanBoogie\array_'.$method;
 							}
-							else if (function_exists('array_' . $method))
+							else if (function_exists('array_'.$method))
 							{
-								$callback = 'array_' . $method;
+								$callback = 'array_'.$method;
 							}
 						}
 					}
@@ -393,7 +392,7 @@ 
 					{
 						if (is_object($context) && method_exists($context, '__call'))
 						{
-							$context = call_user_func_array([ $context, $method ], $args);
+							$context = call_user_func_array([$context, $method], $args);
 
 							break;
 						}
@@ -460,7 +459,7 @@ 
 	 *
 	 * @return mixed The extracted value.
 	 */
-	protected function extract_value($container, $identifier, &$exists=false)
+	protected function extract_value($container, $identifier, &$exists = false)
 	{
 		$exists = false;
 

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

lib/FunctionCollection.php

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
 
 		if (!$f)
 		{
-			throw new FunctionNotDefined([ $method, $this ]);
+			throw new FunctionNotDefined([$method, $this]);
 		}
 
 		return call_user_func_array($f, $arguments);
@@ -77,7 +77,7 @@ 
 	{
 		if (!$this->offsetExists($name))
 		{
-			throw new FunctionNotDefined([ $name, $this ]);
+			throw new FunctionNotDefined([$name, $this]);
 		}
 
 		return $this->collection[$name];
@@ -118,21 +118,21 @@ 
 			return $this->collection[$name];
 		}
 
-		$try = 'ICanBoogie\\' . $name;
+		$try = 'ICanBoogie\\'.$name;
 
 		if (function_exists($try))
 		{
 			return $try;
 		}
 
-		$try = 'ICanBoogie\I18n\\' . $name;
+		$try = 'ICanBoogie\I18n\\'.$name;
 
 		if (function_exists($try))
 		{
 			return $try;
 		}
 
-		$try = 'Patron\\' . $name;
+		$try = 'Patron\\'.$name;
 
 		if (function_exists($try))
 		{

lib/textmark/textmark.php

Spacing +109 added lines, -135 removed lines

@@ -27,18 +27,18 @@ 
  @define('txt_registered',		  '®');
  @define('txt_copyright',		  '©');
  */
-@define('txt_apostrophe',		  '\'');
-@define('txt_quote_double_open',  '« ');
+@define('txt_apostrophe', '\'');
+@define('txt_quote_double_open', '« ');
 @define('txt_quote_double_close', ' »');
-@define('txt_prime',			  'ʹ');
-@define('txt_prime_double', 	  'ʺ');
-@define('txt_ellipsis', 		  '…');
-@define('txt_emdash',			  '—');
-@define('txt_endash',			  '–');
-@define('txt_dimension',		  '×');
-@define('txt_trademark',		  '™');
-@define('txt_registered',		  '®');
-@define('txt_copyright',		  '©');
+@define('txt_prime', 'ʹ');
+@define('txt_prime_double', 'ʺ');
+@define('txt_ellipsis', '…');
+@define('txt_emdash', '—');
+@define('txt_endash', '–');
+@define('txt_dimension', '×');
+@define('txt_trademark', '™');
+@define('txt_registered', '®');
+@define('txt_copyright', '©');
 
 class Textmark_Parser extends MarkdownExtra_Parser
 {
@@ -52,14 +52,12 @@ 
 
 	function __construct()
 	{
-		$this->early_gamut += array
-		(
+		$this->early_gamut += array(
 			'doShell' => 5,
 			'doURL' => 6
 		);
 
-		$this->span_gamut += array
-		(
+		$this->span_gamut += array(
 			'doGlyphs' => 70,
 			'doSpan' => 71
 		);
@@ -69,8 +67,7 @@ 
 
 	public function doShell($text)
 	{
-		return preg_replace_callback
-		(
+		return preg_replace_callback(
 			'{^\$\s+([^\n]+)\n}xm', array($this, 'doShell_callback'), $text
 		);
 
@@ -79,7 +76,7 @@ 
 
 	protected function doShell_callback($matches)
 	{
-		$text = '<pre class="markdown shell">$ ' . $matches[1] . '</pre>' . PHP_EOL;
+		$text = '<pre class="markdown shell">$ '.$matches[1].'</pre>'.PHP_EOL;
 
 		return $this->hashBlock($text);
 	}
@@ -210,9 +207,9 @@ 
 
 		switch ($type)
 		{
-			case 'php': return '<pre class="php"><code>' . $this->doSourcePHP($text) . '</code></pre>';
-			case 'html': return '<pre class="html"><code>' . $this->doSourceHTML($text) . '</code></pre>';
-			case 'raw': return '<pre><code>' . $this->doSourceRaw($text) . '</code></pre>';
+			case 'php': return '<pre class="php"><code>'.$this->doSourcePHP($text).'</code></pre>';
+			case 'html': return '<pre class="html"><code>'.$this->doSourceHTML($text).'</code></pre>';
+			case 'raw': return '<pre><code>'.$this->doSourceRaw($text).'</code></pre>';
 			case 'publish': return $this->doSourcePublish($text);
 		}
 
@@ -271,8 +268,7 @@ 
 
 		*/
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'{
 				^h([1-6])\.	# $1 = string of h?
 				[ ]*
@@ -296,9 +292,9 @@ 
 			case '-': $level = 3; break;
 		}
 
-		$block = "<h$level>" . $this->runSpanGamut($matches[1]) . "</h$level>";
+		$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_tp($matches)
@@ -306,8 +302,8 @@ 
 		//		\ICanBoogie\log('<pre>doHeaders[atx]: \1</pre>', print_r($matches, true));
 
 		$level = $matches[1];
-		$block = "<h$level>" . $this->runSpanGamut($matches[2]) . "</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 	/*
@@ -327,14 +323,14 @@ 
 
 		$c = "(?:{$clas}|{$styl}|{$lnge}|{$hlgn})*";
 
-		$qtags = array('\*\*','\*','\?\?','-','__','_','%','\+','~','\^');
+		$qtags = array('\*\*', '\*', '\?\?', '-', '__', '_', '%', '\+', '~', '\^');
 		$pnct = ".,\"'?!;:";
 
-		foreach($qtags as $f) {
+		foreach ($qtags as $f) {
 			$text = preg_replace_callback("/
 				(^|(?<=[\s>$pnct\(])|[{[])
 				($f)(?!$f)
-				(" . $c . ")
+				(".$c.")
 				(?::(\S+))?
 				([^\s$f]+|\S.*?[^\s$f\n])
 				([$pnct]*)
@@ -382,23 +378,22 @@ 
 	{
 		//		echo l('doGlyphs: "\1"<br />', \ICanBoogie\escape($text));
 
-		$glyph_search = array
-		(
+		$glyph_search = array(
 		//		'/(\w)\'(\w)/', 									 // apostrophe's
-			'/(\s)\'(\d+\w?)\b(?!\')/u', 						 // back in '88
+			'/(\s)\'(\d+\w?)\b(?!\')/u', // back in '88
 		//		'/(\S)\'(?=\s|[[:punct:]]|<|$)/',						 //  single closing
 		//		'/\'/', 											 //  single opening
-			'/(\S)\"(?=\s|[[:punct:]]|<|$)/u',						 //  double closing
-			'/"/',												 //  double opening
-			'/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/u',		 //  3+ uppercase acronym
-			'/(?<=\s|^|[>(;-])([A-Z]{3,})([a-z]*)(?=\s|[[:punct:]]|<|$)/u',  //  3+ uppercase
-			'/([^.]?)\.{3}/u',									 //  ellipsis
-			'/(\s?)--(\s?)/u',									 //  em dash
-			'/\s-(?:\s|$)/u',									 //  en dash
-			'/(\d+)( ?)x( ?)(?=\d+)/u',							 //  dimension sign
-			'/(\b ?|\s|^)[([]TM[])]/iu', 						 //  trademark
-			'/(\b ?|\s|^)[([]R[])]/iu',							 //  registered
-			'/(\b ?|\s|^)[([]C[])]/iu',							 //  copyright
+			'/(\S)\"(?=\s|[[:punct:]]|<|$)/u', //  double closing
+			'/"/', //  double opening
+			'/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/u', //  3+ uppercase acronym
+			'/(?<=\s|^|[>(;-])([A-Z]{3,})([a-z]*)(?=\s|[[:punct:]]|<|$)/u', //  3+ uppercase
+			'/([^.]?)\.{3}/u', //  ellipsis
+			'/(\s?)--(\s?)/u', //  em dash
+			'/\s-(?:\s|$)/u', //  en dash
+			'/(\d+)( ?)x( ?)(?=\d+)/u', //  dimension sign
+			'/(\b ?|\s|^)[([]TM[])]/iu', //  trademark
+			'/(\b ?|\s|^)[([]R[])]/iu', //  registered
+			'/(\b ?|\s|^)[([]C[])]/iu', //  copyright
 
 		#
 		# the following is for french language
@@ -407,29 +402,28 @@ 
 			'#\s(\!|\?|\:|\;|\-)#u',
 		);
 
-		$glyph_replace = array
-		(
+		$glyph_replace = array(
 		//		'$1'.$txt_apostrophe.'$2',			 // apostrophe's
-			'$1'.txt_apostrophe.'$2',			 // back in '88
+			'$1'.txt_apostrophe.'$2', // back in '88
 		//		'$1'.$txt_quote_single_close,		 //  single closing
 		//		$txt_quote_single_open, 			 //  single opening
-			'$1'.txt_quote_double_close,		 //  double closing
-		txt_quote_double_open, 			 //  double opening
-			'<acronym title="$2">$1</acronym>',  //  3+ uppercase acronym
-			'<span class="caps">$1</span>$2',	 //  3+ uppercase
-			'$1'.txt_ellipsis, 				 //  ellipsis
-			'$1'.txt_emdash.'$2',				 //  em dash
-			' '.txt_endash.' ',				 //  en dash
-			'$1$2'.txt_dimension.'$3', 		 //  dimension sign
-			'$1'.txt_trademark,				 //  trademark
-			'$1'.txt_registered,				 //  registered
-			'$1'.txt_copyright,				 //  copyright
+			'$1'.txt_quote_double_close, //  double closing
+		txt_quote_double_open, //  double opening
+			'<acronym title="$2">$1</acronym>', //  3+ uppercase acronym
+			'<span class="caps">$1</span>$2', //  3+ uppercase
+			'$1'.txt_ellipsis, //  ellipsis
+			'$1'.txt_emdash.'$2', //  em dash
+			' '.txt_endash.' ', //  en dash
+			'$1$2'.txt_dimension.'$3', //  dimension sign
+			'$1'.txt_trademark, //  trademark
+			'$1'.txt_registered, //  registered
+			'$1'.txt_copyright, //  copyright
 
 		#
 		# the following is for french language
 		#
 
-		self::NBSP . '$1',
+		self::NBSP.'$1',
 		);
 
 		return preg_replace($glyph_search, $glyph_replace, $text);
@@ -467,8 +461,7 @@ 
 
 			$style = NULL;
 
-			if (preg_match
-			(
+			if (preg_match(
 				'{
 					(						# the whole thing is saved in $1
 					^p						# start
@@ -514,7 +507,7 @@ 
 			{
 				if ($style)
 				{
-					$value = '<p style="' . $style . '">' . $value . '</p>';
+					$value = '<p style="'.$style.'">'.$value.'</p>';
 				}
 				else
 				{
@@ -583,8 +576,7 @@ 
 		# First, handle reference-style labeled images: ![alt text][id]
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'{
 			(										# wrap whole match in $1
 			  !										# start
@@ -697,10 +689,8 @@ 
 
 		if (isset($parts[1]))
 		{
-			$entry = $module->model()->loadRange
-			(
-			0, 1, 'WHERE `' . $module->getConstant('TITLE') . '` = ? AND `' . $module->getConstant('ALBUM') . '` = ?', array
-			(
+			$entry = $module->model()->loadRange(
+			0, 1, 'WHERE `'.$module->getConstant('TITLE').'` = ? AND `'.$module->getConstant('ALBUM').'` = ?', array(
 			$parts[1], $parts[0]
 			)
 			)
@@ -709,10 +699,8 @@ 
 		}
 		else
 		{
-			$entry = $module->model()->loadRange
-			(
-			0, 1, 'WHERE `slug` = ? OR `title` = ?', array
-			(
+			$entry = $module->model()->loadRange(
+			0, 1, 'WHERE `slug` = ? OR `title` = ?', array(
 			$id, $id
 			)
 			)
@@ -727,8 +715,7 @@ 
 			return parent::_doImages_reference_callback($matches);
 		}
 
-		$params = array
-		(
+		$params = array(
 			'src' => $entry->path,
 			'alt' => \ICanBoogie\escape($alt),
 			'width' => $entry->width,
@@ -757,11 +744,11 @@ 
 	{
 		//		\ICanBoogie\log('<pre>in \1: \2</pre>', __FUNCTION__, $matches);
 
-		$whole_match	= $matches[1];
+		$whole_match = $matches[1];
 		$align = $matches[2];
-		$alt_text		= $matches[3];
+		$alt_text = $matches[3];
 		$url			= $matches[4] == '' ? $matches[5] : $matches[4];
-		$title			=& $matches[8];
+		$title = & $matches[8];
 
 		$alt_text = str_replace('"', '&quot;', $alt_text);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
@@ -776,13 +763,13 @@ 
 				case '>': $align = 'right'; break;
 			}
 
-			$result .= ' align="' . $align . '"';
+			$result .= ' align="'.$align.'"';
 		}
 
 		if (isset($title))
 		{
 			$title = str_replace('"', '&quot;', $title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 
 		$result .= $this->empty_element_suffix;
@@ -798,16 +785,16 @@ 
 	 **
 	 */
 
-	function createElement($markup, $attrs, $body=NULL)
+	function createElement($markup, $attrs, $body = NULL)
 	{
 		$rc = array();
 
 		foreach ($attrs as $name => $value)
 		{
-			$rc[] = $name . '="' . $value . '"';
+			$rc[] = $name.'="'.$value.'"';
 		}
 
-		return "<$markup " . implode(' ', $rc) . ($body ? ">$body</$markup>" : " />");
+		return "<$markup ".implode(' ', $rc).($body ? ">$body</$markup>" : " />");
 	}
 
 	protected function format_codeblock($codeblock, $type)
@@ -847,8 +834,7 @@ 
 		# markup
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\<\!?[^\s^\>]+)(\s+[^\>]+)?(\/?\>)#m', array($this, '_do_html_markup'), $text
 		);
 
@@ -860,8 +846,7 @@ 
 
 		//		\ICanBoogie\log('## \1 ## <pre>\2</pre>', __FUNCTION__, $text);
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#\<\/[a-zA-Z]+\>#m', array($this, '_do_html_markup_close'), $text
 		);
 
@@ -882,14 +867,14 @@ 
 	{
 		//		\ICanBoogie\log('<pre>in \1: \2</pre>', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="string">' . \ICanBoogie\escape($matches[0]) . '</span>');
+		return $this->hashPart('<span class="string">'.\ICanBoogie\escape($matches[0]).'</span>');
 	}
 
 	function _do_html_attribute($matches)
 	{
 		//		\ICanBoogie\log('<pre>in \1: \2</pre>', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="attribute">' . \ICanBoogie\escape($matches[0]) . '</span>');
+		return $this->hashPart('<span class="attribute">'.\ICanBoogie\escape($matches[0]).'</span>');
 	}
 
 	function _do_html_markup($matches)
@@ -902,8 +887,7 @@ 
 		# strings
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#\"[^\"]+\"#', array(&$this, '_do_html_string'), $text
 		);
 
@@ -913,14 +897,13 @@ 
 		# attributes
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#[^\s\=]+#', array(&$this, '_do_html_attribute'), $text
 		);
 
-		$rc = $this->hashPart('<span class="markup">' . \ICanBoogie\escape($matches[1]) . '</span>');
+		$rc = $this->hashPart('<span class="markup">'.\ICanBoogie\escape($matches[1]).'</span>');
 		$rc .= $text;
-		$rc .= $this->hashpart('<span class="markup">' . \ICanBoogie\escape($matches[3]) . '</span>');
+		$rc .= $this->hashpart('<span class="markup">'.\ICanBoogie\escape($matches[3]).'</span>');
 
 		return $rc;
 	}
@@ -929,7 +912,7 @@ 
 	{
 		//		\ICanBoogie\log('<pre>in \1: \2</pre>', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="markup">' . \ICanBoogie\escape($matches[0]) . '</span>');
+		return $this->hashPart('<span class="markup">'.\ICanBoogie\escape($matches[0]).'</span>');
 	}
 
 	#
@@ -948,7 +931,7 @@ 
 		{
 			$in_quotes = NULL;
 
-			for ($i = 0 ; $i < strlen($line) ; $i++)
+			for ($i = 0; $i < strlen($line); $i++)
 			{
 				$c = $line{$i};
 
@@ -970,8 +953,8 @@ 
 
 					$line =
 
-					substr($line, 0, $i) .
-					$this->hashPart('<code class="comment">' . \ICanBoogie\escape(substr($line, $i)) . '</code>');
+					substr($line, 0, $i).
+					$this->hashPart('<code class="comment">'.\ICanBoogie\escape(substr($line, $i)).'</code>');
 
 					break;
 				}
@@ -996,7 +979,7 @@ 
 
 		$y = strlen($text);
 
-		for ($i = 0 ; $i < $y ; $i++)
+		for ($i = 0; $i < $y; $i++)
 		{
 			$c = $text{$i};
 
@@ -1010,7 +993,7 @@ 
 				}
 				else if ($quote_start !== null && $c == $quote)
 				{
-					$out .= $this->hashPart('<span class="string">' . \ICanBoogie\escape($quote . substr($text, $quote_start + 1, $i - $quote_start - 1) . $quote) . '</span>');
+					$out .= $this->hashPart('<span class="string">'.\ICanBoogie\escape($quote.substr($text, $quote_start + 1, $i - $quote_start - 1).$quote).'</span>');
 
 					$quote_start = null;
 					$quote = null;
@@ -1055,8 +1038,7 @@ 
 		# comment block
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#/\*.*?\*/#ms', array(&$this, '_do_php_comment'), $text
 		);
 
@@ -1066,8 +1048,7 @@ 
 		# functions
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\$?[a-zA-z0-9_]+)\(#', array(&$this, '_do_php_function'), $text
 		);
 
@@ -1077,8 +1058,7 @@ 
 
 		//		\ICanBoogie\log('## \1 ## <pre>\2</pre>', __FUNCTION__, \ICanBoogie\escape($text));
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\$|\-\>)([a-zA-z0-9_]+)(?!\x1A)#', array(&$this, '_do_php_variable'), $text
 		);
 
@@ -1086,13 +1066,11 @@ 
 		# numbers
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#0x[0-9a-fA-F]{1,8}#u', array(&$this, '_do_php_number'), $text
 		);
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(?<!\x1A)\d+(?![\w])#u', array(&$this, '_do_php_number'), $text
 		);
 
@@ -1100,8 +1078,7 @@ 
 		# reserved keywords
 		#
 
-		$reserved = array
-		(
+		$reserved = array(
 			'include_once',
 			'require_once',
 			'endswitch',
@@ -1148,9 +1125,8 @@ 
 
 		foreach ($reserved as $k)
 		{
-			$text = preg_replace_callback
-			(
-				'#' . $k . '#', array(&$this, '_do_php_reserved'), $text
+			$text = preg_replace_callback(
+				'#'.$k.'#', array(&$this, '_do_php_reserved'), $text
 			);
 		}
 
@@ -1158,8 +1134,7 @@ 
 		# symbols
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#[\(\)\[\]\{\}\!\@\%\&\*\|\/\<\>\-\+\=]+#', array(&$this, '_do_php_symbol'), $text
 		);
 
@@ -1176,8 +1151,8 @@ 
 
 		$text =
 
-			'<span class="delimiter">' .
-			"&lt;?php</span>\n\n" .
+			'<span class="delimiter">'.
+			"&lt;?php</span>\n\n".
 
 		$text;
 
@@ -1221,10 +1196,9 @@ 
 
 		//		\ICanBoogie\log('## \1 ## \2', __FUNCTION__, $matches);
 
-		return $this->hashPart
-		(
-			'<span class="comment">' .
-		$this->_do_codeentities($matches[0]) .
+		return $this->hashPart(
+			'<span class="comment">'.
+		$this->_do_codeentities($matches[0]).
 			'</span>'
 		);
 	}
@@ -1235,24 +1209,24 @@ 
 
 		if ($matches[1] == '->')
 		{
-			return '->' . $this->hashPart('<span class="variable">' . $matches[2] . '</span>');
+			return '->'.$this->hashPart('<span class="variable">'.$matches[2].'</span>');
 		}
 
-		return $this->hashPart('<span class="variable">' . $matches[0] . '</span>');
+		return $this->hashPart('<span class="variable">'.$matches[0].'</span>');
 	}
 
 	function _do_php_reserved($matches)
 	{
 		//		\ICanBoogie\log('## \1 ## \2', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="reserved">' . $matches[0] . '</span>');
+		return $this->hashPart('<span class="reserved">'.$matches[0].'</span>');
 	}
 
 	function _do_php_function_def($matches)
 	{
 		//		\ICanBoogie\log('## \1 ## \2', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="function">function</span>' . $matches[1]);
+		return $this->hashPart('<span class="function">function</span>'.$matches[1]);
 		//		return $this->hashPart('<span class="function">' . $matches[1] . '</span>(', 'F');
 	}
 
@@ -1265,19 +1239,19 @@ 
 			return $matches[0];
 		}
 
-		return $this->hashPart('<span class="function">' . $matches[1] . '</span>', 'F'). '(';
+		return $this->hashPart('<span class="function">'.$matches[1].'</span>', 'F').'(';
 	}
 
 	function _do_php_symbol($matches)
 	{
-		return $this->hashPart('<span class="symbol">' . \ICanBoogie\escape($matches[0]) . '</span>');
+		return $this->hashPart('<span class="symbol">'.\ICanBoogie\escape($matches[0]).'</span>');
 	}
 
 	function _do_php_number($matches)
 	{
 		//		\ICanBoogie\log('## \1 ## \2', __FUNCTION__, $matches);
 
-		return $this->hashPart('<span class="number">' . $matches[0] . '</span>');
+		return $this->hashPart('<span class="number">'.$matches[0].'</span>');
 	}
 
 	/*
@@ -1291,10 +1265,10 @@ 
 
 	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->encodeAmpsAndAngles($url);
 
@@ -1302,7 +1276,7 @@ 
 		if (isset($title)) {
 			$title = str_replace('"', '&quot;', $title);
 			$title = $this->encodeAmpsAndAngles($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		if (substr($url, 0, 7) == 'http://')