dcngmbh / moox_core

Contrib/less.php/Less.php

Indentation +257 added lines, -257 removed lines

@@ -873,7 +873,7 @@ 
 				break;
 			}
 
-            if( $this->PeekChar('}') ){
+			if( $this->PeekChar('}') ){
 				break;
 			}
 		}
@@ -944,8 +944,8 @@ 
 			$this->MatchChar('~');
 		}
 
-                // Fix for #124: match escaped newlines
-                //$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.)*)"|\'((?:[^\'\\\\\r\n]|\\\\.)*)\'/');
+				// Fix for #124: match escaped newlines
+				//$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.)*)"|\'((?:[^\'\\\\\r\n]|\\\\.)*)\'/');
 		$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)"|\'((?:[^\'\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)\'/');
 
 		if( $str ){
@@ -2869,8 +2869,8 @@ 
 				'~' => '~',
 				'>' => '>',
 				'|' => '|',
-		        '^' => '^',
-		        '^^' => '^^'
+				'^' => '^',
+				'^^' => '^^'
 			);
 
 		}else{
@@ -2885,8 +2885,8 @@ 
 				'~' => ' ~ ',
 				'>' => ' > ',
 				'|' => '|',
-		        '^' => ' ^ ',
-		        '^^' => ' ^^ '
+				'^' => ' ^ ',
+				'^^' => ' ^^ '
 			);
 
 		}
@@ -4157,18 +4157,18 @@ 
 	// this map is intentionally incomplete
 	// if you want more, install 'mime' dep
 	static $_types = array(
-	        '.htm' => 'text/html',
-	        '.html'=> 'text/html',
-	        '.gif' => 'image/gif',
-	        '.jpg' => 'image/jpeg',
-	        '.jpeg'=> 'image/jpeg',
-	        '.png' => 'image/png',
-	        '.ttf' => 'application/x-font-ttf',
-	        '.otf' => 'application/x-font-otf',
-	        '.eot' => 'application/vnd.ms-fontobject',
-	        '.woff' => 'application/x-font-woff',
-	        '.svg' => 'image/svg+xml',
-	        );
+			'.htm' => 'text/html',
+			'.html'=> 'text/html',
+			'.gif' => 'image/gif',
+			'.jpg' => 'image/jpeg',
+			'.jpeg'=> 'image/jpeg',
+			'.png' => 'image/png',
+			'.ttf' => 'application/x-font-ttf',
+			'.otf' => 'application/x-font-otf',
+			'.eot' => 'application/vnd.ms-fontobject',
+			'.woff' => 'application/x-font-woff',
+			'.svg' => 'image/svg+xml',
+			);
 
 	public static function lookup( $filepath ){
 		$parts = explode('.',$filepath);
@@ -4204,13 +4204,13 @@ 
 	}
 
 
-    /**
-     * Generate CSS by adding it to the output object
-     *
-     * @param Less_Output $output The output
-     * @return void
-     */
-    public function genCSS($output){}
+	/**
+	 * Generate CSS by adding it to the output object
+	 *
+	 * @param Less_Output $output The output
+	 * @return void
+	 */
+	public function genCSS($output){}
 
 
 	/**
@@ -4543,9 +4543,9 @@ 
 		return $this;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 
 		$output->add( "alpha(opacity=" );
@@ -4595,7 +4595,7 @@ 
 		return new Less_Tree_Anonymous($this->value, $this->index, $this->currentFileInfo, $this->mapLines);
 	}
 
-    public function compare($x){
+	public function compare($x){
 		if( !is_object($x) ){
 			return -1;
 		}
@@ -4610,9 +4610,9 @@ 
 		return $left < $right ? -1 : 1;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 		$output->add( $this->value, $this->currentFileInfo, $this->index, $this->mapLines );
 	}
@@ -4636,12 +4636,12 @@ 
 	public $value;
 	public $type = 'Assignment';
 
-    public function __construct($key, $val) {
+	public function __construct($key, $val) {
 		$this->key = $key;
 		$this->value = $val;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->value = $visitor->visitObj( $this->value );
 	}
 
@@ -4649,9 +4649,9 @@ 
 		return new Less_Tree_Assignment( $this->key, $this->value->compile($env));
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 		$output->add( $this->key . '=' );
 		$this->value->genCSS( $output );
@@ -4676,13 +4676,13 @@ 
 	public $value;
 	public $type = 'Attribute';
 
-    public function __construct($key, $op, $value){
+	public function __construct($key, $op, $value){
 		$this->key = $key;
 		$this->op = $op;
 		$this->value = $value;
 	}
 
-    public function compile($env){
+	public function compile($env){
 
 		$key_obj = is_object($this->key);
 		$val_obj = is_object($this->value);
@@ -4697,14 +4697,14 @@ 
 			$val_obj ? $this->value->compile($env) : $this->value);
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$output->add( $this->toCSS() );
 	}
 
-    public function toCSS(){
+	public function toCSS(){
 		$value = $this->key;
 
 		if( $this->op ){
@@ -4724,13 +4724,13 @@ 
  * @subpackage tree
  */
 class Less_Tree_Call extends Less_Tree{
-    public $value;
+	public $value;
 
-    protected $name;
-    protected $args;
-    protected $index;
-    protected $currentFileInfo;
-    public $type = 'Call';
+	protected $name;
+	protected $args;
+	protected $index;
+	protected $currentFileInfo;
+	public $type = 'Call';
 
 	public function __construct($name, $args, $index, $currentFileInfo = null ){
 		$this->name = $name;
@@ -4739,23 +4739,23 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->args = $visitor->visitArray( $this->args );
 	}
 
-    //
-    // When evaluating a function call,
-    // we either find the function in `tree.functions` [1],
-    // in which case we call it, passing the  evaluated arguments,
-    // or we simply print it out as it appeared originally [2].
-    //
-    // The *functions.js* file contains the built-in functions.
-    //
-    // The reason why we evaluate the arguments, is in the case where
-    // we try to pass a variable to a function, like: `saturate(@color)`.
-    // The function should receive the value, not the variable.
-    //
-    public function compile($env=null){
+	//
+	// When evaluating a function call,
+	// we either find the function in `tree.functions` [1],
+	// in which case we call it, passing the  evaluated arguments,
+	// or we simply print it out as it appeared originally [2].
+	//
+	// The *functions.js* file contains the built-in functions.
+	//
+	// The reason why we evaluate the arguments, is in the case where
+	// we try to pass a variable to a function, like: `saturate(@color)`.
+	// The function should receive the value, not the variable.
+	//
+	public function compile($env=null){
 		$args = array();
 		foreach($this->args as $a){
 			$args[] = $a->compile($env);
@@ -4810,11 +4810,11 @@ 
 
 
 		return new Less_Tree_Call( $this->name, $args, $this->index, $this->currentFileInfo );
-    }
+	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 
 		$output->add( $this->name . '(', $this->currentFileInfo, $this->index );
@@ -4830,9 +4830,9 @@ 
 	}
 
 
-    //public function toCSS(){
-    //    return $this->compile()->toCSS();
-    //}
+	//public function toCSS(){
+	//    return $this->compile()->toCSS();
+	//}
 
 }
  
@@ -4985,7 +4985,7 @@ 
 	}
 
 	//Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
-    public function toHSV() {
+	public function toHSV() {
 		$r = $this->rgb[0] / 255;
 		$g = $this->rgb[1] / 255;
 		$b = $this->rgb[2] / 255;
@@ -5033,7 +5033,7 @@ 
 			$x->alpha === $this->alpha) ? 0 : -1;
 	}
 
-    public function toHex( $v ){
+	public function toHex( $v ){
 
 		$ret = '#';
 		foreach($v as $c){
@@ -5087,9 +5087,9 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 		//if( $this->debugInfo ){
 			//$output->add( tree.debugInfo($env, $this), $this->currentFileInfo, $this->index);
@@ -5146,7 +5146,7 @@ 
 		$this->rvalue = $visitor->visitObj( $this->rvalue );
 	}
 
-    public function compile($env) {
+	public function compile($env) {
 		$a = $this->lvalue->compile($env);
 		$b = $this->rvalue->compile($env);
 
@@ -5185,7 +5185,7 @@ 
 		}
 
 		return $this->negate ? !$result : $result;
-    }
+	}
 
 }
  
@@ -5201,7 +5201,7 @@ 
 	static $error_;
 	static $value_;
 
-    public static function compile(){
+	public static function compile(){
 		if( self::$error_ ){
 			throw new Exception(self::$error_);
 		}
@@ -5210,15 +5210,15 @@ 
 		}
 	}
 
-    public static function value( $v ){
+	public static function value( $v ){
 		self::$value_ = $v;
 	}
 
-    public static function error( $e ){
+	public static function error( $e ){
 		self::$error_ = $e;
 	}
 
-    public static function reset(){
+	public static function reset(){
 		self::$value_ = self::$error_ = null;
 	}
 } 
@@ -5235,16 +5235,16 @@ 
 	public $frames;
 	public $type = 'DetachedRuleset';
 
-    public function __construct( $ruleset, $frames = null ){
+	public function __construct( $ruleset, $frames = null ){
 		$this->ruleset = $ruleset;
 		$this->frames = $frames;
 	}
 
-    public function accept($visitor) {
+	public function accept($visitor) {
 		$this->ruleset = $visitor->visitObj($this->ruleset);
 	}
 
-    public function compile($env){
+	public function compile($env){
 		if( $this->frames ){
 			$frames = $this->frames;
 		}else{
@@ -5253,7 +5253,7 @@ 
 		return new Less_Tree_DetachedRuleset($this->ruleset, $frames);
 	}
 
-    public function callEval($env) {
+	public function callEval($env) {
 		if( $this->frames ){
 			return $this->ruleset->compile( $env->copyEvalEnv( array_merge($this->frames,$env->frames) ) );
 		}
@@ -5275,8 +5275,8 @@ 
 	public $unit;
 	public $type = 'Dimension';
 
-    public function __construct($value, $unit = null){
-        $this->value = floatval($value);
+	public function __construct($value, $unit = null){
+		$this->value = floatval($value);
 
 		if( $unit && ($unit instanceof Less_Tree_Unit) ){
 			$this->unit = $unit;
@@ -5285,23 +5285,23 @@ 
 		}else{
 			$this->unit = new Less_Tree_Unit( );
 		}
-    }
+	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->unit = $visitor->visitObj( $this->unit );
 	}
 
-    public function compile(){
-        return $this;
-    }
+	public function compile(){
+		return $this;
+	}
 
-    public function toColor() {
-        return new Less_Tree_Color(array($this->value, $this->value, $this->value));
-    }
+	public function toColor() {
+		return new Less_Tree_Color(array($this->value, $this->value, $this->value));
+	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 
 		if( Less_Parser::$options['strictUnits'] && !$this->unit->isSingular() ){
@@ -5334,18 +5334,18 @@ 
 		$this->unit->genCSS( $output );
 	}
 
-    public function __toString(){
-        return $this->toCSS();
-    }
+	public function __toString(){
+		return $this->toCSS();
+	}
 
-    // In an operation between two Dimensions,
-    // we default to the first Dimension's unit,
-    // so `1px + 2em` will yield `3px`.
+	// In an operation between two Dimensions,
+	// we default to the first Dimension's unit,
+	// so `1px + 2em` will yield `3px`.
 
-    /**
-     * @param string $op
-     */
-    public function operate( $op, $other){
+	/**
+	 * @param string $op
+	 */
+	public function operate( $op, $other){
 
 		$value = Less_Functions::operate( $op, $this->value, $other->value);
 		$unit = clone $this->unit;
@@ -5380,7 +5380,7 @@ 
 			$unit->cancel();
 		}
 		return new Less_Tree_Dimension( $value, $unit);
-    }
+	}
 
 	public function compare($other) {
 		if ($other instanceof Less_Tree_Dimension) {
@@ -5410,11 +5410,11 @@ 
 		}
 	}
 
-    public function unify() {
+	public function unify() {
 		return $this->convertTo(array('length'=> 'px', 'duration'=> 's', 'angle' => 'rad' ));
 	}
 
-    public function convertTo($conversions) {
+	public function convertTo($conversions) {
 		$value = $this->value;
 		$unit = clone $this->unit;
 
@@ -5460,7 +5460,7 @@ 
 		$unit->cancel();
 
 		return new Less_Tree_Dimension( $value, $unit);
-    }
+	}
 }
  
 
@@ -5495,7 +5495,7 @@ 
 	}
 
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		if( $this->rules ){
 			$this->rules = $visitor->visitObj( $this->rules );
 		}
@@ -5505,10 +5505,10 @@ 
 	}
 
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$value = $this->value;
 		$rules = $this->rules;
 		$output->add( $this->name, $this->currentFileInfo, $this->index );
@@ -5593,7 +5593,7 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		if( $this->value_is_object ){ //object or string
 			$this->value = $visitor->visitObj( $this->value );
 		}
@@ -5612,9 +5612,9 @@ 
 		return $this;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 		$output->add( $this->toCSS(), $this->currentFileInfo, $this->index );
 	}
@@ -5657,7 +5657,7 @@ 
 		$this->parens = $parens;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->value = $visitor->visitArray( $this->value );
 	}
 
@@ -5707,10 +5707,10 @@ 
 		return $returnValue;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$val_len = count($this->value);
 		for( $i = 0; $i < $val_len; $i++ ){
 			$this->value[$i]->genCSS( $output );
@@ -5720,7 +5720,7 @@ 
 		}
 	}
 
-    public function throwAwayComments() {
+	public function throwAwayComments() {
 
 		if( is_array($this->value) ){
 			$new_value = array();
@@ -5761,7 +5761,7 @@ 
 	/**
 	 * @param integer $index
 	 */
-    public function __construct($selector, $option, $index){
+	public function __construct($selector, $option, $index){
 		static $i = 0;
 		$this->selector = $selector;
 		$this->option = $option;
@@ -5782,18 +5782,18 @@ 
 		$this->parent_ids = array($this->object_id);
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->selector = $visitor->visitObj( $this->selector );
 	}
 
-    public function compile( $env ){
+	public function compile( $env ){
 		Less_Parser::$has_extends = true;
 		$this->selector = $this->selector->compile($env);
 		return $this;
 		//return new Less_Tree_Extend( $this->selector->compile($env), $this->option, $this->index);
 	}
 
-    public function findSelfSelectors( $selectors ){
+	public function findSelfSelectors( $selectors ){
 		$selfElements = array();
 
 
@@ -5839,7 +5839,7 @@ 
 	public $root;
 	public $type = 'Import';
 
-    public function __construct($path, $features, $options, $index, $currentFileInfo = null ){
+	public function __construct($path, $features, $options, $index, $currentFileInfo = null ){
 		$this->options = $options;
 		$this->index = $index;
 		$this->path = $path;
@@ -5870,7 +5870,7 @@ 
 // ruleset.
 //
 
-    public function accept($visitor){
+	public function accept($visitor){
 
 		if( $this->features ){
 			$this->features = $visitor->visitObj($this->features);
@@ -5882,10 +5882,10 @@ 
 		}
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		if( $this->css ){
 
 			$output->add( '@import ', $this->currentFileInfo, $this->index );
@@ -5899,7 +5899,7 @@ 
 		}
 	}
 
-    public function toCSS(){
+	public function toCSS(){
 		$features = $this->features ? ' ' . $this->features->toCSS() : '';
 
 		if ($this->css) {
@@ -5912,7 +5912,7 @@ 
 	/**
 	 * @return string
 	 */
-    public function getPath(){
+	public function getPath(){
 		if ($this->path instanceof Less_Tree_Quoted) {
 			$path = $this->path->value;
 			$path = ( isset($this->css) || preg_match('/(\.[a-z]*$)|([\?;].*)$/',$path)) ? $path : $path . '.less';
@@ -5926,11 +5926,11 @@ 
 		return preg_replace('/[\?#][^\?]*$/','',$path);
 	}
 
-    public function compileForImport( $env ){
+	public function compileForImport( $env ){
 		return new Less_Tree_Import( $this->path->compile($env), $this->features, $this->options, $this->index, $this->currentFileInfo);
 	}
 
-    public function compilePath($env) {
+	public function compilePath($env) {
 		$path = $this->path->compile($env);
 		$rootpath = '';
 		if( $this->currentFileInfo && $this->currentFileInfo['rootpath'] ){
@@ -5954,7 +5954,7 @@ 
 		return $path;
 	}
 
-    public function compile( $env ){
+	public function compile( $env ){
 
 		$evald = $this->compileForImport($env);
 
@@ -6011,7 +6011,7 @@ 
 	 *
 	 * @param Less_Tree_Import $evald
 	 */
-    public function PathAndUri(){
+	public function PathAndUri(){
 
 		$evald_path = $this->getPath();
 
@@ -6074,7 +6074,7 @@ 
 	 *
 	 * @return Less_Tree_Media|array
 	 */
-    public function ParseImport( $full_path, $uri, $env ){
+	public function ParseImport( $full_path, $uri, $env ){
 
 		$import_env = clone $env;
 		if( (isset($this->options['reference']) && $this->options['reference']) || isset($this->currentFileInfo['reference']) ){
@@ -6171,9 +6171,9 @@ 
 		return $this;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 
 		if( $this->value === '%') {
@@ -6221,15 +6221,15 @@ 
 		$this->rules[0]->allowImports = true;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->features = $visitor->visitObj($this->features);
 		$this->rules = $visitor->visitArray($this->rules);
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 
 		$output->add( '@media ', $this->currentFileInfo, $this->index );
 		$this->features->genCSS( $output );
@@ -6277,7 +6277,7 @@ 
 		$el = new Less_Tree_Element('','&', $this->index, $this->currentFileInfo );
 		$sels = array( new Less_Tree_Selector(array($el), array(), null, $this->index, $this->currentFileInfo) );
 		$sels[0]->mediaEmpty = true;
-        return $sels;
+		return $sels;
 	}
 
 	public function markReferenced(){
@@ -6362,7 +6362,7 @@ 
 		return $result;
 	}
 
-    public function bubbleSelectors($selectors) {
+	public function bubbleSelectors($selectors) {
 
 		if( !$selectors) return;
 
@@ -6397,7 +6397,7 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function genCSS( $output ){
+	public function genCSS( $output ){
 
 		$output->add(
 			$this->name
@@ -6424,7 +6424,7 @@ 
 	public $value;
 	public $type = 'Negative';
 
-    public function __construct($node){
+	public function __construct($node){
 		$this->value = $node;
 	}
 
@@ -6432,15 +6432,15 @@ 
 	//	$this->value = $visitor->visit($this->value);
 	//}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$output->add( '-' );
 		$this->value->genCSS( $output );
 	}
 
-    public function compile($env) {
+	public function compile($env) {
 		if( Less_Environment::isMathOn() ){
 			$ret = new Less_Tree_Operation('*', array( new Less_Tree_Dimension(-1), $this->value ) );
 			return $ret->compile($env);
@@ -6471,7 +6471,7 @@ 
 		$this->isSpaced = $isSpaced;
 	}
 
-    public function accept($visitor) {
+	public function accept($visitor) {
 		$this->operands = $visitor->visitArray($this->operands);
 	}
 
@@ -6501,10 +6501,10 @@ 
 	}
 
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$this->operands[0]->genCSS( $output );
 		if( $this->isSpaced ){
 			$output->add( " " );
@@ -6534,14 +6534,14 @@ 
 		$this->value = $value;
 	}
 
-    public function accept($visitor){
+	public function accept($visitor){
 		$this->value = $visitor->visitObj($this->value);
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$output->add( '(' );
 		$this->value->genCSS( $output );
 		$output->add( ')' );
@@ -6581,18 +6581,18 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		if( !$this->escaped ){
 			$output->add( $this->quote, $this->currentFileInfo, $this->index );
-        }
-        $output->add( $this->value );
-        if( !$this->escaped ){
+		}
+		$output->add( $this->value );
+		if( !$this->escaped ){
 			$output->add( $this->quote );
-        }
-    }
+		}
+	}
 
 	public function compile($env){
 
@@ -6617,7 +6617,7 @@ 
 		return new Less_Tree_Quoted($this->quote . $value . $this->quote, $value, $this->escaped, $this->index, $this->currentFileInfo);
 	}
 
-    public function compare($x) {
+	public function compare($x) {
 
 		if( !Less_Parser::is_method($x, 'toCSS') ){
 			return -1;
@@ -6667,14 +6667,14 @@ 
 		$this->variable = ( is_string($name) && $name[0] === '@');
 	}
 
-    public function accept($visitor) {
+	public function accept($visitor) {
 		$this->value = $visitor->visitObj( $this->value );
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 
 		$output->add( $this->name . Less_Environment::$_outputMap[': '], $this->currentFileInfo, $this->index);
 		try{
@@ -6735,7 +6735,7 @@ 
 	}
 
 
-    public function CompileName( $env, $name ){
+	public function CompileName( $env, $name ){
 		$output = new Less_Output();
 		foreach($name as $n){
 			$n->compile($env)->genCSS($output);
@@ -6743,7 +6743,7 @@ 
 		return $output->toString();
 	}
 
-    public function makeImportant(){
+	public function makeImportant(){
 		return new Less_Tree_Rule($this->name, $this->value, '!important', $this->merge, $this->index, $this->currentFileInfo, $this->inline);
 	}
 
@@ -6845,14 +6845,14 @@ 
 			}
 		}
 
-        // Evaluate everything else
+		// Evaluate everything else
 		for( $i=0; $i<$rsRuleCnt; $i++ ){
 			$rule = $ruleset->rules[$i];
 
-            // for rulesets, check if it is a css guard and can be removed
+			// for rulesets, check if it is a css guard and can be removed
 			if( $rule instanceof Less_Tree_Ruleset && $rule->selectors && count($rule->selectors) === 1 ){
 
-                // check if it can be folded in (e.g. & where)
+				// check if it can be folded in (e.g. & where)
 				if( $rule->selectors[0]->isJustParentSelector() ){
 					array_splice($ruleset->rules,$i--,1);
 					$rsRuleCnt--;
@@ -6865,9 +6865,9 @@ 
 						}
 					}
 
-                }
-            }
-        }
+				}
+			}
+		}
 
 
 		// Pop the stack
@@ -7404,13 +7404,13 @@ 
 	public $variable;
 	public $type = "RulesetCall";
 
-    public function __construct($variable){
+	public function __construct($variable){
 		$this->variable = $variable;
 	}
 
-    public function accept($visitor) {}
+	public function accept($visitor) {}
 
-    public function compile( $env ){
+	public function compile( $env ){
 		$variable = new Less_Tree_Variable($this->variable);
 		$detachedRuleset = $variable->compile($env);
 		return $detachedRuleset->callEval($env);
@@ -7464,7 +7464,7 @@ 
 		$this->CacheElements();
 	}
 
-    public function accept($visitor) {
+	public function accept($visitor) {
 		$this->elements = $visitor->visitArray($this->elements);
 		$this->extendList = $visitor->visitArray($this->extendList);
 		if( $this->condition ){
@@ -7476,7 +7476,7 @@ 
 		}
 	}
 
-    public function createDerived( $elements, $extendList = null, $evaldCondition = null ){
+	public function createDerived( $elements, $extendList = null, $evaldCondition = null ){
 		$newSelector = new Less_Tree_Selector( $elements, ($extendList ? $extendList : $this->extendList), null, $this->index, $this->currentFileInfo, $this->isReferenced);
 		$newSelector->evaldCondition = $evaldCondition ? $evaldCondition : $this->evaldCondition;
 		return $newSelector;
@@ -7561,7 +7561,7 @@ 
 	/**
 	 * @see Less_Tree::genCSS
 	 */
-    public function genCSS( $output, $firstSelector = true ){
+	public function genCSS( $output, $firstSelector = true ){
 
 		if( !$firstSelector && $this->elements[0]->combinator === "" ){
 			$output->add(' ', $this->currentFileInfo, $this->index);
@@ -7572,15 +7572,15 @@ 
 		}
 	}
 
-    public function markReferenced(){
+	public function markReferenced(){
 		$this->isReferenced = true;
 	}
 
-    public function getIsReferenced(){
+	public function getIsReferenced(){
 		return !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference'] || $this->isReferenced;
 	}
 
-    public function getIsOutput(){
+	public function getIsOutput(){
 		return $this->evaldCondition;
 	}
 
@@ -7602,9 +7602,9 @@ 
 		$this->value = $value;
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	public function genCSS( $output ){
 		$output->add( $this->value );
 	}
@@ -7629,19 +7629,19 @@ 
 	public $backupUnit;
 	public $type = 'Unit';
 
-    public function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
+	public function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
 		$this->numerator = $numerator;
 		$this->denominator = $denominator;
 		$this->backupUnit = $backupUnit;
 	}
 
-    public function __clone(){
+	public function __clone(){
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 
 		if( $this->numerator ){
 			$output->add( $this->numerator[0] );
@@ -7653,7 +7653,7 @@ 
 		}
 	}
 
-    public function toString(){
+	public function toString(){
 		$returnStr = implode('*',$this->numerator);
 		foreach($this->denominator as $d){
 			$returnStr .= '/'.$d;
@@ -7661,7 +7661,7 @@ 
 		return $returnStr;
 	}
 
-    public function __toString(){
+	public function __toString(){
 		return $this->toString();
 	}
 
@@ -7669,33 +7669,33 @@ 
 	/**
 	 * @param Less_Tree_Unit $other
 	 */
-    public function compare($other) {
+	public function compare($other) {
 		return $this->is( $other->toString() ) ? 0 : -1;
 	}
 
-    public function is($unitString){
+	public function is($unitString){
 		return $this->toString() === $unitString;
 	}
 
-    public function isLength(){
+	public function isLength(){
 		$css = $this->toCSS();
 		return !!preg_match('/px|em|%|in|cm|mm|pc|pt|ex/',$css);
 	}
 
-    public function isAngle() {
+	public function isAngle() {
 		return isset( Less_Tree_UnitConversions::$angle[$this->toCSS()] );
 	}
 
-    public function isEmpty(){
+	public function isEmpty(){
 		return !$this->numerator && !$this->denominator;
 	}
 
-    public function isSingular() {
+	public function isSingular() {
 		return count($this->numerator) <= 1 && !$this->denominator;
 	}
 
 
-    public function usedUnits(){
+	public function usedUnits(){
 		$result = array();
 
 		foreach(Less_Tree_UnitConversions::$groups as $groupName){
@@ -7717,7 +7717,7 @@ 
 		return $result;
 	}
 
-    public function cancel(){
+	public function cancel(){
 		$counter = array();
 		$backup = null;
 
@@ -7817,14 +7817,14 @@ 
 		$this->isEvald = $isEvald;
 	}
 
-    public function accept( $visitor ){
+	public function accept( $visitor ){
 		$this->value = $visitor->visitObj($this->value);
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
-    public function genCSS( $output ){
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
 		$output->add( 'url(' );
 		$this->value->genCSS( $output );
 		$output->add( ')' );
@@ -7888,7 +7888,7 @@ 
 		$this->value = $value;
 	}
 
-    public function accept($visitor) {
+	public function accept($visitor) {
 		$this->value = $visitor->visitArray($this->value);
 	}
 
@@ -7905,9 +7905,9 @@ 
 		return $ret[0];
 	}
 
-    /**
-     * @see Less_Tree::genCSS
-     */
+	/**
+	 * @see Less_Tree::genCSS
+	 */
 	function genCSS( $output ){
 		$len = count($this->value);
 		for($i = 0; $i < $len; $i++ ){
@@ -7935,14 +7935,14 @@ 
 	public $evaluating = false;
 	public $type = 'Variable';
 
-    /**
-     * @param string $name
-     */
-    public function __construct($name, $index = null, $currentFileInfo = null) {
-        $this->name = $name;
-        $this->index = $index;
+	/**
+	 * @param string $name
+	 */
+	public function __construct($name, $index = null, $currentFileInfo = null) {
+		$this->name = $name;
+		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
-    }
+	}
 
 	public function compile($env) {
 
@@ -8367,8 +8367,8 @@ 
 
 		// set array to prevent error on array_merge
 		if(!is_array($this->frames)) {
-             $this->frames = array();
-        }
+			 $this->frames = array();
+		}
 
 		$frame = $this->compileParams($env, array_merge($this->frames,$env->frames), $args );
 
@@ -8437,21 +8437,21 @@ 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-    public function run($root){
+	public function run($root){
 		$root = $this->visitObj($root);
 		$root->allExtends =& $this->allExtendsStack[0];
 		return $root;
 	}
 
-    public function visitRule($ruleNode, &$visitDeeper ){
+	public function visitRule($ruleNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset($rulesetNode){
+	public function visitRuleset($rulesetNode){
 
 		if( $rulesetNode->root ){
 			return;
@@ -8487,7 +8487,7 @@ 
 		$this->contexts[] = $rulesetNode->selectors;
 	}
 
-    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
+	public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
 		$this->foundExtends = true;
 		$extend = clone $extend;
 		$extend->findSelfSelectors( $selectorPath );
@@ -8502,27 +8502,27 @@ 
 	}
 
 
-    public function visitRulesetOut( $rulesetNode ){
+	public function visitRulesetOut( $rulesetNode ){
 		if( !is_object($rulesetNode) || !$rulesetNode->root ){
 			array_pop($this->contexts);
 		}
 	}
 
-    public function visitMedia( $mediaNode ){
+	public function visitMedia( $mediaNode ){
 		$mediaNode->allExtends = array();
 		$this->allExtendsStack[] =& $mediaNode->allExtends;
 	}
 
-    public function visitMediaOut(){
+	public function visitMediaOut(){
 		array_pop($this->allExtendsStack);
 	}
 
-    public function visitDirective( $directiveNode ){
+	public function visitDirective( $directiveNode ){
 		$directiveNode->allExtends = array();
 		$this->allExtendsStack[] =& $directiveNode->allExtends;
 	}
 
-    public function visitDirectiveOut(){
+	public function visitDirectiveOut(){
 		array_pop($this->allExtendsStack);
 	}
 }
@@ -8686,15 +8686,15 @@ 
 		return $this->visitObj($root);
 	}
 
-    public function visitRule( $ruleNode, &$visitDeeper ){
+	public function visitRule( $ruleNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset( $rulesetNode ){
+	public function visitRuleset( $rulesetNode ){
 
 		$paths = array();
 
@@ -8723,11 +8723,11 @@ 
 		$this->contexts[] = $paths; //different from less.js. Placed after joinSelectors() so that $this->contexts will get correct $paths
 	}
 
-    public function visitRulesetOut(){
+	public function visitRulesetOut(){
 		array_pop($this->contexts);
 	}
 
-    public function visitMedia($mediaNode) {
+	public function visitMedia($mediaNode) {
 		$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
 		if( !count($context) || (is_object($context[0]) && $context[0]->multiMedia) ){

Spacing +2204 added lines, -2204 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once( dirname(__FILE__).'/Cache.php');
+require_once(dirname(__FILE__).'/Cache.php');
 
 /**
  * Class for parsing and compiling less files into css
@@ -9,28 +9,28 @@ 
  * @subpackage parser
  *
  */
-class Less_Parser{
+class Less_Parser {
 
 
 	/**
 	 * Default parser options
 	 */
 	public static $default_options = array(
-		'compress'				=> false,			// option - whether to compress
-		'strictUnits'			=> false,			// whether units need to evaluate correctly
-		'strictMath'			=> false,			// whether math has to be within parenthesis
-		'relativeUrls'			=> true,			// option - whether to adjust URL's to be relative
-		'urlArgs'				=> array(),			// whether to add args into url tokens
+		'compress'				=> false, // option - whether to compress
+		'strictUnits'			=> false, // whether units need to evaluate correctly
+		'strictMath'			=> false, // whether math has to be within parenthesis
+		'relativeUrls'			=> true, // option - whether to adjust URL's to be relative
+		'urlArgs'				=> array(), // whether to add args into url tokens
 		'numPrecision'			=> 8,
 
 		'import_dirs'			=> array(),
 		'import_callback'		=> null,
 		'cache_dir'				=> null,
-		'cache_method'			=> 'php', 			// false, 'serialize', 'php', 'var_export', 'callback';
+		'cache_method'			=> 'php', // false, 'serialize', 'php', 'var_export', 'callback';
 		'cache_callback_get'	=> null,
 		'cache_callback_set'	=> null,
 
-		'sourceMap'				=> false,			// whether to output a source map
+		'sourceMap'				=> false, // whether to output a source map
 		'sourceMapBasepath'		=> null,
 		'sourceMapWriteTo'		=> null,
 		'sourceMapURL'			=> null,
@@ -42,10 +42,10 @@ 
 	public static $options = array();
 
 
-	private $input;					// Less input string
-	private $input_len;				// input string length
-	private $pos;					// current index in `input`
-	private $saveStack = array();	// holds state for backtracking
+	private $input; // Less input string
+	private $input_len; // input string length
+	private $pos; // current index in `input`
+	private $saveStack = array(); // holds state for backtracking
 	private $furthest;
 	private $mb_internal_encoding = ''; // for remember exists value of mbstring.internal_encoding
 
@@ -73,15 +73,15 @@ 
 	/**
 	 * @param Less_Environment|array|null $env
 	 */
-	public function __construct( $env = null ){
+	public function __construct($env = null) {
 
 		// Top parser on an import tree must be sure there is one "env"
 		// which will then be passed around by reference.
-		if( $env instanceof Less_Environment ){
+		if ($env instanceof Less_Environment) {
 			$this->env = $env;
-		}else{
+		}else {
 			$this->SetOptions(Less_Parser::$default_options);
-			$this->Reset( $env );
+			$this->Reset($env);
 		}
 
 		// mbstring.func_overload > 1 bugfix
@@ -99,7 +99,7 @@ 
 	 * Reset the parser state completely
 	 *
 	 */
-	public function Reset( $options = null ){
+	public function Reset($options = null) {
 		$this->rules = array();
 		self::$imports = array();
 		self::$has_extends = false;
@@ -110,7 +110,7 @@ 
 		$this->env->Init();
 
 		//set new options
-		if( is_array($options) ){
+		if (is_array($options)) {
 			$this->SetOptions(Less_Parser::$default_options);
 			$this->SetOptions($options);
 		}
@@ -121,9 +121,9 @@ 
 	 *  options: import_dirs, cache_dir, cache_method
 	 *
 	 */
-	public function SetOptions( $options ){
-		foreach($options as $option => $value){
-			$this->SetOption($option,$value);
+	public function SetOptions($options) {
+		foreach ($options as $option => $value) {
+			$this->SetOption($option, $value);
 		}
 	}
 
@@ -131,16 +131,16 @@ 
 	 * Set one compiler option
 	 *
 	 */
-	public function SetOption($option,$value){
+	public function SetOption($option, $value) {
 
-		switch($option){
+		switch ($option) {
 
 			case 'import_dirs':
 				$this->SetImportDirs($value);
 			return;
 
 			case 'cache_dir':
-				if( is_string($value) ){
+				if (is_string($value)) {
 					Less_Cache::SetCacheDir($value);
 					Less_Cache::CheckCacheDir();
 				}
@@ -166,7 +166,7 @@ 
 	 * @param  string $name function name
 	 */
 	public function unregisterFunction($name) {
-		if( isset($this->env->functions[$name]) )
+		if (isset($this->env->functions[$name]))
 			unset($this->env->functions[$name]);
 	}
 
@@ -176,16 +176,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCss(){
+	public function getCss() {
 
 		$precision = ini_get('precision');
-		@ini_set('precision',16);
+		@ini_set('precision', 16);
 		$locale = setlocale(LC_NUMERIC, 0);
 		setlocale(LC_NUMERIC, "C");
 
 		try {
 
-	 		$root = new Less_Tree_Ruleset(array(), $this->rules );
+	 		$root = new Less_Tree_Ruleset(array(), $this->rules);
 			$root->root = true;
 			$root->firstRoot = true;
 
@@ -199,16 +199,16 @@ 
 
 			$this->PostVisitors($evaldRoot);
 
-			if( Less_Parser::$options['sourceMap'] ){
-				$generator = new Less_SourceMap_Generator($evaldRoot, Less_Parser::$contentsMap, Less_Parser::$options );
+			if (Less_Parser::$options['sourceMap']) {
+				$generator = new Less_SourceMap_Generator($evaldRoot, Less_Parser::$contentsMap, Less_Parser::$options);
 				// will also save file
 				// FIXME: should happen somewhere else?
 				$css = $generator->generateCSS();
-			}else{
+			}else {
 				$css = $evaldRoot->toCSS();
 			}
 
-			if( Less_Parser::$options['compress'] ){
+			if (Less_Parser::$options['compress']) {
 				$css = preg_replace('/(^(\s)+)|((\s)+$)/', '', $css);
 			}
 
@@ -217,12 +217,12 @@ 
 		}
 
 		//reset php settings
-		@ini_set('precision',$precision);
+		@ini_set('precision', $precision);
 		setlocale(LC_NUMERIC, $locale);
 
 		// If you previously defined $this->mb_internal_encoding 
 		// is required to return the encoding as it was before
-		if ($this->mb_internal_encoding != '') {
+		if ($this->mb_internal_encoding!='') {
 			@ini_set("mbstring.internal_encoding", $this->mb_internal_encoding);
 			$this->mb_internal_encoding = '';
 		}
@@ -241,11 +241,11 @@ 
 	 * Run pre-compile visitors
 	 *
 	 */
-	private function PreVisitors($root){
+	private function PreVisitors($root) {
 
-		if( Less_Parser::$options['plugins'] ){
-			foreach(Less_Parser::$options['plugins'] as $plugin){
-				if( !empty($plugin->isPreEvalVisitor) ){
+		if (Less_Parser::$options['plugins']) {
+			foreach (Less_Parser::$options['plugins'] as $plugin) {
+				if (!empty($plugin->isPreEvalVisitor)) {
 					$plugin->run($root);
 				}
 			}
@@ -257,32 +257,32 @@ 
 	 * Run post-compile visitors
 	 *
 	 */
-	private function PostVisitors($evaldRoot){
+	private function PostVisitors($evaldRoot) {
 
 		$visitors = array();
 		$visitors[] = new Less_Visitor_joinSelector();
-		if( self::$has_extends ){
+		if (self::$has_extends) {
 			$visitors[] = new Less_Visitor_processExtends();
 		}
 		$visitors[] = new Less_Visitor_toCSS();
 
 
-		if( Less_Parser::$options['plugins'] ){
-			foreach(Less_Parser::$options['plugins'] as $plugin){
-				if( property_exists($plugin,'isPreEvalVisitor') && $plugin->isPreEvalVisitor ){
+		if (Less_Parser::$options['plugins']) {
+			foreach (Less_Parser::$options['plugins'] as $plugin) {
+				if (property_exists($plugin, 'isPreEvalVisitor') && $plugin->isPreEvalVisitor) {
 					continue;
 				}
 
-				if( property_exists($plugin,'isPreVisitor') && $plugin->isPreVisitor ){
-					array_unshift( $visitors, $plugin);
-				}else{
+				if (property_exists($plugin, 'isPreVisitor') && $plugin->isPreVisitor) {
+					array_unshift($visitors, $plugin);
+				}else {
 					$visitors[] = $plugin;
 				}
 			}
 		}
 
 
-		for($i = 0; $i < count($visitors); $i++ ){
+		for ($i = 0; $i<count($visitors); $i++) {
 			$visitors[$i]->run($evaldRoot);
 		}
 
@@ -296,12 +296,12 @@ 
 	 * @param string $uri_root The url of the file
 	 * @return Less_Tree_Ruleset|Less_Parser
 	 */
-	public function parse( $str, $file_uri = null ){
+	public function parse($str, $file_uri = null) {
 
-		if( !$file_uri ){
+		if (!$file_uri) {
 			$uri_root = '';
 			$filename = 'anonymous-file-'.Less_Parser::$next_id++.'.less';
-		}else{
+		}else {
 			$file_uri = self::WinPath($file_uri);
 			$filename = $file_uri;
 			$uri_root = dirname($file_uri);
@@ -314,7 +314,7 @@ 
 		$this->input = $str;
 		$this->_parse();
 
-		if( $previousFileInfo ){
+		if ($previousFileInfo) {
 			$this->env->currentFileInfo = $previousFileInfo;
 		}
 
@@ -331,16 +331,16 @@ 
 	 * @param bool $returnRoot Indicates whether the return value should be a css string a root node
 	 * @return Less_Tree_Ruleset|Less_Parser
 	 */
-	public function parseFile( $filename, $uri_root = '', $returnRoot = false){
+	public function parseFile($filename, $uri_root = '', $returnRoot = false) {
 
-		if( !file_exists($filename) ){
+		if (!file_exists($filename)) {
 			$this->Error(sprintf('File `%s` not found.', $filename));
 		}
 
 
 		// fix uri_root?
 		// Instead of The mixture of file path for the first argument and directory path for the second argument has bee
-		if( !$returnRoot && !empty($uri_root) && basename($uri_root) == basename($filename) ){
+		if (!$returnRoot && !empty($uri_root) && basename($uri_root)==basename($filename)) {
 			$uri_root = dirname($uri_root);
 		}
 
@@ -348,7 +348,7 @@ 
 		$previousFileInfo = $this->env->currentFileInfo;
 
 
-		if( $filename ){
+		if ($filename) {
 			$filename = self::WinPath(realpath($filename));
 		}
 		$uri_root = self::WinPath($uri_root);
@@ -357,15 +357,15 @@ 
 
 		self::AddParsedFile($filename);
 
-		if( $returnRoot ){
-			$rules = $this->GetRules( $filename );
-			$return = new Less_Tree_Ruleset(array(), $rules );
-		}else{
-			$this->_parse( $filename );
+		if ($returnRoot) {
+			$rules = $this->GetRules($filename);
+			$return = new Less_Tree_Ruleset(array(), $rules);
+		}else {
+			$this->_parse($filename);
 			$return = $this;
 		}
 
-		if( $previousFileInfo ){
+		if ($previousFileInfo) {
 			$this->env->currentFileInfo = $previousFileInfo;
 		}
 
@@ -378,9 +378,9 @@ 
 	 * @param array $vars
 	 * @return Less_Parser
 	 */
-	public function ModifyVars( $vars ){
+	public function ModifyVars($vars) {
 
-		$this->input = Less_Parser::serializeVars( $vars );
+		$this->input = Less_Parser::serializeVars($vars);
 		$this->_parse();
 
 		return $this;
@@ -390,24 +390,24 @@ 
 	/**
 	 * @param string $filename
 	 */
-	public function SetFileInfo( $filename, $uri_root = ''){
+	public function SetFileInfo($filename, $uri_root = '') {
 
 		$filename = Less_Environment::normalizePath($filename);
-		$dirname = preg_replace('/[^\/\\\\]*$/','',$filename);
+		$dirname = preg_replace('/[^\/\\\\]*$/', '', $filename);
 
-		if( !empty($uri_root) ){
-			$uri_root = rtrim($uri_root,'/').'/';
+		if (!empty($uri_root)) {
+			$uri_root = rtrim($uri_root, '/').'/';
 		}
 
 		$currentFileInfo = array();
 
 		//entry info
-		if( isset($this->env->currentFileInfo) ){
+		if (isset($this->env->currentFileInfo)) {
 			$currentFileInfo['entryPath'] = $this->env->currentFileInfo['entryPath'];
 			$currentFileInfo['entryUri'] = $this->env->currentFileInfo['entryUri'];
 			$currentFileInfo['rootpath'] = $this->env->currentFileInfo['rootpath'];
 
-		}else{
+		}else {
 			$currentFileInfo['entryPath'] = $dirname;
 			$currentFileInfo['entryUri'] = $uri_root;
 			$currentFileInfo['rootpath'] = $dirname;
@@ -420,7 +420,7 @@ 
 
 
 		//inherit reference
-		if( isset($this->env->currentFileInfo['reference']) && $this->env->currentFileInfo['reference'] ){
+		if (isset($this->env->currentFileInfo['reference']) && $this->env->currentFileInfo['reference']) {
 			$currentFileInfo['reference'] = true;
 		}
 
@@ -432,23 +432,23 @@ 
 	 * @deprecated 1.5.1.2
 	 *
 	 */
-	public function SetCacheDir( $dir ){
+	public function SetCacheDir($dir) {
 
-		if( !file_exists($dir) ){
-			if( mkdir($dir) ){
+		if (!file_exists($dir)) {
+			if (mkdir($dir)) {
 				return true;
 			}
 			throw new Less_Exception_Parser('Less.php cache directory couldn\'t be created: '.$dir);
 
-		}elseif( !is_dir($dir) ){
+		}elseif (!is_dir($dir)) {
 			throw new Less_Exception_Parser('Less.php cache directory doesn\'t exist: '.$dir);
 
-		}elseif( !is_writable($dir) ){
+		}elseif (!is_writable($dir)) {
 			throw new Less_Exception_Parser('Less.php cache directory isn\'t writable: '.$dir);
 
-		}else{
+		}else {
 			$dir = self::WinPath($dir);
-			Less_Cache::$cache_dir = rtrim($dir,'/').'/';
+			Less_Cache::$cache_dir = rtrim($dir, '/').'/';
 			return true;
 		}
 	}
@@ -459,20 +459,20 @@ 
 	 *
 	 * @param array $dirs
 	 */
-	public function SetImportDirs( $dirs ){
+	public function SetImportDirs($dirs) {
 		Less_Parser::$options['import_dirs'] = array();
 
-		foreach($dirs as $path => $uri_root){
+		foreach ($dirs as $path => $uri_root) {
 
 			$path = self::WinPath($path);
-			if( !empty($path) ){
-				$path = rtrim($path,'/').'/';
+			if (!empty($path)) {
+				$path = rtrim($path, '/').'/';
 			}
 
-			if ( !is_callable($uri_root) ){
+			if (!is_callable($uri_root)) {
 				$uri_root = self::WinPath($uri_root);
-				if( !empty($uri_root) ){
-					$uri_root = rtrim($uri_root,'/').'/';
+				if (!empty($uri_root)) {
+					$uri_root = rtrim($uri_root, '/').'/';
 				}
 			}
 
@@ -483,8 +483,8 @@ 
 	/**
 	 * @param string $file_path
 	 */
-	private function _parse( $file_path = null ){
-		$this->rules = array_merge($this->rules, $this->GetRules( $file_path ));
+	private function _parse($file_path = null) {
+		$this->rules = array_merge($this->rules, $this->GetRules($file_path));
 	}
 
 
@@ -494,33 +494,33 @@ 
 	 *
 	 * @param string|null $file_path
 	 */
-	private function GetRules( $file_path ){
+	private function GetRules($file_path) {
 
 		$this->SetInput($file_path);
 
-		$cache_file = $this->CacheFile( $file_path );
-		if( $cache_file ){
-			if( Less_Parser::$options['cache_method'] == 'callback' ){
-				if( is_callable(Less_Parser::$options['cache_callback_get']) ){
+		$cache_file = $this->CacheFile($file_path);
+		if ($cache_file) {
+			if (Less_Parser::$options['cache_method']=='callback') {
+				if (is_callable(Less_Parser::$options['cache_callback_get'])) {
 					$cache = call_user_func_array(
 						Less_Parser::$options['cache_callback_get'],
 						array($this, $file_path, $cache_file)
 					);
 
-					if( $cache ){
+					if ($cache) {
 						$this->UnsetInput();
 						return $cache;
 					}
 				}
 
-			}elseif( file_exists($cache_file) ){
-				switch(Less_Parser::$options['cache_method']){
+			}elseif (file_exists($cache_file)) {
+				switch (Less_Parser::$options['cache_method']) {
 
 					// Using serialize
 					// Faster but uses more memory
 					case 'serialize':
 						$cache = unserialize(file_get_contents($cache_file));
-						if( $cache ){
+						if ($cache) {
 							touch($cache_file);
 							$this->UnsetInput();
 							return $cache;
@@ -539,7 +539,7 @@ 
 
 		$rules = $this->parsePrimary();
 
-		if( $this->pos < $this->input_len ){
+		if ($this->pos<$this->input_len) {
 			throw new Less_Exception_Chunk($this->input, null, $this->furthest, $this->env->currentFileInfo);
 		}
 
@@ -547,27 +547,27 @@ 
 
 
 		//save the cache
-		if( $cache_file ){
-			if( Less_Parser::$options['cache_method'] == 'callback' ){
-				if( is_callable(Less_Parser::$options['cache_callback_set']) ){
+		if ($cache_file) {
+			if (Less_Parser::$options['cache_method']=='callback') {
+				if (is_callable(Less_Parser::$options['cache_callback_set'])) {
 					call_user_func_array(
 						Less_Parser::$options['cache_callback_set'],
 						array($this, $file_path, $cache_file, $rules)
 					);
 				}
 
-			}else{
+			}else {
 				//msg('write cache file');
-				switch(Less_Parser::$options['cache_method']){
+				switch (Less_Parser::$options['cache_method']) {
 					case 'serialize':
-						file_put_contents( $cache_file, serialize($rules) );
+						file_put_contents($cache_file, serialize($rules));
 					break;
 					case 'php':
-						file_put_contents( $cache_file, '<?php return '.self::ArgString($rules).'; ?>' );
+						file_put_contents($cache_file, '<?php return '.self::ArgString($rules).'; ?>');
 					break;
 					case 'var_export':
 						//Requires __set_state()
-						file_put_contents( $cache_file, '<?php return '.var_export($rules,true).'; ?>' );
+						file_put_contents($cache_file, '<?php return '.var_export($rules, true).'; ?>');
 					break;
 				}
 
@@ -583,10 +583,10 @@ 
 	 * Set up the input buffer
 	 *
 	 */
-	public function SetInput( $file_path ){
+	public function SetInput($file_path) {
 
-		if( $file_path ){
-			$this->input = file_get_contents( $file_path );
+		if ($file_path) {
+			$this->input = file_get_contents($file_path);
 		}
 
 		$this->pos = $this->furthest = 0;
@@ -596,7 +596,7 @@ 
 		$this->input_len = strlen($this->input);
 
 
-		if( Less_Parser::$options['sourceMap'] && $this->env->currentFileInfo ){
+		if (Less_Parser::$options['sourceMap'] && $this->env->currentFileInfo) {
 			$uri = $this->env->currentFileInfo['currentUri'];
 			Less_Parser::$contentsMap[$uri] = $this->input;
 		}
@@ -608,44 +608,44 @@ 
 	 * Free up some memory
 	 *
 	 */
-	public function UnsetInput(){
+	public function UnsetInput() {
 		unset($this->input, $this->pos, $this->input_len, $this->furthest);
 		$this->saveStack = array();
 	}
 
 
-	public function CacheFile( $file_path ){
+	public function CacheFile($file_path) {
 
-		if( $file_path && $this->CacheEnabled() ){
+		if ($file_path && $this->CacheEnabled()) {
 
 			$env = get_object_vars($this->env);
 			unset($env['frames']);
 
 			$parts = array();
 			$parts[] = $file_path;
-			$parts[] = filesize( $file_path );
-			$parts[] = filemtime( $file_path );
+			$parts[] = filesize($file_path);
+			$parts[] = filemtime($file_path);
 			$parts[] = $env;
 			$parts[] = Less_Version::cache_version;
 			$parts[] = Less_Parser::$options['cache_method'];
-			return Less_Cache::$cache_dir . Less_Cache::$prefix . base_convert( sha1(json_encode($parts) ), 16, 36) . '.lesscache';
+			return Less_Cache::$cache_dir.Less_Cache::$prefix.base_convert(sha1(json_encode($parts)), 16, 36).'.lesscache';
 		}
 	}
 
 
-	static function AddParsedFile($file){
+	static function AddParsedFile($file) {
 		self::$imports[] = $file;
 	}
 
-	static function AllParsedFiles(){
+	static function AllParsedFiles() {
 		return self::$imports;
 	}
 
 	/**
 	 * @param string $file
 	 */
-	static function FileParsed($file){
-		return in_array($file,self::$imports);
+	static function FileParsed($file) {
+		return in_array($file, self::$imports);
 	}
 
 
@@ -657,13 +657,13 @@ 
 		$this->pos = array_pop($this->saveStack);
 	}
 
-	private function forget(){
+	private function forget() {
 		array_pop($this->saveStack);
 	}
 
 
 	private function isWhitespace($offset = 0) {
-		return preg_match('/\s/',$this->input[ $this->pos + $offset]);
+		return preg_match('/\s/', $this->input[$this->pos+$offset]);
 	}
 
 	/**
@@ -672,7 +672,7 @@ 
 	 * @param array $toks
 	 * @return array
 	 */
-	private function match($toks){
+	private function match($toks) {
 
 		// The match is confirmed, add the match length to `this::pos`,
 		// and consume any extra white-space characters (' ' || '\n')
@@ -680,27 +680,27 @@ 
 		// grammar is mostly white-space insensitive.
 		//
 
-		foreach($toks as $tok){
+		foreach ($toks as $tok) {
 
 			$char = $tok[0];
 
-			if( $char === '/' ){
+			if ($char==='/') {
 				$match = $this->MatchReg($tok);
 
-				if( $match ){
-					return count($match) === 1 ? $match[0] : $match;
+				if ($match) {
+					return count($match)===1 ? $match[0] : $match;
 				}
 
-			}elseif( $char === '#' ){
+			}elseif ($char==='#') {
 				$match = $this->MatchChar($tok[1]);
 
-			}else{
+			}else {
 				// Non-terminal, match using a function call
 				$match = $this->$tok();
 
 			}
 
-			if( $match ){
+			if ($match) {
 				return $match;
 			}
 		}
@@ -711,12 +711,12 @@ 
 	 *
 	 * @return string
 	 */
-	private function MatchFuncs($toks){
+	private function MatchFuncs($toks) {
 
-		if( $this->pos < $this->input_len ){
-			foreach($toks as $tok){
+		if ($this->pos<$this->input_len) {
+			foreach ($toks as $tok) {
 				$match = $this->$tok();
-				if( $match ){
+				if ($match) {
 					return $match;
 				}
 			}
@@ -725,17 +725,17 @@ 
 	}
 
 	// Match a single character in the input,
-	private function MatchChar($tok){
-		if( ($this->pos < $this->input_len) && ($this->input[$this->pos] === $tok) ){
+	private function MatchChar($tok) {
+		if (($this->pos<$this->input_len) && ($this->input[$this->pos]===$tok)) {
 			$this->skipWhitespace(1);
 			return $tok;
 		}
 	}
 
 	// Match a regexp from the current start point
-	private function MatchReg($tok){
+	private function MatchReg($tok) {
 
-		if( preg_match($tok, $this->input, $match, 0, $this->pos) ){
+		if (preg_match($tok, $this->input, $match, 0, $this->pos)) {
 			$this->skipWhitespace(strlen($match[0]));
 			return $match;
 		}
@@ -749,30 +749,30 @@ 
 	 * @param string $tok
 	 * @return integer
 	 */
-	public function PeekReg($tok){
+	public function PeekReg($tok) {
 		return preg_match($tok, $this->input, $match, 0, $this->pos);
 	}
 
 	/**
 	 * @param string $tok
 	 */
-	public function PeekChar($tok){
+	public function PeekChar($tok) {
 		//return ($this->input[$this->pos] === $tok );
-		return ($this->pos < $this->input_len) && ($this->input[$this->pos] === $tok );
+		return ($this->pos<$this->input_len) && ($this->input[$this->pos]===$tok);
 	}
 
 
 	/**
 	 * @param integer $length
 	 */
-	public function skipWhitespace($length){
+	public function skipWhitespace($length) {
 
 		$this->pos += $length;
 
-		for(; $this->pos < $this->input_len; $this->pos++ ){
+		for (; $this->pos<$this->input_len; $this->pos++) {
 			$c = $this->input[$this->pos];
 
-			if( ($c !== "\n") && ($c !== "\r") && ($c !== "\t") && ($c !== ' ') ){
+			if (($c!=="\n") && ($c!=="\r") && ($c!=="\t") && ($c!==' ')) {
 				break;
 			}
 		}
@@ -784,10 +784,10 @@ 
 	 * @param string|null $msg
 	 */
 	public function expect($tok, $msg = NULL) {
-		$result = $this->match( array($tok) );
+		$result = $this->match(array($tok));
 		if (!$result) {
-			$this->Error( $msg	? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
-		} else {
+			$this->Error($msg ? "Expected '".$tok."' got '".$this->input[$this->pos]."'" : $msg);
+		}else {
 			return $result;
 		}
 	}
@@ -795,11 +795,11 @@ 
 	/**
 	 * @param string $tok
 	 */
-	public function expectChar($tok, $msg = null ){
+	public function expectChar($tok, $msg = null) {
 		$result = $this->MatchChar($tok);
-		if( !$result ){
-			$this->Error( $msg ? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
-		}else{
+		if (!$result) {
+			$this->Error($msg ? "Expected '".$tok."' got '".$this->input[$this->pos]."'" : $msg);
+		}else {
 			return $result;
 		}
 	}
@@ -849,31 +849,31 @@ 
 	// Only at one point is the primary rule not called from the
 	// block rule: at the root level.
 	//
-	private function parsePrimary(){
+	private function parsePrimary() {
 		$root = array();
 
-		while( true ){
+		while (true) {
 
-			if( $this->pos >= $this->input_len ){
+			if ($this->pos>=$this->input_len) {
 				break;
 			}
 
 			$node = $this->parseExtend(true);
-			if( $node ){
-				$root = array_merge($root,$node);
+			if ($node) {
+				$root = array_merge($root, $node);
 				continue;
 			}
 
 			//$node = $this->MatchFuncs( array( 'parseMixinDefinition', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseDirective'));
-			$node = $this->MatchFuncs( array( 'parseMixinDefinition', 'parseNameValue', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseRulesetCall', 'parseDirective'));
+			$node = $this->MatchFuncs(array('parseMixinDefinition', 'parseNameValue', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseRulesetCall', 'parseDirective'));
 
-			if( $node ){
+			if ($node) {
 				$root[] = $node;
-			}elseif( !$this->MatchReg('/\\G[\s\n;]+/') ){
+			}elseif (!$this->MatchReg('/\\G[\s\n;]+/')) {
 				break;
 			}
 
-            if( $this->PeekChar('}') ){
+            if ($this->PeekChar('}')) {
 				break;
 			}
 		}
@@ -886,30 +886,30 @@ 
 	// We create a Comment node for CSS comments `/* */`,
 	// but keep the LeSS comments `//` silent, by just skipping
 	// over them.
-	private function parseComment(){
+	private function parseComment() {
 
-		if( $this->input[$this->pos] !== '/' ){
+		if ($this->input[$this->pos]!=='/') {
 			return;
 		}
 
-		if( $this->input[$this->pos+1] === '/' ){
+		if ($this->input[$this->pos+1]==='/') {
 			$match = $this->MatchReg('/\\G\/\/.*/');
-			return $this->NewObj4('Less_Tree_Comment',array($match[0], true, $this->pos, $this->env->currentFileInfo));
+			return $this->NewObj4('Less_Tree_Comment', array($match[0], true, $this->pos, $this->env->currentFileInfo));
 		}
 
 		//$comment = $this->MatchReg('/\\G\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/');
-		$comment = $this->MatchReg('/\\G\/\*(?s).*?\*+\/\n?/');//not the same as less.js to prevent fatal errors
-		if( $comment ){
-			return $this->NewObj4('Less_Tree_Comment',array($comment[0], false, $this->pos, $this->env->currentFileInfo));
+		$comment = $this->MatchReg('/\\G\/\*(?s).*?\*+\/\n?/'); //not the same as less.js to prevent fatal errors
+		if ($comment) {
+			return $this->NewObj4('Less_Tree_Comment', array($comment[0], false, $this->pos, $this->env->currentFileInfo));
 		}
 	}
 
-	private function parseComments(){
+	private function parseComments() {
 		$comments = array();
 
-		while( $this->pos < $this->input_len ){
+		while ($this->pos<$this->input_len) {
 			$comment = $this->parseComment();
-			if( !$comment ){
+			if (!$comment) {
 				break;
 			}
 
@@ -931,12 +931,12 @@ 
 		$e = false;
 		$index = $this->pos;
 
-		if( $this->input[$this->pos] === '~' ){
+		if ($this->input[$this->pos]==='~') {
 			$j++;
 			$e = true; // Escaped strings
 		}
 
-		if( $this->input[$j] != '"' && $this->input[$j] !== "'" ){
+		if ($this->input[$j]!='"' && $this->input[$j]!=="'") {
 			return;
 		}
 
@@ -948,9 +948,9 @@ 
                 //$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.)*)"|\'((?:[^\'\\\\\r\n]|\\\\.)*)\'/');
 		$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)"|\'((?:[^\'\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)\'/');
 
-		if( $str ){
-			$result = $str[0][0] == '"' ? $str[1] : $str[2];
-			return $this->NewObj5('Less_Tree_Quoted',array($str[0], $result, $e, $index, $this->env->currentFileInfo) );
+		if ($str) {
+			$result = $str[0][0]=='"' ? $str[1] : $str[2];
+			return $this->NewObj5('Less_Tree_Quoted', array($str[0], $result, $e, $index, $this->env->currentFileInfo));
 		}
 		return;
 	}
@@ -961,31 +961,31 @@ 
 	//
 	//	 black border-collapse
 	//
-	private function parseEntitiesKeyword(){
+	private function parseEntitiesKeyword() {
 
 		//$k = $this->MatchReg('/\\G[_A-Za-z-][_A-Za-z0-9-]*/');
 		$k = $this->MatchReg('/\\G%|\\G[_A-Za-z-][_A-Za-z0-9-]*/');
-		if( $k ){
+		if ($k) {
 			$k = $k[0];
 			$color = $this->fromKeyword($k);
-			if( $color ){
+			if ($color) {
 				return $color;
 			}
-			return $this->NewObj1('Less_Tree_Keyword',$k);
+			return $this->NewObj1('Less_Tree_Keyword', $k);
 		}
 	}
 
 	// duplicate of Less_Tree_Color::FromKeyword
-	private function FromKeyword( $keyword ){
+	private function FromKeyword($keyword) {
 		$keyword = strtolower($keyword);
 
-		if( Less_Colors::hasOwnProperty($keyword) ){
+		if (Less_Colors::hasOwnProperty($keyword)) {
 			// detect named color
-			return $this->NewObj1('Less_Tree_Color',substr(Less_Colors::color($keyword), 1));
+			return $this->NewObj1('Less_Tree_Color', substr(Less_Colors::color($keyword), 1));
 		}
 
-		if( $keyword === 'transparent' ){
-			return $this->NewObj3('Less_Tree_Color', array( array(0, 0, 0), 0, true));
+		if ($keyword==='transparent') {
+			return $this->NewObj3('Less_Tree_Color', array(array(0, 0, 0), 0, true));
 		}
 	}
 
@@ -999,24 +999,24 @@ 
 	//
 	// The arguments are parsed with the `entities.arguments` parser.
 	//
-	private function parseEntitiesCall(){
+	private function parseEntitiesCall() {
 		$index = $this->pos;
 
-		if( !preg_match('/\\G([\w-]+|%|progid:[\w\.]+)\(/', $this->input, $name,0,$this->pos) ){
+		if (!preg_match('/\\G([\w-]+|%|progid:[\w\.]+)\(/', $this->input, $name, 0, $this->pos)) {
 			return;
 		}
 		$name = $name[1];
 		$nameLC = strtolower($name);
 
-		if ($nameLC === 'url') {
+		if ($nameLC==='url') {
 			return null;
 		}
 
 		$this->pos += strlen($name);
 
-		if( $nameLC === 'alpha' ){
+		if ($nameLC==='alpha') {
 			$alpha_ret = $this->parseAlpha();
-			if( $alpha_ret ){
+			if ($alpha_ret) {
 				return $alpha_ret;
 			}
 		}
@@ -1025,12 +1025,12 @@ 
 
 		$args = $this->parseEntitiesArguments();
 
-		if( !$this->MatchChar(')') ){
+		if (!$this->MatchChar(')')) {
 			return;
 		}
 
 		if ($name) {
-			return $this->NewObj4('Less_Tree_Call',array($name, $args, $index, $this->env->currentFileInfo) );
+			return $this->NewObj4('Less_Tree_Call', array($name, $args, $index, $this->env->currentFileInfo));
 		}
 	}
 
@@ -1039,25 +1039,25 @@ 
 	 *
 	 * @return array
 	 */
-	private function parseEntitiesArguments(){
+	private function parseEntitiesArguments() {
 
 		$args = array();
-		while( true ){
-			$arg = $this->MatchFuncs( array('parseEntitiesAssignment','parseExpression') );
-			if( !$arg ){
+		while (true) {
+			$arg = $this->MatchFuncs(array('parseEntitiesAssignment', 'parseExpression'));
+			if (!$arg) {
 				break;
 			}
 
 			$args[] = $arg;
-			if( !$this->MatchChar(',') ){
+			if (!$this->MatchChar(',')) {
 				break;
 			}
 		}
 		return $args;
 	}
 
-	private function parseEntitiesLiteral(){
-		return $this->MatchFuncs( array('parseEntitiesDimension','parseEntitiesColor','parseEntitiesQuoted','parseUnicodeDescriptor') );
+	private function parseEntitiesLiteral() {
+		return $this->MatchFuncs(array('parseEntitiesDimension', 'parseEntitiesColor', 'parseEntitiesQuoted', 'parseUnicodeDescriptor'));
 	}
 
 	// Assignments are argument entities for calls.
@@ -1068,17 +1068,17 @@ 
 	private function parseEntitiesAssignment() {
 
 		$key = $this->MatchReg('/\\G\w+(?=\s?=)/');
-		if( !$key ){
+		if (!$key) {
 			return;
 		}
 
-		if( !$this->MatchChar('=') ){
+		if (!$this->MatchChar('=')) {
 			return;
 		}
 
 		$value = $this->parseEntity();
-		if( $value ){
-			return $this->NewObj2('Less_Tree_Assignment',array($key[0], $value));
+		if ($value) {
+			return $this->NewObj2('Less_Tree_Assignment', array($key[0], $value));
 		}
 	}
 
@@ -1089,15 +1089,15 @@ 
 	// standard function calls. The difference is that the argument doesn't have
 	// to be enclosed within a string, so it can't be parsed as an Expression.
 	//
-	private function parseEntitiesUrl(){
+	private function parseEntitiesUrl() {
 
 
-		if( $this->input[$this->pos] !== 'u' || !$this->matchReg('/\\Gurl\(/') ){
+		if ($this->input[$this->pos]!=='u' || !$this->matchReg('/\\Gurl\(/')) {
 			return;
 		}
 
-		$value = $this->match( array('parseEntitiesQuoted','parseEntitiesVariable','/\\Gdata\:.*?[^\)]+/','/\\G(?:(?:\\\\[\(\)\'"])|[^\(\)\'"])+/') );
-		if( !$value ){
+		$value = $this->match(array('parseEntitiesQuoted', 'parseEntitiesVariable', '/\\Gdata\:.*?[^\)]+/', '/\\G(?:(?:\\\\[\(\)\'"])|[^\(\)\'"])+/'));
+		if (!$value) {
 			$value = '';
 		}
 
@@ -1105,11 +1105,11 @@ 
 		$this->expectChar(')');
 
 
-		if( isset($value->value) || $value instanceof Less_Tree_Variable ){
-			return $this->NewObj2('Less_Tree_Url',array($value, $this->env->currentFileInfo));
+		if (isset($value->value) || $value instanceof Less_Tree_Variable) {
+			return $this->NewObj2('Less_Tree_Url', array($value, $this->env->currentFileInfo));
 		}
 
-		return $this->NewObj2('Less_Tree_Url', array( $this->NewObj1('Less_Tree_Anonymous',$value), $this->env->currentFileInfo) );
+		return $this->NewObj2('Less_Tree_Url', array($this->NewObj1('Less_Tree_Anonymous', $value), $this->env->currentFileInfo));
 	}
 
 
@@ -1121,10 +1121,10 @@ 
 	// We use a different parser for variable definitions,
 	// see `parsers.variable`.
 	//
-	private function parseEntitiesVariable(){
+	private function parseEntitiesVariable() {
 		$index = $this->pos;
 		if ($this->PeekChar('@') && ($name = $this->MatchReg('/\\G@@?[\w-]+/'))) {
-			return $this->NewObj3('Less_Tree_Variable', array( $name[0], $index, $this->env->currentFileInfo));
+			return $this->NewObj3('Less_Tree_Variable', array($name[0], $index, $this->env->currentFileInfo));
 		}
 	}
 
@@ -1133,8 +1133,8 @@ 
 	private function parseEntitiesVariableCurly() {
 		$index = $this->pos;
 
-		if( $this->input_len > ($this->pos+1) && $this->input[$this->pos] === '@' && ($curly = $this->MatchReg('/\\G@\{([\w-]+)\}/')) ){
-			return $this->NewObj3('Less_Tree_Variable',array('@'.$curly[1], $index, $this->env->currentFileInfo));
+		if ($this->input_len>($this->pos+1) && $this->input[$this->pos]==='@' && ($curly = $this->MatchReg('/\\G@\{([\w-]+)\}/'))) {
+			return $this->NewObj3('Less_Tree_Variable', array('@'.$curly[1], $index, $this->env->currentFileInfo));
 		}
 	}
 
@@ -1145,9 +1145,9 @@ 
 	//
 	// `rgb` and `hsl` colors are parsed through the `entities.call` parser.
 	//
-	private function parseEntitiesColor(){
+	private function parseEntitiesColor() {
 		if ($this->PeekChar('#') && ($rgb = $this->MatchReg('/\\G#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/'))) {
-			return $this->NewObj1('Less_Tree_Color',$rgb[1]);
+			return $this->NewObj1('Less_Tree_Color', $rgb[1]);
 		}
 	}
 
@@ -1156,22 +1156,22 @@ 
 	//
 	//	 0.5em 95%
 	//
-	private function parseEntitiesDimension(){
+	private function parseEntitiesDimension() {
 
 		$c = @ord($this->input[$this->pos]);
 
 		//Is the first char of the dimension 0-9, '.', '+' or '-'
-		if (($c > 57 || $c < 43) || $c === 47 || $c == 44){
+		if (($c>57 || $c<43) || $c===47 || $c==44) {
 			return;
 		}
 
 		$value = $this->MatchReg('/\\G([+-]?\d*\.?\d+)(%|[a-z]+)?/');
-		if( $value ){
+		if ($value) {
 
-			if( isset($value[2]) ){
-				return $this->NewObj2('Less_Tree_Dimension', array($value[1],$value[2]));
+			if (isset($value[2])) {
+				return $this->NewObj2('Less_Tree_Dimension', array($value[1], $value[2]));
 			}
-			return $this->NewObj1('Less_Tree_Dimension',$value[1]);
+			return $this->NewObj1('Less_Tree_Dimension', $value[1]);
 		}
 	}
 
@@ -1183,7 +1183,7 @@ 
 	//
 	function parseUnicodeDescriptor() {
 		$ud = $this->MatchReg('/\\G(U\+[0-9a-fA-F?]+)(\-[0-9a-fA-F?]+)?/');
-		if( $ud ){
+		if ($ud) {
 			return $this->NewObj1('Less_Tree_UnicodeDescriptor', $ud[0]);
 		}
 	}
@@ -1194,21 +1194,21 @@ 
 	//
 	//	 `window.location.href`
 	//
-	private function parseEntitiesJavascript(){
+	private function parseEntitiesJavascript() {
 		$e = false;
 		$j = $this->pos;
-		if( $this->input[$j] === '~' ){
+		if ($this->input[$j]==='~') {
 			$j++;
 			$e = true;
 		}
-		if( $this->input[$j] !== '`' ){
+		if ($this->input[$j]!=='`') {
 			return;
 		}
-		if( $e ){
+		if ($e) {
 			$this->MatchChar('~');
 		}
 		$str = $this->MatchReg('/\\G`([^`]*)`/');
-		if( $str ){
+		if ($str) {
 			return $this->NewObj3('Less_Tree_Javascript', array($str[1], $this->pos, $e));
 		}
 	}
@@ -1219,7 +1219,7 @@ 
 	//
 	//	 @fink:
 	//
-	private function parseVariable(){
+	private function parseVariable() {
 		if ($this->PeekChar('@') && ($name = $this->MatchReg('/\\G(@[\w-]+)\s*:/'))) {
 			return $name[1];
 		}
@@ -1231,10 +1231,10 @@ 
 	//
 	// @fink();
 	//
-	private function parseRulesetCall(){
+	private function parseRulesetCall() {
 
-		if( $this->input[$this->pos] === '@' && ($name = $this->MatchReg('/\\G(@[\w-]+)\s*\(\s*\)\s*;/')) ){
-			return $this->NewObj1('Less_Tree_RulesetCall', $name[1] );
+		if ($this->input[$this->pos]==='@' && ($name = $this->MatchReg('/\\G(@[\w-]+)\s*\(\s*\)\s*;/'))) {
+			return $this->NewObj1('Less_Tree_RulesetCall', $name[1]);
 		}
 	}
 
@@ -1242,36 +1242,36 @@ 
 	//
 	// extend syntax - used to extend selectors
 	//
-	function parseExtend($isRule = false){
+	function parseExtend($isRule = false) {
 
 		$index = $this->pos;
 		$extendList = array();
 
 
-		if( !$this->MatchReg( $isRule ? '/\\G&:extend\(/' : '/\\G:extend\(/' ) ){ return; }
+		if (!$this->MatchReg($isRule ? '/\\G&:extend\(/' : '/\\G:extend\(/')) { return; }
 
-		do{
+		do {
 			$option = null;
 			$elements = array();
-			while( true ){
+			while (true) {
 				$option = $this->MatchReg('/\\G(all)(?=\s*(\)|,))/');
-				if( $option ){ break; }
+				if ($option) { break; }
 				$e = $this->parseElement();
-				if( !$e ){ break; }
+				if (!$e) { break; }
 				$elements[] = $e;
 			}
 
-			if( $option ){
+			if ($option) {
 				$option = $option[1];
 			}
 
-			$extendList[] = $this->NewObj3('Less_Tree_Extend', array( $this->NewObj1('Less_Tree_Selector',$elements), $option, $index ));
+			$extendList[] = $this->NewObj3('Less_Tree_Extend', array($this->NewObj1('Less_Tree_Selector', $elements), $option, $index));
 
-		}while( $this->MatchChar(",") );
+		} while ($this->MatchChar(","));
 
 		$this->expect('/\\G\)/');
 
-		if( $isRule ){
+		if ($isRule) {
 			$this->expect('/\\G;/');
 		}
 
@@ -1290,10 +1290,10 @@ 
 	// namespaced, but we only support the child and descendant
 	// selector for now.
 	//
-	private function parseMixinCall(){
+	private function parseMixinCall() {
 
 		$char = $this->input[$this->pos];
-		if( $char !== '.' && $char !== '#' ){
+		if ($char!=='.' && $char!=='#') {
 			return;
 		}
 
@@ -1302,21 +1302,21 @@ 
 
 		$elements = $this->parseMixinCallElements();
 
-		if( $elements ){
+		if ($elements) {
 
-			if( $this->MatchChar('(') ){
+			if ($this->MatchChar('(')) {
 				$returned = $this->parseMixinArgs(true);
 				$args = $returned['args'];
 				$this->expectChar(')');
-			}else{
+			}else {
 				$args = array();
 			}
 
 			$important = $this->parseImportant();
 
-			if( $this->parseEnd() ){
+			if ($this->parseEnd()) {
 				$this->forget();
-				return $this->NewObj5('Less_Tree_Mixin_Call', array( $elements, $args, $index, $this->env->currentFileInfo, $important));
+				return $this->NewObj5('Less_Tree_Mixin_Call', array($elements, $args, $index, $this->env->currentFileInfo, $important));
 			}
 		}
 
@@ -1324,14 +1324,14 @@ 
 	}
 
 
-	private function parseMixinCallElements(){
+	private function parseMixinCallElements() {
 		$elements = array();
 		$c = null;
 
-		while( true ){
+		while (true) {
 			$elemIndex = $this->pos;
 			$e = $this->MatchReg('/\\G[#.](?:[\w-]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/');
-			if( !$e ){
+			if (!$e) {
 				break;
 			}
 			$elements[] = $this->NewObj4('Less_Tree_Element', array($c, $e[0], $elemIndex, $this->env->currentFileInfo));
@@ -1346,7 +1346,7 @@ 
 	/**
 	 * @param boolean $isCall
 	 */
-	private function parseMixinArgs( $isCall ){
+	private function parseMixinArgs($isCall) {
 		$expressions = array();
 		$argsSemiColon = array();
 		$isSemiColonSeperated = null;
@@ -1357,54 +1357,54 @@ 
 
 		$this->save();
 
-		while( true ){
-			if( $isCall ){
-				$arg = $this->MatchFuncs( array( 'parseDetachedRuleset','parseExpression' ) );
-			} else {
+		while (true) {
+			if ($isCall) {
+				$arg = $this->MatchFuncs(array('parseDetachedRuleset', 'parseExpression'));
+			}else {
 				$this->parseComments();
-				if( $this->input[ $this->pos ] === '.' && $this->MatchReg('/\\G\.{3}/') ){
+				if ($this->input[$this->pos]==='.' && $this->MatchReg('/\\G\.{3}/')) {
 					$returner['variadic'] = true;
-					if( $this->MatchChar(";") && !$isSemiColonSeperated ){
+					if ($this->MatchChar(";") && !$isSemiColonSeperated) {
 						$isSemiColonSeperated = true;
 					}
 
-					if( $isSemiColonSeperated ){
+					if ($isSemiColonSeperated) {
 						$argsSemiColon[] = array('variadic'=>true);
-					}else{
+					}else {
 						$argsComma[] = array('variadic'=>true);
 					}
 					break;
 				}
-				$arg = $this->MatchFuncs( array('parseEntitiesVariable','parseEntitiesLiteral','parseEntitiesKeyword') );
+				$arg = $this->MatchFuncs(array('parseEntitiesVariable', 'parseEntitiesLiteral', 'parseEntitiesKeyword'));
 			}
 
-			if( !$arg ){
+			if (!$arg) {
 				break;
 			}
 
 
 			$nameLoop = null;
-			if( $arg instanceof Less_Tree_Expression ){
+			if ($arg instanceof Less_Tree_Expression) {
 				$arg->throwAwayComments();
 			}
 			$value = $arg;
 			$val = null;
 
-			if( $isCall ){
+			if ($isCall) {
 				// Variable
-				if( property_exists($arg,'value') && count($arg->value) == 1 ){
+				if (property_exists($arg, 'value') && count($arg->value)==1) {
 					$val = $arg->value[0];
 				}
-			} else {
+			}else {
 				$val = $arg;
 			}
 
 
-			if( $val instanceof Less_Tree_Variable ){
+			if ($val instanceof Less_Tree_Variable) {
 
-				if( $this->MatchChar(':') ){
-					if( $expressions ){
-						if( $isSemiColonSeperated ){
+				if ($this->MatchChar(':')) {
+					if ($expressions) {
+						if ($isSemiColonSeperated) {
 							$this->Error('Cannot mix ; and , as delimiter types');
 						}
 						$expressionContainsNamed = true;
@@ -1414,17 +1414,17 @@ 
 					// However if we do want to add it, there is nothing blocking it, just don't error
 					// and remove isCall dependency below
 					$value = null;
-					if( $isCall ){
+					if ($isCall) {
 						$value = $this->parseDetachedRuleset();
 					}
-					if( !$value ){
+					if (!$value) {
 						$value = $this->parseExpression();
 					}
 
-					if( !$value ){
-						if( $isCall ){
+					if (!$value) {
+						if ($isCall) {
 							$this->Error('could not understand value for named argument');
-						} else {
+						}else {
 							$this->restore();
 							$returner['args'] = array();
 							return $returner;
@@ -1432,45 +1432,45 @@ 
 					}
 
 					$nameLoop = ($name = $val->name);
-				}elseif( !$isCall && $this->MatchReg('/\\G\.{3}/') ){
+				}elseif (!$isCall && $this->MatchReg('/\\G\.{3}/')) {
 					$returner['variadic'] = true;
-					if( $this->MatchChar(";") && !$isSemiColonSeperated ){
+					if ($this->MatchChar(";") && !$isSemiColonSeperated) {
 						$isSemiColonSeperated = true;
 					}
-					if( $isSemiColonSeperated ){
+					if ($isSemiColonSeperated) {
 						$argsSemiColon[] = array('name'=> $arg->name, 'variadic' => true);
-					}else{
+					}else {
 						$argsComma[] = array('name'=> $arg->name, 'variadic' => true);
 					}
 					break;
-				}elseif( !$isCall ){
+				}elseif (!$isCall) {
 					$name = $nameLoop = $val->name;
 					$value = null;
 				}
 			}
 
-			if( $value ){
+			if ($value) {
 				$expressions[] = $value;
 			}
 
-			$argsComma[] = array('name'=>$nameLoop, 'value'=>$value );
+			$argsComma[] = array('name'=>$nameLoop, 'value'=>$value);
 
-			if( $this->MatchChar(',') ){
+			if ($this->MatchChar(',')) {
 				continue;
 			}
 
-			if( $this->MatchChar(';') || $isSemiColonSeperated ){
+			if ($this->MatchChar(';') || $isSemiColonSeperated) {
 
-				if( $expressionContainsNamed ){
+				if ($expressionContainsNamed) {
 					$this->Error('Cannot mix ; and , as delimiter types');
 				}
 
 				$isSemiColonSeperated = true;
 
-				if( count($expressions) > 1 ){
+				if (count($expressions)>1) {
 					$value = $this->NewObj1('Less_Tree_Value', $expressions);
 				}
-				$argsSemiColon[] = array('name'=>$name, 'value'=>$value );
+				$argsSemiColon[] = array('name'=>$name, 'value'=>$value);
 
 				$name = null;
 				$expressions = array();
@@ -1504,21 +1504,21 @@ 
 	// Once we've got our params list, and a closing `)`, we parse
 	// the `{...}` block.
 	//
-	private function parseMixinDefinition(){
+	private function parseMixinDefinition() {
 		$cond = null;
 
 		$char = $this->input[$this->pos];
-		if( ($char !== '.' && $char !== '#') || ($char === '{' && $this->PeekReg('/\\G[^{]*\}/')) ){
+		if (($char!=='.' && $char!=='#') || ($char==='{' && $this->PeekReg('/\\G[^{]*\}/'))) {
 			return;
 		}
 
 		$this->save();
 
 		$match = $this->MatchReg('/\\G([#.](?:[\w-]|\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+)\s*\(/');
-		if( $match ){
+		if ($match) {
 			$name = $match[1];
 
-			$argInfo = $this->parseMixinArgs( false );
+			$argInfo = $this->parseMixinArgs(false);
 			$params = $argInfo['args'];
 			$variadic = $argInfo['variadic'];
 
@@ -1528,7 +1528,7 @@ 
 			// also
 			// .mixincall(@a: {rule: set;});
 			// so we have to be nice and restore
-			if( !$this->MatchChar(')') ){
+			if (!$this->MatchChar(')')) {
 				$this->furthest = $this->pos;
 				$this->restore();
 				return;
@@ -1543,13 +1543,13 @@ 
 
 			$ruleset = $this->parseBlock();
 
-			if( is_array($ruleset) ){
+			if (is_array($ruleset)) {
 				$this->forget();
-				return $this->NewObj5('Less_Tree_Mixin_Definition', array( $name, $params, $ruleset, $cond, $variadic));
+				return $this->NewObj5('Less_Tree_Mixin_Definition', array($name, $params, $ruleset, $cond, $variadic));
 			}
 
 			$this->restore();
-		}else{
+		}else {
 			$this->forget();
 		}
 	}
@@ -1558,9 +1558,9 @@ 
 	// Entities are the smallest recognized token,
 	// and can be found inside a rule's value.
 	//
-	private function parseEntity(){
+	private function parseEntity() {
 
-		return $this->MatchFuncs( array('parseEntitiesLiteral','parseEntitiesVariable','parseEntitiesUrl','parseEntitiesCall','parseEntitiesKeyword','parseEntitiesJavascript','parseComment') );
+		return $this->MatchFuncs(array('parseEntitiesLiteral', 'parseEntitiesVariable', 'parseEntitiesUrl', 'parseEntitiesCall', 'parseEntitiesKeyword', 'parseEntitiesJavascript', 'parseComment'));
 	}
 
 	//
@@ -1568,7 +1568,7 @@ 
 	// because the `block` rule will be expecting it, but we still need to make sure
 	// it's there, if ';' was omitted.
 	//
-	private function parseEnd(){
+	private function parseEnd() {
 		return $this->MatchChar(';') || $this->PeekChar('}');
 	}
 
@@ -1577,24 +1577,24 @@ 
 	//
 	//	 alpha(opacity=88)
 	//
-	private function parseAlpha(){
+	private function parseAlpha() {
 
-		if ( ! $this->MatchReg('/\\G\(opacity=/i')) {
+		if (!$this->MatchReg('/\\G\(opacity=/i')) {
 			return;
 		}
 
 		$value = $this->MatchReg('/\\G[0-9]+/');
-		if( $value ){
+		if ($value) {
 			$value = $value[0];
-		}else{
+		}else {
 			$value = $this->parseEntitiesVariable();
-			if( !$value ){
+			if (!$value) {
 				return;
 			}
 		}
 
 		$this->expectChar(')');
-		return $this->NewObj1('Less_Tree_Alpha',$value);
+		return $this->NewObj1('Less_Tree_Alpha', $value);
 	}
 
 
@@ -1610,29 +1610,29 @@ 
 	// they are made out of a `Combinator` (see combinator rule),
 	// and an element name, such as a tag a class, or `*`.
 	//
-	private function parseElement(){
+	private function parseElement() {
 		$c = $this->parseCombinator();
 		$index = $this->pos;
 
-		$e = $this->match( array('/\\G(?:\d+\.\d+|\d+)%/', '/\\G(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/',
-			'#*', '#&', 'parseAttribute', '/\\G\([^()@]+\)/', '/\\G[\.#](?=@)/', 'parseEntitiesVariableCurly') );
+		$e = $this->match(array('/\\G(?:\d+\.\d+|\d+)%/', '/\\G(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/',
+			'#*', '#&', 'parseAttribute', '/\\G\([^()@]+\)/', '/\\G[\.#](?=@)/', 'parseEntitiesVariableCurly'));
 
-		if( is_null($e) ){
+		if (is_null($e)) {
 			$this->save();
-			if( $this->MatchChar('(') ){
-				if( ($v = $this->parseSelector()) && $this->MatchChar(')') ){
-					$e = $this->NewObj1('Less_Tree_Paren',$v);
+			if ($this->MatchChar('(')) {
+				if (($v = $this->parseSelector()) && $this->MatchChar(')')) {
+					$e = $this->NewObj1('Less_Tree_Paren', $v);
 					$this->forget();
-				}else{
+				}else {
 					$this->restore();
 				}
-			}else{
+			}else {
 				$this->forget();
 			}
 		}
 
-		if( !is_null($e) ){
-			return $this->NewObj4('Less_Tree_Element',array( $c, $e, $index, $this->env->currentFileInfo));
+		if (!is_null($e)) {
+			return $this->NewObj4('Less_Tree_Element', array($c, $e, $index, $this->env->currentFileInfo));
 		}
 	}
 
@@ -1644,13 +1644,13 @@ 
 	// as it's an empty space. We have to check the previous character
 	// in the input, to see if it's a ` ` character.
 	//
-	private function parseCombinator(){
-		if( $this->pos < $this->input_len ){
+	private function parseCombinator() {
+		if ($this->pos<$this->input_len) {
 			$c = $this->input[$this->pos];
-			if ($c === '>' || $c === '+' || $c === '~' || $c === '|' || $c === '^' ){
+			if ($c==='>' || $c==='+' || $c==='~' || $c==='|' || $c==='^') {
 
 				$this->pos++;
-				if( $this->input[$this->pos] === '^' ){
+				if ($this->input[$this->pos]==='^') {
 					$c = '^^';
 					$this->pos++;
 				}
@@ -1660,7 +1660,7 @@ 
 				return $c;
 			}
 
-			if( $this->pos > 0 && $this->isWhitespace(-1) ){
+			if ($this->pos>0 && $this->isWhitespace(-1)) {
 				return ' ';
 			}
 		}
@@ -1670,7 +1670,7 @@ 
 	// A CSS selector (see selector below)
 	// with less extensions e.g. the ability to extend and guard
 	//
-	private function parseLessSelector(){
+	private function parseLessSelector() {
 		return $this->parseSelector(true);
 	}
 
@@ -1682,7 +1682,7 @@ 
 	//
 	// Selectors are made out of one or more Elements, see above.
 	//
-	private function parseSelector( $isLess = false ){
+	private function parseSelector($isLess = false) {
 		$elements = array();
 		$extendList = array();
 		$condition = null;
@@ -1692,127 +1692,127 @@ 
 		$c = null;
 		$index = $this->pos;
 
-		while( ($isLess && ($extend = $this->parseExtend())) || ($isLess && ($when = $this->MatchReg('/\\Gwhen/') )) || ($e = $this->parseElement()) ){
-			if( $when ){
+		while (($isLess && ($extend = $this->parseExtend())) || ($isLess && ($when = $this->MatchReg('/\\Gwhen/'))) || ($e = $this->parseElement())) {
+			if ($when) {
 				$condition = $this->expect('parseConditions', 'expected condition');
-			}elseif( $condition ){
+			}elseif ($condition) {
 				//error("CSS guard can only be used at the end of selector");
-			}elseif( $extend ){
-				$extendList = array_merge($extendList,$extend);
-			}else{
+			}elseif ($extend) {
+				$extendList = array_merge($extendList, $extend);
+			}else {
 				//if( count($extendList) ){
 					//error("Extend can only be used at the end of selector");
 				//}
-				if( $this->pos < $this->input_len ){
-					$c = $this->input[ $this->pos ];
+				if ($this->pos<$this->input_len) {
+					$c = $this->input[$this->pos];
 				}
 				$elements[] = $e;
 				$e = null;
 			}
 
-			if( $c === '{' || $c === '}' || $c === ';' || $c === ',' || $c === ')') { break; }
+			if ($c==='{' || $c==='}' || $c===';' || $c===',' || $c===')') { break; }
 		}
 
-		if( $elements ){
-			return $this->NewObj5('Less_Tree_Selector',array($elements, $extendList, $condition, $index, $this->env->currentFileInfo));
+		if ($elements) {
+			return $this->NewObj5('Less_Tree_Selector', array($elements, $extendList, $condition, $index, $this->env->currentFileInfo));
 		}
-		if( $extendList ) {
+		if ($extendList) {
 			$this->Error('Extend must be used to extend a selector, it cannot be used on its own');
 		}
 	}
 
-	private function parseTag(){
-		return ( $tag = $this->MatchReg('/\\G[A-Za-z][A-Za-z-]*[0-9]?/') ) ? $tag : $this->MatchChar('*');
+	private function parseTag() {
+		return ($tag = $this->MatchReg('/\\G[A-Za-z][A-Za-z-]*[0-9]?/')) ? $tag : $this->MatchChar('*');
 	}
 
-	private function parseAttribute(){
+	private function parseAttribute() {
 
 		$val = null;
 
-		if( !$this->MatchChar('[') ){
+		if (!$this->MatchChar('[')) {
 			return;
 		}
 
 		$key = $this->parseEntitiesVariableCurly();
-		if( !$key ){
+		if (!$key) {
 			$key = $this->expect('/\\G(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\\\.)+/');
 		}
 
 		$op = $this->MatchReg('/\\G[|~*$^]?=/');
-		if( $op ){
-			$val = $this->match( array('parseEntitiesQuoted','/\\G[0-9]+%/','/\\G[\w-]+/','parseEntitiesVariableCurly') );
+		if ($op) {
+			$val = $this->match(array('parseEntitiesQuoted', '/\\G[0-9]+%/', '/\\G[\w-]+/', 'parseEntitiesVariableCurly'));
 		}
 
 		$this->expectChar(']');
 
-		return $this->NewObj3('Less_Tree_Attribute',array( $key, $op[0], $val));
+		return $this->NewObj3('Less_Tree_Attribute', array($key, $op[0], $val));
 	}
 
 	//
 	// The `block` rule is used by `ruleset` and `mixin.definition`.
 	// It's a wrapper around the `primary` rule, with added `{}`.
 	//
-	private function parseBlock(){
-		if( $this->MatchChar('{') ){
+	private function parseBlock() {
+		if ($this->MatchChar('{')) {
 			$content = $this->parsePrimary();
-			if( $this->MatchChar('}') ){
+			if ($this->MatchChar('}')) {
 				return $content;
 			}
 		}
 	}
 
-	private function parseBlockRuleset(){
+	private function parseBlockRuleset() {
 		$block = $this->parseBlock();
 
-		if( $block ){
-			$block = $this->NewObj2('Less_Tree_Ruleset',array( null, $block));
+		if ($block) {
+			$block = $this->NewObj2('Less_Tree_Ruleset', array(null, $block));
 		}
 
 		return $block;
 	}
 
-	private function parseDetachedRuleset(){
+	private function parseDetachedRuleset() {
 		$blockRuleset = $this->parseBlockRuleset();
-		if( $blockRuleset ){
-			return $this->NewObj1('Less_Tree_DetachedRuleset',$blockRuleset);
+		if ($blockRuleset) {
+			return $this->NewObj1('Less_Tree_DetachedRuleset', $blockRuleset);
 		}
 	}
 
 	//
 	// div, .class, body > p {...}
 	//
-	private function parseRuleset(){
+	private function parseRuleset() {
 		$selectors = array();
 
 		$this->save();
 
-		while( true ){
+		while (true) {
 			$s = $this->parseLessSelector();
-			if( !$s ){
+			if (!$s) {
 				break;
 			}
 			$selectors[] = $s;
 			$this->parseComments();
 
-			if( $s->condition && count($selectors) > 1 ){
+			if ($s->condition && count($selectors)>1) {
 				$this->Error('Guards are only currently allowed on a single selector.');
 			}
 
-			if( !$this->MatchChar(',') ){
+			if (!$this->MatchChar(',')) {
 				break;
 			}
-			if( $s->condition ){
+			if ($s->condition) {
 				$this->Error('Guards are only currently allowed on a single selector.');
 			}
 			$this->parseComments();
 		}
 
 
-		if( $selectors ){
+		if ($selectors) {
 			$rules = $this->parseBlock();
-			if( is_array($rules) ){
+			if (is_array($rules)) {
 				$this->forget();
-				return $this->NewObj2('Less_Tree_Ruleset',array( $selectors, $rules)); //Less_Environment::$strictImports
+				return $this->NewObj2('Less_Tree_Ruleset', array($selectors, $rules)); //Less_Environment::$strictImports
 			}
 		}
 
@@ -1826,7 +1826,7 @@ 
 	 * ex: width:100px;
 	 *
 	 */
-	private function parseNameValue(){
+	private function parseNameValue() {
 
 		$index = $this->pos;
 		$this->save();
@@ -1834,55 +1834,55 @@ 
 
 		//$match = $this->MatchReg('/\\G([a-zA-Z\-]+)\s*:\s*((?:\'")?[a-zA-Z0-9\-% \.,!]+?(?:\'")?)\s*([;}])/');
 		$match = $this->MatchReg('/\\G([a-zA-Z\-]+)\s*:\s*([\'"]?[#a-zA-Z0-9\-%\.,]+?[\'"]?) *(! *important)?\s*([;}])/');
-		if( $match ){
+		if ($match) {
 
-			if( $match[4] == '}' ){
-				$this->pos = $index + strlen($match[0])-1;
+			if ($match[4]=='}') {
+				$this->pos = $index+strlen($match[0])-1;
 			}
 
-			if( $match[3] ){
+			if ($match[3]) {
 				$match[2] .= ' !important';
 			}
 
-			return $this->NewObj4('Less_Tree_NameValue',array( $match[1], $match[2], $index, $this->env->currentFileInfo));
+			return $this->NewObj4('Less_Tree_NameValue', array($match[1], $match[2], $index, $this->env->currentFileInfo));
 		}
 
 		$this->restore();
 	}
 
 
-	private function parseRule( $tryAnonymous = null ){
+	private function parseRule($tryAnonymous = null) {
 
 		$merge = false;
 		$startOfRule = $this->pos;
 
 		$c = $this->input[$this->pos];
-		if( $c === '.' || $c === '#' || $c === '&' ){
+		if ($c==='.' || $c==='#' || $c==='&') {
 			return;
 		}
 
 		$this->save();
-		$name = $this->MatchFuncs( array('parseVariable','parseRuleProperty'));
+		$name = $this->MatchFuncs(array('parseVariable', 'parseRuleProperty'));
 
-		if( $name ){
+		if ($name) {
 
 			$isVariable = is_string($name);
 
 			$value = null;
-			if( $isVariable ){
+			if ($isVariable) {
 				$value = $this->parseDetachedRuleset();
 			}
 
 			$important = null;
-			if( !$value ){
+			if (!$value) {
 
 				// prefer to try to parse first if its a variable or we are compressing
 				// but always fallback on the other one
 				//if( !$tryAnonymous && is_string($name) && $name[0] === '@' ){
-				if( !$tryAnonymous && (Less_Parser::$options['compress'] || $isVariable) ){
-					$value = $this->MatchFuncs( array('parseValue','parseAnonymousValue'));
-				}else{
-					$value = $this->MatchFuncs( array('parseAnonymousValue','parseValue'));
+				if (!$tryAnonymous && (Less_Parser::$options['compress'] || $isVariable)) {
+					$value = $this->MatchFuncs(array('parseValue', 'parseAnonymousValue'));
+				}else {
+					$value = $this->MatchFuncs(array('parseAnonymousValue', 'parseValue'));
 				}
 
 				$important = $this->parseImportant();
@@ -1890,35 +1890,35 @@ 
 				// a name returned by this.ruleProperty() is always an array of the form:
 				// [string-1, ..., string-n, ""] or [string-1, ..., string-n, "+"]
 				// where each item is a tree.Keyword or tree.Variable
-				if( !$isVariable && is_array($name) ){
+				if (!$isVariable && is_array($name)) {
 					$nm = array_pop($name);
-					if( $nm->value ){
+					if ($nm->value) {
 						$merge = $nm->value;
 					}
 				}
 			}
 
 
-			if( $value && $this->parseEnd() ){
+			if ($value && $this->parseEnd()) {
 				$this->forget();
-				return $this->NewObj6('Less_Tree_Rule',array( $name, $value, $important, $merge, $startOfRule, $this->env->currentFileInfo));
-			}else{
+				return $this->NewObj6('Less_Tree_Rule', array($name, $value, $important, $merge, $startOfRule, $this->env->currentFileInfo));
+			}else {
 				$this->furthest = $this->pos;
 				$this->restore();
-				if( $value && !$tryAnonymous ){
+				if ($value && !$tryAnonymous) {
 					return $this->parseRule(true);
 				}
 			}
-		}else{
+		}else {
 			$this->forget();
 		}
 	}
 
-	function parseAnonymousValue(){
+	function parseAnonymousValue() {
 
-		if( preg_match('/\\G([^@+\/\'"*`(;{}-]*);/',$this->input, $match, 0, $this->pos) ){
+		if (preg_match('/\\G([^@+\/\'"*`(;{}-]*);/', $this->input, $match, 0, $this->pos)) {
 			$this->pos += strlen($match[1]);
-			return $this->NewObj1('Less_Tree_Anonymous',$match[1]);
+			return $this->NewObj1('Less_Tree_Anonymous', $match[1]);
 		}
 	}
 
@@ -1932,25 +1932,25 @@ 
 	// file-system operation. The function used for importing is
 	// stored in `import`, which we pass to the Import constructor.
 	//
-	private function parseImport(){
+	private function parseImport() {
 
 		$this->save();
 
 		$dir = $this->MatchReg('/\\G@import?\s+/');
 
-		if( $dir ){
+		if ($dir) {
 			$options = $this->parseImportOptions();
-			$path = $this->MatchFuncs( array('parseEntitiesQuoted','parseEntitiesUrl'));
+			$path = $this->MatchFuncs(array('parseEntitiesQuoted', 'parseEntitiesUrl'));
 
-			if( $path ){
+			if ($path) {
 				$features = $this->parseMediaFeatures();
-				if( $this->MatchChar(';') ){
-					if( $features ){
-						$features = $this->NewObj1('Less_Tree_Value',$features);
+				if ($this->MatchChar(';')) {
+					if ($features) {
+						$features = $this->NewObj1('Less_Tree_Value', $features);
 					}
 
 					$this->forget();
-					return $this->NewObj5('Less_Tree_Import',array( $path, $features, $options, $this->pos, $this->env->currentFileInfo));
+					return $this->NewObj5('Less_Tree_Import', array($path, $features, $options, $this->pos, $this->env->currentFileInfo));
 				}
 			}
 		}
@@ -1958,19 +1958,19 @@ 
 		$this->restore();
 	}
 
-	private function parseImportOptions(){
+	private function parseImportOptions() {
 
 		$options = array();
 
 		// list of options, surrounded by parens
-		if( !$this->MatchChar('(') ){
+		if (!$this->MatchChar('(')) {
 			return $options;
 		}
-		do{
+		do {
 			$optionName = $this->parseImportOption();
-			if( $optionName ){
+			if ($optionName) {
 				$value = true;
-				switch( $optionName ){
+				switch ($optionName) {
 					case "css":
 						$optionName = "less";
 						$value = false;
@@ -1981,16 +1981,16 @@ 
 					break;
 				}
 				$options[$optionName] = $value;
-				if( !$this->MatchChar(',') ){ break; }
+				if (!$this->MatchChar(',')) { break; }
 			}
-		}while( $optionName );
+		} while ($optionName);
 		$this->expectChar(')');
 		return $options;
 	}
 
-	private function parseImportOption(){
+	private function parseImportOption() {
 		$opt = $this->MatchReg('/\\G(less|css|multiple|once|inline|reference)/');
-		if( $opt ){
+		if ($opt) {
 			return $opt[1];
 		}
 	}
@@ -1998,43 +1998,43 @@ 
 	private function parseMediaFeature() {
 		$nodes = array();
 
-		do{
-			$e = $this->MatchFuncs(array('parseEntitiesKeyword','parseEntitiesVariable'));
-			if( $e ){
+		do {
+			$e = $this->MatchFuncs(array('parseEntitiesKeyword', 'parseEntitiesVariable'));
+			if ($e) {
 				$nodes[] = $e;
 			} elseif ($this->MatchChar('(')) {
 				$p = $this->parseProperty();
 				$e = $this->parseValue();
 				if ($this->MatchChar(')')) {
 					if ($p && $e) {
-						$r = $this->NewObj7('Less_Tree_Rule', array( $p, $e, null, null, $this->pos, $this->env->currentFileInfo, true));
-						$nodes[] = $this->NewObj1('Less_Tree_Paren',$r);
+						$r = $this->NewObj7('Less_Tree_Rule', array($p, $e, null, null, $this->pos, $this->env->currentFileInfo, true));
+						$nodes[] = $this->NewObj1('Less_Tree_Paren', $r);
 					} elseif ($e) {
-						$nodes[] = $this->NewObj1('Less_Tree_Paren',$e);
-					} else {
+						$nodes[] = $this->NewObj1('Less_Tree_Paren', $e);
+					}else {
 						return null;
 					}
-				} else
+				}else
 					return null;
 			}
 		} while ($e);
 
 		if ($nodes) {
-			return $this->NewObj1('Less_Tree_Expression',$nodes);
+			return $this->NewObj1('Less_Tree_Expression', $nodes);
 		}
 	}
 
 	private function parseMediaFeatures() {
 		$features = array();
 
-		do{
+		do {
 			$e = $this->parseMediaFeature();
-			if( $e ){
+			if ($e) {
 				$features[] = $e;
 				if (!$this->MatchChar(',')) break;
-			}else{
+			}else {
 				$e = $this->parseEntitiesVariable();
-				if( $e ){
+				if ($e) {
 					$features[] = $e;
 					if (!$this->MatchChar(',')) break;
 				}
@@ -2045,12 +2045,12 @@ 
 	}
 
 	private function parseMedia() {
-		if( $this->MatchReg('/\\G@media/') ){
+		if ($this->MatchReg('/\\G@media/')) {
 			$features = $this->parseMediaFeatures();
 			$rules = $this->parseBlock();
 
-			if( is_array($rules) ){
-				return $this->NewObj4('Less_Tree_Media',array( $rules, $features, $this->pos, $this->env->currentFileInfo));
+			if (is_array($rules)) {
+				return $this->NewObj4('Less_Tree_Media', array($rules, $features, $this->pos, $this->env->currentFileInfo));
 			}
 		}
 	}
@@ -2061,9 +2061,9 @@ 
 	//
 	// @charset "utf-8";
 	//
-	private function parseDirective(){
+	private function parseDirective() {
 
-		if( !$this->PeekChar('@') ){
+		if (!$this->PeekChar('@')) {
 			return;
 		}
 
@@ -2075,8 +2075,8 @@ 
 		$hasUnknown = false;
 
 
-		$value = $this->MatchFuncs(array('parseImport','parseMedia'));
-		if( $value ){
+		$value = $this->MatchFuncs(array('parseImport', 'parseMedia'));
+		if ($value) {
 			return $value;
 		}
 
@@ -2084,18 +2084,18 @@ 
 
 		$name = $this->MatchReg('/\\G@[a-z-]+/');
 
-		if( !$name ) return;
+		if (!$name) return;
 		$name = $name[0];
 
 
 		$nonVendorSpecificName = $name;
-		$pos = strpos($name,'-', 2);
-		if( $name[1] == '-' && $pos > 0 ){
-			$nonVendorSpecificName = "@" . substr($name, $pos + 1);
+		$pos = strpos($name, '-', 2);
+		if ($name[1]=='-' && $pos>0) {
+			$nonVendorSpecificName = "@".substr($name, $pos+1);
 		}
 
 
-		switch( $nonVendorSpecificName ){
+		switch ($nonVendorSpecificName) {
 			/*
 			case "@font-face":
 			case "@viewport":
@@ -2137,31 +2137,31 @@ 
 				break;
 		}
 
-		if( $hasIdentifier ){
+		if ($hasIdentifier) {
 			$value = $this->parseEntity();
-			if( !$value ){
-				$this->error("expected " . $name . " identifier");
+			if (!$value) {
+				$this->error("expected ".$name." identifier");
 			}
-		} else if( $hasExpression ){
+		}else if ($hasExpression) {
 			$value = $this->parseExpression();
-			if( !$value ){
-				$this->error("expected " . $name. " expression");
+			if (!$value) {
+				$this->error("expected ".$name." expression");
 			}
-		} else if ($hasUnknown) {
+		}else if ($hasUnknown) {
 
 			$value = $this->MatchReg('/\\G[^{;]+/');
-			if( $value ){
-				$value = $this->NewObj1('Less_Tree_Anonymous',trim($value[0]));
+			if ($value) {
+				$value = $this->NewObj1('Less_Tree_Anonymous', trim($value[0]));
 			}
 		}
 
-		if( $hasBlock ){
+		if ($hasBlock) {
 			$rules = $this->parseBlockRuleset();
 		}
 
-		if( $rules || (!$hasBlock && $value && $this->MatchChar(';'))) {
+		if ($rules || (!$hasBlock && $value && $this->MatchChar(';'))) {
 			$this->forget();
-			return $this->NewObj5('Less_Tree_Directive',array($name, $value, $rules, $index, $this->env->currentFileInfo));
+			return $this->NewObj5('Less_Tree_Directive', array($name, $value, $rules, $index, $this->env->currentFileInfo));
 		}
 
 		$this->restore();
@@ -2176,37 +2176,37 @@ 
 	// In a Rule, a Value represents everything after the `:`,
 	// and before the `;`.
 	//
-	private function parseValue(){
+	private function parseValue() {
 		$expressions = array();
 
-		do{
+		do {
 			$e = $this->parseExpression();
-			if( $e ){
+			if ($e) {
 				$expressions[] = $e;
-				if (! $this->MatchChar(',')) {
+				if (!$this->MatchChar(',')) {
 					break;
 				}
 			}
-		}while($e);
+		} while ($e);
 
-		if( $expressions ){
-			return $this->NewObj1('Less_Tree_Value',$expressions);
+		if ($expressions) {
+			return $this->NewObj1('Less_Tree_Value', $expressions);
 		}
 	}
 
-	private function parseImportant (){
-		if( $this->PeekChar('!') && $this->MatchReg('/\\G! *important/') ){
+	private function parseImportant() {
+		if ($this->PeekChar('!') && $this->MatchReg('/\\G! *important/')) {
 			return ' !important';
 		}
 	}
 
-	private function parseSub (){
+	private function parseSub() {
 
-		if( $this->MatchChar('(') ){
+		if ($this->MatchChar('(')) {
 			$a = $this->parseAddition();
-			if( $a ){
+			if ($a) {
 				$this->expectChar(')');
-				return $this->NewObj2('Less_Tree_Expression',array( array($a), true) ); //instead of $e->parens = true so the value is cached
+				return $this->NewObj2('Less_Tree_Expression', array(array($a), true)); //instead of $e->parens = true so the value is cached
 			}
 		}
 	}
@@ -2217,33 +2217,33 @@ 
 	 *
 	 * @return Less_Tree_Operation|null
 	 */
-	function parseMultiplication(){
+	function parseMultiplication() {
 
 		$return = $m = $this->parseOperand();
-		if( $return ){
-			while( true ){
+		if ($return) {
+			while (true) {
 
 				$isSpaced = $this->isWhitespace( -1 );
 
-				if( $this->PeekReg('/\\G\/[*\/]/') ){
+				if ($this->PeekReg('/\\G\/[*\/]/')) {
 					break;
 				}
 
 				$op = $this->MatchChar('/');
-				if( !$op ){
+				if (!$op) {
 					$op = $this->MatchChar('*');
-					if( !$op ){
+					if (!$op) {
 						break;
 					}
 				}
 
 				$a = $this->parseOperand();
 
-				if(!$a) { break; }
+				if (!$a) { break; }
 
 				$m->parensInOp = true;
 				$a->parensInOp = true;
-				$return = $this->NewObj3('Less_Tree_Operation',array( $op, array( $return, $a ), $isSpaced) );
+				$return = $this->NewObj3('Less_Tree_Operation', array($op, array($return, $a), $isSpaced));
 			}
 		}
 		return $return;
@@ -2256,34 +2256,34 @@ 
 	 *
 	 * @return Less_Tree_Operation|null
 	 */
-	private function parseAddition (){
+	private function parseAddition() {
 
 		$return = $m = $this->parseMultiplication();
-		if( $return ){
-			while( true ){
+		if ($return) {
+			while (true) {
 
 				$isSpaced = $this->isWhitespace( -1 );
 
 				$op = $this->MatchReg('/\\G[-+]\s+/');
-				if( $op ){
+				if ($op) {
 					$op = $op[0];
-				}else{
-					if( !$isSpaced ){
-						$op = $this->match(array('#+','#-'));
+				}else {
+					if (!$isSpaced) {
+						$op = $this->match(array('#+', '#-'));
 					}
-					if( !$op ){
+					if (!$op) {
 						break;
 					}
 				}
 
 				$a = $this->parseMultiplication();
-				if( !$a ){
+				if (!$a) {
 					break;
 				}
 
 				$m->parensInOp = true;
 				$a->parensInOp = true;
-				$return = $this->NewObj3('Less_Tree_Operation',array($op, array($return, $a), $isSpaced));
+				$return = $this->NewObj3('Less_Tree_Operation', array($op, array($return, $a), $isSpaced));
 			}
 		}
 
@@ -2299,17 +2299,17 @@ 
 	private function parseConditions() {
 		$index = $this->pos;
 		$return = $a = $this->parseCondition();
-		if( $a ){
-			while( true ){
-				if( !$this->PeekReg('/\\G,\s*(not\s*)?\(/') ||  !$this->MatchChar(',') ){
+		if ($a) {
+			while (true) {
+				if (!$this->PeekReg('/\\G,\s*(not\s*)?\(/') || !$this->MatchChar(',')) {
 					break;
 				}
 				$b = $this->parseCondition();
-				if( !$b ){
+				if (!$b) {
 					break;
 				}
 
-				$return = $this->NewObj4('Less_Tree_Condition',array('or', $return, $b, $index));
+				$return = $this->NewObj4('Less_Tree_Condition', array('or', $return, $b, $index));
 			}
 			return $return;
 		}
@@ -2322,23 +2322,23 @@ 
 
 		if ($this->MatchReg('/\\Gnot/')) $negate = true;
 		$this->expectChar('(');
-		$a = $this->MatchFuncs(array('parseAddition','parseEntitiesKeyword','parseEntitiesQuoted'));
+		$a = $this->MatchFuncs(array('parseAddition', 'parseEntitiesKeyword', 'parseEntitiesQuoted'));
 
-		if( $a ){
+		if ($a) {
 			$op = $this->MatchReg('/\\G(?:>=|<=|=<|[<=>])/');
-			if( $op ){
-				$b = $this->MatchFuncs(array('parseAddition','parseEntitiesKeyword','parseEntitiesQuoted'));
-				if( $b ){
-					$c = $this->NewObj5('Less_Tree_Condition',array($op[0], $a, $b, $index, $negate));
-				} else {
+			if ($op) {
+				$b = $this->MatchFuncs(array('parseAddition', 'parseEntitiesKeyword', 'parseEntitiesQuoted'));
+				if ($b) {
+					$c = $this->NewObj5('Less_Tree_Condition', array($op[0], $a, $b, $index, $negate));
+				}else {
 					$this->Error('Unexpected expression');
 				}
-			} else {
-				$k = $this->NewObj1('Less_Tree_Keyword','true');
-				$c = $this->NewObj5('Less_Tree_Condition',array('=', $a, $k, $index, $negate));
+			}else {
+				$k = $this->NewObj1('Less_Tree_Keyword', 'true');
+				$c = $this->NewObj5('Less_Tree_Condition', array('=', $a, $k, $index, $negate));
 			}
 			$this->expectChar(')');
-			return $this->MatchReg('/\\Gand/') ? $this->NewObj3('Less_Tree_Condition',array('and', $c, $this->parseCondition())) : $c;
+			return $this->MatchReg('/\\Gand/') ? $this->NewObj3('Less_Tree_Condition', array('and', $c, $this->parseCondition())) : $c;
 		}
 	}
 
@@ -2347,23 +2347,23 @@ 
 	 * such as a Color, or a Variable
 	 *
 	 */
-	private function parseOperand (){
+	private function parseOperand() {
 
 		$negate = false;
 		$offset = $this->pos+1;
-		if( $offset >= $this->input_len ){
+		if ($offset>=$this->input_len) {
 			return;
 		}
 		$char = $this->input[$offset];
-		if( $char === '@' || $char === '(' ){
+		if ($char==='@' || $char==='(') {
 			$negate = $this->MatchChar('-');
 		}
 
-		$o = $this->MatchFuncs(array('parseSub','parseEntitiesDimension','parseEntitiesColor','parseEntitiesVariable','parseEntitiesCall'));
+		$o = $this->MatchFuncs(array('parseSub', 'parseEntitiesDimension', 'parseEntitiesColor', 'parseEntitiesVariable', 'parseEntitiesCall'));
 
-		if( $negate ){
+		if ($negate) {
 			$o->parensInOp = true;
-			$o = $this->NewObj1('Less_Tree_Negative',$o);
+			$o = $this->NewObj1('Less_Tree_Negative', $o);
 		}
 
 		return $o;
@@ -2379,25 +2379,25 @@ 
 	 *
 	 * @return Less_Tree_Expression|null
 	 */
-	private function parseExpression (){
+	private function parseExpression() {
 		$entities = array();
 
-		do{
-			$e = $this->MatchFuncs(array('parseAddition','parseEntity'));
-			if( $e ){
+		do {
+			$e = $this->MatchFuncs(array('parseAddition', 'parseEntity'));
+			if ($e) {
 				$entities[] = $e;
 				// operations do not allow keyword "/" dimension (e.g. small/20px) so we support that here
-				if( !$this->PeekReg('/\\G\/[\/*]/') ){
+				if (!$this->PeekReg('/\\G\/[\/*]/')) {
 					$delim = $this->MatchChar('/');
-					if( $delim ){
-						$entities[] = $this->NewObj1('Less_Tree_Anonymous',$delim);
+					if ($delim) {
+						$entities[] = $this->NewObj1('Less_Tree_Anonymous', $delim);
 					}
 				}
 			}
-		}while($e);
+		} while ($e);
 
-		if( $entities ){
-			return $this->NewObj1('Less_Tree_Expression',$entities);
+		if ($entities) {
+			return $this->NewObj1('Less_Tree_Expression', $entities);
 		}
 	}
 
@@ -2408,9 +2408,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function parseProperty (){
+	private function parseProperty() {
 		$name = $this->MatchReg('/\\G(\*?-?[_a-zA-Z0-9-]+)\s*:/');
-		if( $name ){
+		if ($name) {
 			return $name[1];
 		}
 	}
@@ -2422,30 +2422,30 @@ 
 	 *
 	 * @return string
 	 */
-	private function parseRuleProperty(){
+	private function parseRuleProperty() {
 		$offset = $this->pos;
 		$name = array();
 		$index = array();
 		$length = 0;
 
 
-		$this->rulePropertyMatch('/\\G(\*?)/', $offset, $length, $index, $name );
-		while( $this->rulePropertyMatch('/\\G((?:[\w-]+)|(?:@\{[\w-]+\}))/', $offset, $length, $index, $name )); // !
+		$this->rulePropertyMatch('/\\G(\*?)/', $offset, $length, $index, $name);
+		while ($this->rulePropertyMatch('/\\G((?:[\w-]+)|(?:@\{[\w-]+\}))/', $offset, $length, $index, $name)); // !
 
-		if( (count($name) > 1) && $this->rulePropertyMatch('/\\G\s*((?:\+_|\+)?)\s*:/', $offset, $length, $index, $name) ){
+		if ((count($name)>1) && $this->rulePropertyMatch('/\\G\s*((?:\+_|\+)?)\s*:/', $offset, $length, $index, $name)) {
 			// at last, we have the complete match now. move forward,
 			// convert name particles to tree objects and return:
 			$this->skipWhitespace($length);
 
-			if( $name[0] === '' ){
+			if ($name[0]==='') {
 				array_shift($name);
 				array_shift($index);
 			}
-			foreach($name as $k => $s ){
-				if( !$s || $s[0] !== '@' ){
-					$name[$k] = $this->NewObj1('Less_Tree_Keyword',$s);
-				}else{
-					$name[$k] = $this->NewObj3('Less_Tree_Variable',array('@' . substr($s,2,-1), $index[$k], $this->env->currentFileInfo));
+			foreach ($name as $k => $s) {
+				if (!$s || $s[0]!=='@') {
+					$name[$k] = $this->NewObj1('Less_Tree_Keyword', $s);
+				}else {
+					$name[$k] = $this->NewObj3('Less_Tree_Variable', array('@'.substr($s, 2, -1), $index[$k], $this->env->currentFileInfo));
 				}
 			}
 			return $name;
@@ -2454,10 +2454,10 @@ 
 
 	}
 
-	private function rulePropertyMatch( $re, &$offset, &$length,  &$index, &$name ){
+	private function rulePropertyMatch($re, &$offset, &$length, &$index, &$name) {
 		preg_match($re, $this->input, $a, 0, $offset);
-		if( $a ){
-			$index[] = $this->pos + $length;
+		if ($a) {
+			$index[] = $this->pos+$length;
 			$length += strlen($a[0]);
 			$offset += strlen($a[0]);
 			$name[] = $a[1];
@@ -2465,11 +2465,11 @@ 
 		}
 	}
 
-	public static function serializeVars( $vars ){
+	public static function serializeVars($vars) {
 		$s = '';
 
-		foreach($vars as $name => $value){
-			$s .= (($name[0] === '@') ? '' : '@') . $name .': '. $value . ((substr($value,-1) === ';') ? '' : ';');
+		foreach ($vars as $name => $value) {
+			$s .= (($name[0]==='@') ? '' : '@').$name.': '.$value.((substr($value, -1)===';') ? '' : ';');
 		}
 
 		return $s;
@@ -2481,8 +2481,8 @@ 
 	 *
 	 * @param string $b
 	 */
-	public static function is_method($a,$b){
-		return is_object($a) && method_exists($a,$b);
+	public static function is_method($a, $b) {
+		return is_object($a) && method_exists($a, $b);
 	}
 
 
@@ -2491,17 +2491,17 @@ 
 	 * eg: 1.499999 to 1 instead of 2
 	 *
 	 */
-	public static function round($i, $precision = 0){
+	public static function round($i, $precision = 0) {
 
-		$precision = pow(10,$precision);
-		$i = $i*$precision;
+		$precision = pow(10, $precision);
+		$i = $i * $precision;
 
 		$ceil = ceil($i);
 		$floor = floor($i);
-		if( ($ceil - $i) <= ($i - $floor) ){
-			return $ceil/$precision;
-		}else{
-			return $floor/$precision;
+		if (($ceil-$i)<=($i-$floor)) {
+			return $ceil / $precision;
+		}else {
+			return $floor / $precision;
 		}
 	}
 
@@ -2511,77 +2511,77 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function NewObj0($class){
+	public function NewObj0($class) {
 		$obj = new $class();
-		if( $this->CacheEnabled() ){
+		if ($this->CacheEnabled()) {
 			$obj->cache_string = ' new '.$class.'()';
 		}
 		return $obj;
 	}
 
-	public function NewObj1($class, $arg){
-		$obj = new $class( $arg );
-		if( $this->CacheEnabled() ){
+	public function NewObj1($class, $arg) {
+		$obj = new $class($arg);
+		if ($this->CacheEnabled()) {
 			$obj->cache_string = ' new '.$class.'('.Less_Parser::ArgString($arg).')';
 		}
 		return $obj;
 	}
 
-	public function NewObj2($class, $args){
-		$obj = new $class( $args[0], $args[1] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj2($class, $args) {
+		$obj = new $class($args[0], $args[1]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
-	public function NewObj3($class, $args){
-		$obj = new $class( $args[0], $args[1], $args[2] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj3($class, $args) {
+		$obj = new $class($args[0], $args[1], $args[2]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
-	public function NewObj4($class, $args){
-		$obj = new $class( $args[0], $args[1], $args[2], $args[3] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj4($class, $args) {
+		$obj = new $class($args[0], $args[1], $args[2], $args[3]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
-	public function NewObj5($class, $args){
-		$obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj5($class, $args) {
+		$obj = new $class($args[0], $args[1], $args[2], $args[3], $args[4]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
-	public function NewObj6($class, $args){
-		$obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj6($class, $args) {
+		$obj = new $class($args[0], $args[1], $args[2], $args[3], $args[4], $args[5]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
-	public function NewObj7($class, $args){
-		$obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6] );
-		if( $this->CacheEnabled() ){
-			$this->ObjCache( $obj, $class, $args);
+	public function NewObj7($class, $args) {
+		$obj = new $class($args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6]);
+		if ($this->CacheEnabled()) {
+			$this->ObjCache($obj, $class, $args);
 		}
 		return $obj;
 	}
 
 	//caching
-	public function ObjCache($obj, $class, $args=array()){
-		$obj->cache_string = ' new '.$class.'('. self::ArgCache($args).')';
+	public function ObjCache($obj, $class, $args = array()) {
+		$obj->cache_string = ' new '.$class.'('.self::ArgCache($args).')';
 	}
 
-	public function ArgCache($args){
-		return implode(',',array_map( array('Less_Parser','ArgString'),$args));
+	public function ArgCache($args) {
+		return implode(',', array_map(array('Less_Parser', 'ArgString'), $args));
 	}
 
 
@@ -2590,36 +2590,36 @@ 
 	 *
 	 * @return string
 	 */
-	public static function ArgString($arg){
+	public static function ArgString($arg) {
 
 		$type = gettype($arg);
 
-		if( $type === 'object'){
+		if ($type==='object') {
 			$string = $arg->cache_string;
 			unset($arg->cache_string);
 			return $string;
 
-		}elseif( $type === 'array' ){
+		}elseif ($type==='array') {
 			$string = ' Array(';
-			foreach($arg as $k => $a){
-				$string .= var_export($k,true).' => '.self::ArgString($a).',';
+			foreach ($arg as $k => $a) {
+				$string .= var_export($k, true).' => '.self::ArgString($a).',';
 			}
-			return $string . ')';
+			return $string.')';
 		}
 
-		return var_export($arg,true);
+		return var_export($arg, true);
 	}
 
-	public function Error($msg){
+	public function Error($msg) {
 		throw new Less_Exception_Parser($msg, null, $this->furthest, $this->env->currentFileInfo);
 	}
 
-	public static function WinPath($path){
+	public static function WinPath($path) {
 		return str_replace('\\', '/', $path);
 	}
 
-	public function CacheEnabled(){
-		return (Less_Parser::$options['cache_method'] && (Less_Cache::$cache_dir || (Less_Parser::$options['cache_method'] == 'callback')));
+	public function CacheEnabled() {
+		return (Less_Parser::$options['cache_method'] && (Less_Cache::$cache_dir || (Less_Parser::$options['cache_method']=='callback')));
 	}
 
 }
@@ -2804,7 +2804,7 @@ 
  * @package Less
  * @subpackage environment
  */
-class Less_Environment{
+class Less_Environment {
 
 	//public $paths = array();				// option - unmodified - paths to search for imports on
 	//public static $files = array();		// list of files that have been imported, used for import-once
@@ -2814,9 +2814,9 @@ 
 	//public $processImports;				// option - whether to process imports. if false then imports will not be imported
 	//public $javascriptEnabled;			// option - whether JavaScript is enabled. if undefined, defaults to true
 	//public $useFileCache;					// browser only - whether to use the per file session cache
-	public $currentFileInfo;				// information about the current file - for error reporting and importing and making urls relative etc.
+	public $currentFileInfo; // information about the current file - for error reporting and importing and making urls relative etc.
 
-	public $importMultiple = false; 		// whether we are currently importing multiple copies
+	public $importMultiple = false; // whether we are currently importing multiple copies
 
 
 	/**
@@ -2850,14 +2850,14 @@ 
 	public $functions = array();
 
 
-	public function Init(){
+	public function Init() {
 
 		self::$parensStack = 0;
 		self::$tabLevel = 0;
 		self::$lastRule = false;
 		self::$mixin_stack = 0;
 
-		if( Less_Parser::$options['compress'] ){
+		if (Less_Parser::$options['compress']) {
 
 			Less_Environment::$_outputMap = array(
 				','	=> ',',
@@ -2873,7 +2873,7 @@ 
 		        '^^' => '^^'
 			);
 
-		}else{
+		}else {
 
 			Less_Environment::$_outputMap = array(
 				','	=> ', ',
@@ -2893,19 +2893,19 @@ 
 	}
 
 
-	public function copyEvalEnv($frames = array() ){
+	public function copyEvalEnv($frames = array()) {
 		$new_env = new Less_Environment();
 		$new_env->frames = $frames;
 		return $new_env;
 	}
 
 
-	public static function isMathOn(){
+	public static function isMathOn() {
 		return !Less_Parser::$options['strictMath'] || Less_Environment::$parensStack;
 	}
 
-	public static function isPathRelative($path){
-		return !preg_match('/^(?:[a-z-]+:|\/)/',$path);
+	public static function isPathRelative($path) {
+		return !preg_match('/^(?:[a-z-]+:|\/)/', $path);
 	}
 
 
@@ -2916,26 +2916,26 @@ 
 	 * @return string Canonicalized path
 	 *
 	 */
-	public static function normalizePath($path){
+	public static function normalizePath($path) {
 
-		$segments = explode('/',$path);
+		$segments = explode('/', $path);
 		$segments = array_reverse($segments);
 
 		$path = array();
 		$path_len = 0;
 
-		while( $segments ){
+		while ($segments) {
 			$segment = array_pop($segments);
-			switch( $segment ) {
+			switch ($segment) {
 
 				case '.':
 				break;
 
 				case '..':
-					if( !$path_len || ( $path[$path_len-1] === '..') ){
+					if (!$path_len || ($path[$path_len-1]==='..')) {
 						$path[] = $segment;
 						$path_len++;
-					}else{
+					}else {
 						array_pop($path);
 						$path_len--;
 					}
@@ -2948,15 +2948,15 @@ 
 			}
 		}
 
-		return implode('/',$path);
+		return implode('/', $path);
 	}
 
 
-	public function unshiftFrame($frame){
+	public function unshiftFrame($frame) {
 		array_unshift($this->frames, $frame);
 	}
 
-	public function shiftFrame(){
+	public function shiftFrame() {
 		return array_shift($this->frames);
 	}
 
@@ -2970,12 +2970,12 @@ 
  * @subpackage function
  * @see http://lesscss.org/functions/
  */
-class Less_Functions{
+class Less_Functions {
 
 	public $env;
 	public $currentFileInfo;
 
-	function __construct($env, $currentFileInfo = null ){
+	function __construct($env, $currentFileInfo = null) {
 		$this->env = $env;
 		$this->currentFileInfo = $currentFileInfo;
 	}
@@ -2983,95 +2983,95 @@ 
 	/**
 	 * @param string $op
 	 */
-	public static function operate( $op, $a, $b ){
+	public static function operate($op, $a, $b) {
 		switch ($op) {
-			case '+': return $a + $b;
-			case '-': return $a - $b;
+			case '+': return $a+$b;
+			case '-': return $a-$b;
 			case '*': return $a * $b;
 			case '/': return $a / $b;
 		}
 	}
 
-	public static function clamp($val, $max = 1){
-		return min( max($val, 0), $max);
+	public static function clamp($val, $max = 1) {
+		return min(max($val, 0), $max);
 	}
 
-	public static function fround( $value ){
+	public static function fround($value) {
 
-		if( $value === 0 ){
+		if ($value===0) {
 			return $value;
 		}
 
-		if( Less_Parser::$options['numPrecision'] ){
+		if (Less_Parser::$options['numPrecision']) {
 			$p = pow(10, Less_Parser::$options['numPrecision']);
-			return round( $value * $p) / $p;
+			return round($value * $p) / $p;
 		}
 		return $value;
 	}
 
-	public static function number($n){
+	public static function number($n) {
 
 		if ($n instanceof Less_Tree_Dimension) {
-			return floatval( $n->unit->is('%') ? $n->value / 100 : $n->value);
-		} else if (is_numeric($n)) {
+			return floatval($n->unit->is('%') ? $n->value / 100 : $n->value);
+		}else if (is_numeric($n)) {
 			return $n;
-		} else {
+		}else {
 			throw new Less_Exception_Compiler("color functions take numbers as parameters");
 		}
 	}
 
-	public static function scaled($n, $size = 255 ){
-		if( $n instanceof Less_Tree_Dimension && $n->unit->is('%') ){
+	public static function scaled($n, $size = 255) {
+		if ($n instanceof Less_Tree_Dimension && $n->unit->is('%')) {
 			return (float)$n->value * $size / 100;
-		} else {
+		}else {
 			return Less_Functions::number($n);
 		}
 	}
 
-	public function rgb ($r = null, $g = null, $b = null){
+	public function rgb($r = null, $g = null, $b = null) {
 		if (is_null($r) || is_null($g) || is_null($b)) {
 			throw new Less_Exception_Compiler("rgb expects three parameters");
 		}
 		return $this->rgba($r, $g, $b, 1.0);
 	}
 
-	public function rgba($r = null, $g = null, $b = null, $a = null){
+	public function rgba($r = null, $g = null, $b = null, $a = null) {
 		$rgb = array($r, $g, $b);
-		$rgb = array_map(array('Less_Functions','scaled'),$rgb);
+		$rgb = array_map(array('Less_Functions', 'scaled'), $rgb);
 
 		$a = self::number($a);
 		return new Less_Tree_Color($rgb, $a);
 	}
 
-	public function hsl($h, $s, $l){
+	public function hsl($h, $s, $l) {
 		return $this->hsla($h, $s, $l, 1.0);
 	}
 
-	public function hsla($h, $s, $l, $a){
+	public function hsla($h, $s, $l, $a) {
 
 		$h = fmod(self::number($h), 360) / 360; // Classic % operator will change float to int
 		$s = self::clamp(self::number($s));
 		$l = self::clamp(self::number($l));
 		$a = self::clamp(self::number($a));
 
-		$m2 = $l <= 0.5 ? $l * ($s + 1) : $l + $s - $l * $s;
+		$m2 = $l<=0.5 ? $l * ($s+1) : $l+$s-$l * $s;
 
-		$m1 = $l * 2 - $m2;
+		$m1 = $l * 2-$m2;
 
-		return $this->rgba( self::hsla_hue($h + 1/3, $m1, $m2) * 255,
+		return $this->rgba(self::hsla_hue($h+1 / 3, $m1, $m2) * 255,
 							self::hsla_hue($h, $m1, $m2) * 255,
-							self::hsla_hue($h - 1/3, $m1, $m2) * 255,
+							self::hsla_hue($h-1 / 3, $m1, $m2) * 255,
 							$a);
 	}
 
 	/**
 	 * @param double $h
 	 */
-	public function hsla_hue($h, $m1, $m2){
-		$h = $h < 0 ? $h + 1 : ($h > 1 ? $h - 1 : $h);
-		if	  ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-		else if ($h * 2 < 1) return $m2;
-		else if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (2/3 - $h) * 6;
+	public function hsla_hue($h, $m1, $m2) {
+		$h = $h<0 ? $h+1 : ($h>1 ? $h-1 : $h);
+		if ($h * 6<1) return $m1+($m2-$m1) * $h * 6;
+		else if ($h * 2<1) return $m2;
+		else if ($h * 3<2) return $m1+($m2-$m1) * (2 / 3-$h) * 6;
 		else				 return $m1;
 	}
 
@@ -3083,18 +3083,18 @@ 
 	 * @param double $a
 	 */
 	public function hsva($h, $s, $v, $a) {
-		$h = ((Less_Functions::number($h) % 360) / 360 ) * 360;
+		$h = ((Less_Functions::number($h) % 360) / 360) * 360;
 		$s = Less_Functions::number($s);
 		$v = Less_Functions::number($v);
 		$a = Less_Functions::number($a);
 
 		$i = floor(($h / 60) % 6);
-		$f = ($h / 60) - $i;
+		$f = ($h / 60)-$i;
 
-		$vs = array( $v,
-				  $v * (1 - $s),
-				  $v * (1 - $f * $s),
-				  $v * (1 - (1 - $f) * $s));
+		$vs = array($v,
+				  $v * (1-$s),
+				  $v * (1-$f * $s),
+				  $v * (1-(1-$f) * $s));
 
 		$perm = array(array(0, 3, 1),
 					array(2, 0, 1),
@@ -3109,105 +3109,105 @@ 
 						 $a);
 	}
 
-	public function hue($color = null){
+	public function hue($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to hue must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to hue must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$c = $color->toHSL();
 		return new Less_Tree_Dimension(Less_Parser::round($c['h']));
 	}
 
-	public function saturation($color = null){
+	public function saturation($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to saturation must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to saturation must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$c = $color->toHSL();
 		return new Less_Tree_Dimension(Less_Parser::round($c['s'] * 100), '%');
 	}
 
-	public function lightness($color = null){
+	public function lightness($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to lightness must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to lightness must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$c = $color->toHSL();
 		return new Less_Tree_Dimension(Less_Parser::round($c['l'] * 100), '%');
 	}
 
-	public function hsvhue( $color = null ){
+	public function hsvhue($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to hsvhue must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to hsvhue must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsv = $color->toHSV();
-		return new Less_Tree_Dimension( Less_Parser::round($hsv['h']) );
+		return new Less_Tree_Dimension(Less_Parser::round($hsv['h']));
 	}
 
 
-	public function hsvsaturation( $color = null ){
+	public function hsvsaturation($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to hsvsaturation must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to hsvsaturation must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsv = $color->toHSV();
-		return new Less_Tree_Dimension( Less_Parser::round($hsv['s'] * 100), '%' );
+		return new Less_Tree_Dimension(Less_Parser::round($hsv['s'] * 100), '%');
 	}
 
-	public function hsvvalue( $color = null ){
+	public function hsvvalue($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to hsvvalue must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to hsvvalue must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsv = $color->toHSV();
-		return new Less_Tree_Dimension( Less_Parser::round($hsv['v'] * 100), '%' );
+		return new Less_Tree_Dimension(Less_Parser::round($hsv['v'] * 100), '%');
 	}
 
 	public function red($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to red must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to red must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return new Less_Tree_Dimension( $color->rgb[0] );
+		return new Less_Tree_Dimension($color->rgb[0]);
 	}
 
 	public function green($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to green must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to green must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return new Less_Tree_Dimension( $color->rgb[1] );
+		return new Less_Tree_Dimension($color->rgb[1]);
 	}
 
 	public function blue($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to blue must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to blue must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return new Less_Tree_Dimension( $color->rgb[2] );
+		return new Less_Tree_Dimension($color->rgb[2]);
 	}
 
-	public function alpha($color = null){
+	public function alpha($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to alpha must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to alpha must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$c = $color->toHSL();
 		return new Less_Tree_Dimension($c['a']);
 	}
 
-	public function luma ($color = null) {
+	public function luma($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to luma must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to luma must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return new Less_Tree_Dimension(Less_Parser::round( $color->luma() * $color->alpha * 100), '%');
+		return new Less_Tree_Dimension(Less_Parser::round($color->luma() * $color->alpha * 100), '%');
 	}
 
-	public function luminance( $color = null ){
+	public function luminance($color = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to luminance must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to luminance must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$luminance =
@@ -3215,10 +3215,10 @@ 
 		  + (0.7152 * $color->rgb[1] / 255)
 		  + (0.0722 * $color->rgb[2] / 255);
 
-		return new Less_Tree_Dimension(Less_Parser::round( $luminance * $color->alpha * 100), '%');
+		return new Less_Tree_Dimension(Less_Parser::round($luminance * $color->alpha * 100), '%');
 	}
 
-	public function saturate($color = null, $amount = null){
+	public function saturate($color = null, $amount = null) {
 		// filter: saturate(3.2);
 		// should be kept as is, so check for color
 		if ($color instanceof Less_Tree_Dimension) {
@@ -3226,10 +3226,10 @@ 
 		}
 
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to saturate must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to saturate must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to saturate must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to saturate must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3243,12 +3243,12 @@ 
 	/**
 	 * @param Less_Tree_Dimension $amount
 	 */
-	public function desaturate($color = null, $amount = null){
+	public function desaturate($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to desaturate must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to desaturate must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to desaturate must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to desaturate must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3261,12 +3261,12 @@ 
 
 
 
-	public function lighten($color = null, $amount=null){
+	public function lighten($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to lighten must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to lighten must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to lighten must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to lighten must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3277,12 +3277,12 @@ 
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
 
-	public function darken($color = null, $amount = null){
+	public function darken($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to darken must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to darken must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to darken must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to darken must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3292,12 +3292,12 @@ 
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
 
-	public function fadein($color = null, $amount = null){
+	public function fadein($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to fadein must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to fadein must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to fadein must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to fadein must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3306,12 +3306,12 @@ 
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
 
-	public function fadeout($color = null, $amount = null){
+	public function fadeout($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to fadeout must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to fadeout must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to fadeout must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to fadeout must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3320,12 +3320,12 @@ 
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
 
-	public function fade($color = null, $amount = null){
+	public function fade($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to fade must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to fade must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to fade must be a percentage' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to fade must be a percentage'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
@@ -3337,18 +3337,18 @@ 
 
 
 
-	public function spin($color = null, $amount = null){
+	public function spin($color = null, $amount = null) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to spin must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to spin must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$amount instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The second argument to spin must be a number' . ($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to spin must be a number'.($amount instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$hsl = $color->toHSL();
-		$hue = fmod($hsl['h'] + $amount->value, 360);
+		$hue = fmod($hsl['h']+$amount->value, 360);
 
-		$hsl['h'] = $hue < 0 ? 360 + $hue : $hue;
+		$hsl['h'] = $hue<0 ? 360+$hue : $hue;
 
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
@@ -3361,92 +3361,92 @@ 
 	/**
 	 * @param Less_Tree_Color $color1
 	 */
-	public function mix($color1 = null, $color2 = null, $weight = null){
+	public function mix($color1 = null, $color2 = null, $weight = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to mix must be a color' . ($color1 instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to mix must be a color'.($color1 instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to mix must be a color' . ($color2 instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to mix must be a color'.($color2 instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$weight) {
 			$weight = new Less_Tree_Dimension('50', '%');
 		}
 		if (!$weight instanceof Less_Tree_Dimension) {
-			throw new Less_Exception_Compiler('The third argument to contrast must be a percentage' . ($weight instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The third argument to contrast must be a percentage'.($weight instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		$p = $weight->value / 100.0;
-		$w = $p * 2 - 1;
+		$w = $p * 2-1;
 		$hsl1 = $color1->toHSL();
 		$hsl2 = $color2->toHSL();
-		$a = $hsl1['a'] - $hsl2['a'];
+		$a = $hsl1['a']-$hsl2['a'];
 
-		$w1 = (((($w * $a) == -1) ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2;
-		$w2 = 1 - $w1;
+		$w1 = (((($w * $a)==-1) ? $w : ($w+$a) / (1+$w * $a))+1) / 2;
+		$w2 = 1-$w1;
 
-		$rgb = array($color1->rgb[0] * $w1 + $color2->rgb[0] * $w2,
-					 $color1->rgb[1] * $w1 + $color2->rgb[1] * $w2,
-					 $color1->rgb[2] * $w1 + $color2->rgb[2] * $w2);
+		$rgb = array($color1->rgb[0] * $w1+$color2->rgb[0] * $w2,
+					 $color1->rgb[1] * $w1+$color2->rgb[1] * $w2,
+					 $color1->rgb[2] * $w1+$color2->rgb[2] * $w2);
 
-		$alpha = $color1->alpha * $p + $color2->alpha * (1 - $p);
+		$alpha = $color1->alpha * $p+$color2->alpha * (1-$p);
 
 		return new Less_Tree_Color($rgb, $alpha);
 	}
 
-	public function greyscale($color){
-		return $this->desaturate($color, new Less_Tree_Dimension(100,'%'));
+	public function greyscale($color) {
+		return $this->desaturate($color, new Less_Tree_Dimension(100, '%'));
 	}
 
 
-	public function contrast( $color, $dark = null, $light = null, $threshold = null){
+	public function contrast($color, $dark = null, $light = null, $threshold = null) {
 		// filter: contrast(3.2);
 		// should be kept as is, so check for color
 		if (!$color instanceof Less_Tree_Color) {
 			return null;
 		}
-		if( !$light ){
+		if (!$light) {
 			$light = $this->rgba(255, 255, 255, 1.0);
 		}
-		if( !$dark ){
+		if (!$dark) {
 			$dark = $this->rgba(0, 0, 0, 1.0);
 		}
 
 		if (!$dark instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to contrast must be a color' . ($dark instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to contrast must be a color'.($dark instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$light instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The third argument to contrast must be a color' . ($light instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The third argument to contrast must be a color'.($light instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		//Figure out which is actually light and dark!
-		if( $dark->luma() > $light->luma() ){
+		if ($dark->luma()>$light->luma()) {
 			$t = $light;
 			$light = $dark;
 			$dark = $t;
 		}
-		if( !$threshold ){
+		if (!$threshold) {
 			$threshold = 0.43;
-		} else {
+		}else {
 			$threshold = Less_Functions::number($threshold);
 		}
 
-		if( $color->luma() < $threshold ){
+		if ($color->luma()<$threshold) {
 			return $light;
-		} else {
+		}else {
 			return $dark;
 		}
 	}
 
-	public function e ($str){
-		if( is_string($str) ){
+	public function e($str) {
+		if (is_string($str)) {
 			return new Less_Tree_Anonymous($str);
 		}
 		return new Less_Tree_Anonymous($str instanceof Less_Tree_JavaScript ? $str->expression : $str->value);
 	}
 
-	public function escape ($str){
+	public function escape($str) {
 
-		$revert = array('%21'=>'!', '%2A'=>'*', '%27'=>"'",'%3F'=>'?','%26'=>'&','%2C'=>',','%2F'=>'/','%40'=>'@','%2B'=>'+','%24'=>'$');
+		$revert = array('%21'=>'!', '%2A'=>'*', '%27'=>"'", '%3F'=>'?', '%26'=>'&', '%2C'=>',', '%2F'=>'/', '%40'=>'@', '%2B'=>'+', '%24'=>'$');
 
 		return new Less_Tree_Anonymous(strtr(rawurlencode($str->value), $revert));
 	}
@@ -3456,29 +3456,29 @@ 
 	 * todo: This function will need some additional work to make it work the same as less.js
 	 *
 	 */
-	public function replace( $string, $pattern, $replacement, $flags = null ){
+	public function replace($string, $pattern, $replacement, $flags = null) {
 		$result = $string->value;
 
-		$expr = '/'.str_replace('/','\\/',$pattern->value).'/';
-		if( $flags && $flags->value){
+		$expr = '/'.str_replace('/', '\\/', $pattern->value).'/';
+		if ($flags && $flags->value) {
 			$expr .= self::replace_flags($flags->value);
 		}
 
-		$result = preg_replace($expr,$replacement->value,$result);
+		$result = preg_replace($expr, $replacement->value, $result);
 
 
-		if( property_exists($string,'quote') ){
-			return new Less_Tree_Quoted( $string->quote, $result, $string->escaped);
+		if (property_exists($string, 'quote')) {
+			return new Less_Tree_Quoted($string->quote, $result, $string->escaped);
 		}
-		return new Less_Tree_Quoted( '', $result );
+		return new Less_Tree_Quoted('', $result);
 	}
 
-	public static function replace_flags($flags){
-		$flags = str_split($flags,1);
+	public static function replace_flags($flags) {
+		$flags = str_split($flags, 1);
 		$new_flags = '';
 
-		foreach($flags as $flag){
-			switch($flag){
+		foreach ($flags as $flag) {
+			switch ($flag) {
 				case 'e':
 				case 'g':
 				break;
@@ -3492,91 +3492,91 @@ 
 		return $new_flags;
 	}
 
-	public function _percent(){
+	public function _percent() {
 		$string = func_get_arg(0);
 
 		$args = func_get_args();
 		array_shift($args);
 		$result = $string->value;
 
-		foreach($args as $arg){
-			if( preg_match('/%[sda]/i',$result, $token) ){
+		foreach ($args as $arg) {
+			if (preg_match('/%[sda]/i', $result, $token)) {
 				$token = $token[0];
 				$value = stristr($token, 's') ? $arg->value : $arg->toCSS();
 				$value = preg_match('/[A-Z]$/', $token) ? urlencode($value) : $value;
-				$result = preg_replace('/%[sda]/i',$value, $result, 1);
+				$result = preg_replace('/%[sda]/i', $value, $result, 1);
 			}
 		}
 		$result = str_replace('%%', '%', $result);
 
-		return new Less_Tree_Quoted( $string->quote , $result, $string->escaped);
+		return new Less_Tree_Quoted($string->quote, $result, $string->escaped);
 	}
 
-	public function unit( $val, $unit = null) {
-		if( !($val instanceof Less_Tree_Dimension) ){
-			throw new Less_Exception_Compiler('The first argument to unit must be a number' . ($val instanceof Less_Tree_Operation ? '. Have you forgotten parenthesis?' : '.') );
+	public function unit($val, $unit = null) {
+		if (!($val instanceof Less_Tree_Dimension)) {
+			throw new Less_Exception_Compiler('The first argument to unit must be a number'.($val instanceof Less_Tree_Operation ? '. Have you forgotten parenthesis?' : '.'));
 		}
 
-		if( $unit ){
-			if( $unit instanceof Less_Tree_Keyword ){
+		if ($unit) {
+			if ($unit instanceof Less_Tree_Keyword) {
 				$unit = $unit->value;
-			} else {
+			}else {
 				$unit = $unit->toCSS();
 			}
-		} else {
+		}else {
 			$unit = "";
 		}
-		return new Less_Tree_Dimension($val->value, $unit );
+		return new Less_Tree_Dimension($val->value, $unit);
 	}
 
-	public function convert($val, $unit){
+	public function convert($val, $unit) {
 		return $val->convertTo($unit->value);
 	}
 
 	public function round($n, $f = false) {
 
 		$fraction = 0;
-		if( $f !== false ){
+		if ($f!==false) {
 			$fraction = $f->value;
 		}
 
-		return $this->_math('Less_Parser::round',null, $n, $fraction);
+		return $this->_math('Less_Parser::round', null, $n, $fraction);
 	}
 
-	public function pi(){
+	public function pi() {
 		return new Less_Tree_Dimension(M_PI);
 	}
 
 	public function mod($a, $b) {
-		return new Less_Tree_Dimension( $a->value % $b->value, $a->unit);
+		return new Less_Tree_Dimension($a->value % $b->value, $a->unit);
 	}
 
 
 
 	public function pow($x, $y) {
-		if( is_numeric($x) && is_numeric($y) ){
+		if (is_numeric($x) && is_numeric($y)) {
 			$x = new Less_Tree_Dimension($x);
 			$y = new Less_Tree_Dimension($y);
-		}elseif( !($x instanceof Less_Tree_Dimension) || !($y instanceof Less_Tree_Dimension) ){
+		}elseif (!($x instanceof Less_Tree_Dimension) || !($y instanceof Less_Tree_Dimension)) {
 			throw new Less_Exception_Compiler('Arguments must be numbers');
 		}
 
-		return new Less_Tree_Dimension( pow($x->value, $y->value), $x->unit );
+		return new Less_Tree_Dimension(pow($x->value, $y->value), $x->unit);
 	}
 
 	// var mathFunctions = [{name:"ce ...
-	public function ceil( $n ){		return $this->_math('ceil', null, $n); }
-	public function floor( $n ){	return $this->_math('floor', null, $n); }
-	public function sqrt( $n ){		return $this->_math('sqrt', null, $n); }
-	public function abs( $n ){		return $this->_math('abs', null, $n); }
+	public function ceil($n) {		return $this->_math('ceil', null, $n); }
+	public function floor($n) {	return $this->_math('floor', null, $n); }
+	public function sqrt($n) {		return $this->_math('sqrt', null, $n); }
+	public function abs($n) {		return $this->_math('abs', null, $n); }
 
-	public function tan( $n ){		return $this->_math('tan', '', $n);	}
-	public function sin( $n ){		return $this->_math('sin', '', $n);	}
-	public function cos( $n ){		return $this->_math('cos', '', $n);	}
+	public function tan($n) {		return $this->_math('tan', '', $n); }
+	public function sin($n) {		return $this->_math('sin', '', $n); }
+	public function cos($n) {		return $this->_math('cos', '', $n); }
 
-	public function atan( $n ){		return $this->_math('atan', 'rad', $n);	}
-	public function asin( $n ){		return $this->_math('asin', 'rad', $n);	}
-	public function acos( $n ){		return $this->_math('acos', 'rad', $n);	}
+	public function atan($n) {		return $this->_math('atan', 'rad', $n); }
+	public function asin($n) {		return $this->_math('asin', 'rad', $n); }
+	public function acos($n) {		return $this->_math('acos', 'rad', $n); }
 
 	private function _math() {
 		$args = func_get_args();
@@ -3585,16 +3585,16 @@ 
 
 		if ($args[0] instanceof Less_Tree_Dimension) {
 
-			if( $unit === null ){
+			if ($unit===null) {
 				$unit = $args[0]->unit;
-			}else{
+			}else {
 				$args[0] = $args[0]->unify();
 			}
 			$args[0] = (float)$args[0]->value;
-			return new Less_Tree_Dimension( call_user_func_array($fn, $args), $unit);
-		} else if (is_numeric($args[0])) {
-			return call_user_func_array($fn,$args);
-		} else {
+			return new Less_Tree_Dimension(call_user_func_array($fn, $args), $unit);
+		}else if (is_numeric($args[0])) {
+			return call_user_func_array($fn, $args);
+		}else {
 			throw new Less_Exception_Compiler("math functions take numbers as parameters");
 		}
 	}
@@ -3602,12 +3602,12 @@ 
 	/**
 	 * @param boolean $isMin
 	 */
-	private function _minmax( $isMin, $args ){
+	private function _minmax($isMin, $args) {
 
 		$arg_count = count($args);
 
-		if( $arg_count < 1 ){
-			throw new Less_Exception_Compiler( 'one or more arguments required');
+		if ($arg_count<1) {
+			throw new Less_Exception_Compiler('one or more arguments required');
 		}
 
 		$j = null;
@@ -3615,49 +3615,49 @@ 
 		$unitStatic = null;
 
 
-		$order = array();	// elems only contains original argument values.
-		$values = array();	// key is the unit.toString() for unified tree.Dimension values,
+		$order = array(); // elems only contains original argument values.
+		$values = array(); // key is the unit.toString() for unified tree.Dimension values,
 							// value is the index into the order array.
 
 
-		for( $i = 0; $i < $arg_count; $i++ ){
+		for ($i = 0; $i<$arg_count; $i++) {
 			$current = $args[$i];
-			if( !($current instanceof Less_Tree_Dimension) ){
-				if( is_array($args[$i]->value) ){
+			if (!($current instanceof Less_Tree_Dimension)) {
+				if (is_array($args[$i]->value)) {
 					$args[] = $args[$i]->value;
 				}
 				continue;
 			}
 
-			if( $current->unit->toString() === '' && !$unitClone ){
+			if ($current->unit->toString()==='' && !$unitClone) {
 				$temp = new Less_Tree_Dimension($current->value, $unitClone);
 				$currentUnified = $temp->unify();
-			}else{
+			}else {
 				$currentUnified = $current->unify();
 			}
 
-			if( $currentUnified->unit->toString() === "" && !$unitStatic ){
+			if ($currentUnified->unit->toString()==="" && !$unitStatic) {
 				$unit = $unitStatic;
-			}else{
+			}else {
 				$unit = $currentUnified->unit->toString();
 			}
 
-			if( $unit !== '' && !$unitStatic || $unit !== '' && $order[0]->unify()->unit->toString() === "" ){
+			if ($unit!=='' && !$unitStatic || $unit!=='' && $order[0]->unify()->unit->toString()==="") {
 				$unitStatic = $unit;
 			}
 
-			if( $unit != '' && !$unitClone ){
+			if ($unit!='' && !$unitClone) {
 				$unitClone = $current->unit->toString();
 			}
 
-			if( isset($values['']) && $unit !== '' && $unit === $unitStatic ){
+			if (isset($values['']) && $unit!=='' && $unit===$unitStatic) {
 				$j = $values[''];
-			}elseif( isset($values[$unit]) ){
+			}elseif (isset($values[$unit])) {
 				$j = $values[$unit];
-			}else{
+			}else {
 
-				if( $unitStatic && $unit !== $unitStatic ){
-					throw new Less_Exception_Compiler( 'incompatible types');
+				if ($unitStatic && $unit!==$unitStatic) {
+					throw new Less_Exception_Compiler('incompatible types');
 				}
 				$values[$unit] = count($order);
 				$order[] = $current;
@@ -3665,44 +3665,44 @@ 
 			}
 
 
-			if( $order[$j]->unit->toString() === "" && $unitClone ){
-				$temp = new Less_Tree_Dimension( $order[$j]->value, $unitClone);
+			if ($order[$j]->unit->toString()==="" && $unitClone) {
+				$temp = new Less_Tree_Dimension($order[$j]->value, $unitClone);
 				$referenceUnified = $temp->unify();
-			}else{
+			}else {
 				$referenceUnified = $order[$j]->unify();
 			}
-			if( ($isMin && $currentUnified->value < $referenceUnified->value) || (!$isMin && $currentUnified->value > $referenceUnified->value) ){
+			if (($isMin && $currentUnified->value<$referenceUnified->value) || (!$isMin && $currentUnified->value>$referenceUnified->value)) {
 				$order[$j] = $current;
 			}
 		}
 
-		if( count($order) == 1 ){
+		if (count($order)==1) {
 			return $order[0];
 		}
 		$args = array();
-		foreach($order as $a){
+		foreach ($order as $a) {
 			$args[] = $a->toCSS($this->env);
 		}
-		return new Less_Tree_Anonymous( ($isMin?'min(':'max(') . implode(Less_Environment::$_outputMap[','],$args).')');
+		return new Less_Tree_Anonymous(($isMin ? 'min(' : 'max(').implode(Less_Environment::$_outputMap[','], $args).')');
 	}
 
-	public function min(){
+	public function min() {
 		$args = func_get_args();
-		return $this->_minmax( true, $args );
+		return $this->_minmax(true, $args);
 	}
 
-	public function max(){
+	public function max() {
 		$args = func_get_args();
-		return $this->_minmax( false, $args );
+		return $this->_minmax(false, $args);
 	}
 
-	public function getunit($n){
+	public function getunit($n) {
 		return new Less_Tree_Anonymous($n->unit);
 	}
 
 	public function argb($color) {
 		if (!$color instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to argb must be a color' . ($dark instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to argb must be a color'.($dark instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
 		return new Less_Tree_Anonymous($color->toARGB());
@@ -3714,17 +3714,17 @@ 
 
 	public function color($n) {
 
-		if( $n instanceof Less_Tree_Quoted ){
+		if ($n instanceof Less_Tree_Quoted) {
 			$colorCandidate = $n->value;
 			$returnColor = Less_Tree_Color::fromKeyword($colorCandidate);
-			if( $returnColor ){
+			if ($returnColor) {
 				return $returnColor;
 			}
-			if( preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/',$colorCandidate) ){
+			if (preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/', $colorCandidate)) {
 				return new Less_Tree_Color(substr($colorCandidate, 1));
 			}
 			throw new Less_Exception_Compiler("argument must be a color keyword or 3/6 digit hex e.g. #FFF");
-		} else {
+		}else {
 			throw new Less_Exception_Compiler("argument must be a string");
 		}
 	}
@@ -3765,8 +3765,8 @@ 
 	/**
 	 * @param string $unit
 	 */
-	public function isunit( $n, $unit ){
-		return ($n instanceof Less_Tree_Dimension) && $n->unit->is( ( property_exists($unit,'value') ? $unit->value : $unit) ) ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
+	public function isunit($n, $unit) {
+		return ($n instanceof Less_Tree_Dimension) && $n->unit->is((property_exists($unit, 'value') ? $unit->value : $unit)) ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
 	}
 
 	/**
@@ -3777,64 +3777,64 @@ 
 	}
 
 	public function tint($color, $amount) {
-		return $this->mix( $this->rgb(255,255,255), $color, $amount);
+		return $this->mix($this->rgb(255, 255, 255), $color, $amount);
 	}
 
 	public function shade($color, $amount) {
 		return $this->mix($this->rgb(0, 0, 0), $color, $amount);
 	}
 
-	public function extract($values, $index ){
-		$index = (int)$index->value - 1; // (1-based index)
+	public function extract($values, $index) {
+		$index = (int)$index->value-1; // (1-based index)
 		// handle non-array values as an array of length 1
 		// return 'undefined' if index is invalid
-		if( property_exists($values,'value') && is_array($values->value) ){
-			if( isset($values->value[$index]) ){
+		if (property_exists($values, 'value') && is_array($values->value)) {
+			if (isset($values->value[$index])) {
 				return $values->value[$index];
 			}
 			return null;
 
-		}elseif( (int)$index === 0 ){
+		}elseif ((int)$index===0) {
 			return $values;
 		}
 
 		return null;
 	}
 
-	public function length($values){
-		$n = (property_exists($values,'value') && is_array($values->value)) ? count($values->value) : 1;
+	public function length($values) {
+		$n = (property_exists($values, 'value') && is_array($values->value)) ? count($values->value) : 1;
 		return new Less_Tree_Dimension($n);
 	}
 
-	public function datauri($mimetypeNode, $filePathNode = null ) {
+	public function datauri($mimetypeNode, $filePathNode = null) {
 
-		$filePath = ( $filePathNode ? $filePathNode->value : null );
+		$filePath = ($filePathNode ? $filePathNode->value : null);
 		$mimetype = $mimetypeNode->value;
 
 		$args = 2;
-		if( !$filePath ){
+		if (!$filePath) {
 			$filePath = $mimetype;
 			$args = 1;
 		}
 
-		$filePath = str_replace('\\','/',$filePath);
-		if( Less_Environment::isPathRelative($filePath) ){
+		$filePath = str_replace('\\', '/', $filePath);
+		if (Less_Environment::isPathRelative($filePath)) {
 
-			if( Less_Parser::$options['relativeUrls'] ){
+			if (Less_Parser::$options['relativeUrls']) {
 				$temp = $this->currentFileInfo['currentDirectory'];
-			} else {
+			}else {
 				$temp = $this->currentFileInfo['entryPath'];
 			}
 
-			if( !empty($temp) ){
-				$filePath = Less_Environment::normalizePath(rtrim($temp,'/').'/'.$filePath);
+			if (!empty($temp)) {
+				$filePath = Less_Environment::normalizePath(rtrim($temp, '/').'/'.$filePath);
 			}
 
 		}
 
 
 		// detect the mimetype if not given
-		if( $args < 2 ){
+		if ($args<2) {
 
 			/* incomplete
 			$mime = require('mime');
@@ -3849,17 +3849,17 @@ 
 			$mimetype = Less_Mime::lookup($filePath);
 
 			$charset = Less_Mime::charsets_lookup($mimetype);
-			$useBase64 = !in_array($charset,array('US-ASCII', 'UTF-8'));
-			if( $useBase64 ){ $mimetype .= ';base64'; }
+			$useBase64 = !in_array($charset, array('US-ASCII', 'UTF-8'));
+			if ($useBase64) { $mimetype .= ';base64'; }
 
-		}else{
-			$useBase64 = preg_match('/;base64$/',$mimetype);
+		}else {
+			$useBase64 = preg_match('/;base64$/', $mimetype);
 		}
 
 
-		if( file_exists($filePath) ){
+		if (file_exists($filePath)) {
 			$buf = @file_get_contents($filePath);
-		}else{
+		}else {
 			$buf = false;
 		}
 
@@ -3867,38 +3867,38 @@ 
 		// IE8 cannot handle a data-uri larger than 32KB. If this is exceeded
 		// and the --ieCompat flag is enabled, return a normal url() instead.
 		$DATA_URI_MAX_KB = 32;
-		$fileSizeInKB = round( strlen($buf) / 1024 );
-		if( $fileSizeInKB >= $DATA_URI_MAX_KB ){
-			$url = new Less_Tree_Url( ($filePathNode ? $filePathNode : $mimetypeNode), $this->currentFileInfo);
+		$fileSizeInKB = round(strlen($buf) / 1024);
+		if ($fileSizeInKB>=$DATA_URI_MAX_KB) {
+			$url = new Less_Tree_Url(($filePathNode ? $filePathNode : $mimetypeNode), $this->currentFileInfo);
 			return $url->compile($this);
 		}
 
-		if( $buf ){
+		if ($buf) {
 			$buf = $useBase64 ? base64_encode($buf) : rawurlencode($buf);
-			$filePath = '"data:' . $mimetype . ',' . $buf . '"';
+			$filePath = '"data:'.$mimetype.','.$buf.'"';
 		}
 
-		return new Less_Tree_Url( new Less_Tree_Anonymous($filePath) );
+		return new Less_Tree_Url(new Less_Tree_Anonymous($filePath));
 	}
 
 	//svg-gradient
-	public function svggradient( $direction ){
+	public function svggradient($direction) {
 
 		$throw_message = 'svg-gradient expects direction, start_color [start_position], [color position,]..., end_color [end_position]';
 		$arguments = func_get_args();
 
-		if( count($arguments) < 3 ){
-			throw new Less_Exception_Compiler( $throw_message );
+		if (count($arguments)<3) {
+			throw new Less_Exception_Compiler($throw_message);
 		}
 
-		$stops = array_slice($arguments,1);
+		$stops = array_slice($arguments, 1);
 		$gradientType = 'linear';
 		$rectangleDimension = 'x="0" y="0" width="1" height="1"';
 		$useBase64 = true;
 		$directionValue = $direction->toCSS();
 
 
-		switch( $directionValue ){
+		switch ($directionValue) {
 			case "to bottom":
 				$gradientDirectionSvg = 'x1="0%" y1="0%" x2="0%" y2="100%"';
 				break;
@@ -3918,46 +3918,46 @@ 
 				$rectangleDimension = 'x="-50" y="-50" width="101" height="101"';
 				break;
 			default:
-				throw new Less_Exception_Compiler( "svg-gradient direction must be 'to bottom', 'to right', 'to bottom right', 'to top right' or 'ellipse at center'" );
+				throw new Less_Exception_Compiler("svg-gradient direction must be 'to bottom', 'to right', 'to bottom right', 'to top right' or 'ellipse at center'");
 		}
 
-		$returner = '<?xml version="1.0" ?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">' .
-			'<' . $gradientType . 'Gradient id="gradient" gradientUnits="userSpaceOnUse" ' . $gradientDirectionSvg . '>';
+		$returner = '<?xml version="1.0" ?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">'.
+			'<'.$gradientType.'Gradient id="gradient" gradientUnits="userSpaceOnUse" '.$gradientDirectionSvg.'>';
 
-		for( $i = 0; $i < count($stops); $i++ ){
-			if( is_object($stops[$i]) && property_exists($stops[$i],'value') ){
+		for ($i = 0; $i<count($stops); $i++) {
+			if (is_object($stops[$i]) && property_exists($stops[$i], 'value')) {
 				$color = $stops[$i]->value[0];
 				$position = $stops[$i]->value[1];
-			}else{
+			}else {
 				$color = $stops[$i];
 				$position = null;
 			}
 
-			if( !($color instanceof Less_Tree_Color) || (!(($i === 0 || $i+1 === count($stops)) && $position === null) && !($position instanceof Less_Tree_Dimension)) ){
-				throw new Less_Exception_Compiler( $throw_message );
+			if (!($color instanceof Less_Tree_Color) || (!(($i===0 || $i+1===count($stops)) && $position===null) && !($position instanceof Less_Tree_Dimension))) {
+				throw new Less_Exception_Compiler($throw_message);
 			}
-			if( $position ){
+			if ($position) {
 				$positionValue = $position->toCSS();
-			}elseif( $i === 0 ){
+			}elseif ($i===0) {
 				$positionValue = '0%';
-			}else{
+			}else {
 				$positionValue = '100%';
 			}
 			$alpha = $color->alpha;
-			$returner .= '<stop offset="' . $positionValue . '" stop-color="' . $color->toRGB() . '"' . ($alpha < 1 ? ' stop-opacity="' . $alpha . '"' : '') . '/>';
+			$returner .= '<stop offset="'.$positionValue.'" stop-color="'.$color->toRGB().'"'.($alpha<1 ? ' stop-opacity="'.$alpha.'"' : '').'/>';
 		}
 
-		$returner .= '</' . $gradientType . 'Gradient><rect ' . $rectangleDimension . ' fill="url(#gradient)" /></svg>';
+		$returner .= '</'.$gradientType.'Gradient><rect '.$rectangleDimension.' fill="url(#gradient)" /></svg>';
 
 
-		if( $useBase64 ){
+		if ($useBase64) {
 			$returner = "'data:image/svg+xml;base64,".base64_encode($returner)."'";
-		}else{
+		}else {
 			$returner = "'data:image/svg+xml,".$returner."'";
 		}
 
-		return new Less_Tree_URL( new Less_Tree_Anonymous( $returner ) );
+		return new Less_Tree_URL(new Less_Tree_Anonymous($returner));
 	}
 
 
@@ -3967,7 +3967,7 @@ 
 	 * @param string $string The string to encode
 	 * @return string The encoded string
 	 */
-	public static function encodeURIComponent($string){
+	public static function encodeURIComponent($string) {
 		$revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
 		return strtr(rawurlencode($string), $revert);
 	}
@@ -3976,18 +3976,18 @@ 
 	// Color Blending
 	// ref: http://www.w3.org/TR/compositing-1
 
-	public function colorBlend( $mode, $color1, $color2 ){
-		$ab = $color1->alpha;	// backdrop
-		$as = $color2->alpha;	// source
-		$r = array();			// result
+	public function colorBlend($mode, $color1, $color2) {
+		$ab = $color1->alpha; // backdrop
+		$as = $color2->alpha; // source
+		$r = array(); // result
 
-		$ar = $as + $ab * (1 - $as);
-		for( $i = 0; $i < 3; $i++ ){
+		$ar = $as+$ab * (1-$as);
+		for ($i = 0; $i<3; $i++) {
 			$cb = $color1->rgb[$i] / 255;
 			$cs = $color2->rgb[$i] / 255;
-			$cr = call_user_func( $mode, $cb, $cs );
-			if( $ar ){
-				$cr = ($as * $cs + $ab * ($cb - $as * ($cb + $cs - $cr))) / $ar;
+			$cr = call_user_func($mode, $cb, $cs);
+			if ($ar) {
+				$cr = ($as * $cs+$ab * ($cb-$as * ($cb+$cs-$cr))) / $ar;
 			}
 			$r[$i] = $cr * 255;
 		}
@@ -3995,150 +3995,150 @@ 
 		return new Less_Tree_Color($r, $ar);
 	}
 
-	public function multiply($color1 = null, $color2 = null ){
+	public function multiply($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to multiply must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to multiply must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to multiply must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to multiply must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendMultiply'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendMultiply'), $color1, $color2);
 	}
 
-	private function colorBlendMultiply($cb, $cs){
+	private function colorBlendMultiply($cb, $cs) {
 		return $cb * $cs;
 	}
 
-	public function screen($color1 = null, $color2 = null ){
+	public function screen($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to screen must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to screen must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to screen must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to screen must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendScreen'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendScreen'), $color1, $color2);
 	}
 
-	private function colorBlendScreen( $cb, $cs){
-		return $cb + $cs - $cb * $cs;
+	private function colorBlendScreen($cb, $cs) {
+		return $cb+$cs-$cb * $cs;
 	}
 
-	public function overlay($color1 = null, $color2 = null){
+	public function overlay($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to overlay must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to overlay must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to overlay must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to overlay must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendOverlay'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendOverlay'), $color1, $color2);
 	}
 
-	private function colorBlendOverlay($cb, $cs ){
+	private function colorBlendOverlay($cb, $cs) {
 		$cb *= 2;
-		return ($cb <= 1)
+		return ($cb<=1)
 			? $this->colorBlendMultiply($cb, $cs)
-			: $this->colorBlendScreen($cb - 1, $cs);
+			: $this->colorBlendScreen($cb-1, $cs);
 	}
 
-	public function softlight($color1 = null, $color2 = null){
+	public function softlight($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to softlight must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to softlight must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to softlight must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to softlight must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendSoftlight'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendSoftlight'), $color1, $color2);
 	}
 
-	private function colorBlendSoftlight($cb, $cs ){
+	private function colorBlendSoftlight($cb, $cs) {
 		$d = 1;
 		$e = $cb;
-		if( $cs > 0.5 ){
+		if ($cs>0.5) {
 			$e = 1;
-			$d = ($cb > 0.25) ? sqrt($cb)
-				: ((16 * $cb - 12) * $cb + 4) * $cb;
+			$d = ($cb>0.25) ? sqrt($cb)
+				: ((16 * $cb-12) * $cb+4) * $cb;
 		}
-		return $cb - (1 - 2 * $cs) * $e * ($d - $cb);
+		return $cb-(1-2 * $cs) * $e * ($d-$cb);
 	}
 
-	public function hardlight($color1 = null, $color2 = null){
+	public function hardlight($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to hardlight must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to hardlight must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to hardlight must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to hardlight must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendHardlight'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendHardlight'), $color1, $color2);
 	}
 
-	private function colorBlendHardlight( $cb, $cs ){
+	private function colorBlendHardlight($cb, $cs) {
 		return $this->colorBlendOverlay($cs, $cb);
 	}
 
 	public function difference($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to difference must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to difference must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to difference must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to difference must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendDifference'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendDifference'), $color1, $color2);
 	}
 
-	private function colorBlendDifference( $cb, $cs ){
-		return abs($cb - $cs);
+	private function colorBlendDifference($cb, $cs) {
+		return abs($cb-$cs);
 	}
 
-	public function exclusion( $color1 = null, $color2 = null ){
+	public function exclusion($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to exclusion must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to exclusion must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to exclusion must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to exclusion must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendExclusion'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendExclusion'), $color1, $color2);
 	}
 
-	private function colorBlendExclusion( $cb, $cs ){
-		return $cb + $cs - 2 * $cb * $cs;
+	private function colorBlendExclusion($cb, $cs) {
+		return $cb+$cs-2 * $cb * $cs;
 	}
 
-	public function average($color1 = null, $color2 = null){
+	public function average($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to average must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to average must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to average must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to average must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendAverage'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendAverage'), $color1, $color2);
 	}
 
 	// non-w3c functions:
-	public function colorBlendAverage($cb, $cs ){
-		return ($cb + $cs) / 2;
+	public function colorBlendAverage($cb, $cs) {
+		return ($cb+$cs) / 2;
 	}
 
-	public function negation($color1 = null, $color2 = null ){
+	public function negation($color1 = null, $color2 = null) {
 		if (!$color1 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The first argument to negation must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The first argument to negation must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 		if (!$color2 instanceof Less_Tree_Color) {
-			throw new Less_Exception_Compiler('The second argument to negation must be a color' . ($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : '') );
+			throw new Less_Exception_Compiler('The second argument to negation must be a color'.($color instanceof Less_Tree_Expression ? ' (did you forgot commas?)' : ''));
 		}
 
-		return $this->colorBlend( array($this,'colorBlendNegation'),  $color1, $color2 );
+		return $this->colorBlend(array($this, 'colorBlendNegation'), $color1, $color2);
 	}
 
-	public function colorBlendNegation($cb, $cs){
-		return 1 - abs($cb + $cs - 1);
+	public function colorBlendNegation($cb, $cs) {
+		return 1-abs($cb+$cs-1);
 	}
 
 	// ~ End of Color Blending
@@ -4152,7 +4152,7 @@ 
  * @package Less
  * @subpackage node
  */
-class Less_Mime{
+class Less_Mime {
 
 	// this map is intentionally incomplete
 	// if you want more, install 'mime' dep
@@ -4170,19 +4170,19 @@ 
 	        '.svg' => 'image/svg+xml',
 	        );
 
-	public static function lookup( $filepath ){
-		$parts = explode('.',$filepath);
+	public static function lookup($filepath) {
+		$parts = explode('.', $filepath);
 		$ext = '.'.strtolower(array_pop($parts));
 
-		if( !isset(self::$_types[$ext]) ){
+		if (!isset(self::$_types[$ext])) {
 			return null;
 		}
 		return self::$_types[$ext];
 	}
 
-	public static function charsets_lookup( $type = null ){
+	public static function charsets_lookup($type = null) {
 		// assumes all text types are UTF-8
-		return $type && preg_match('/^text\//',$type) ? 'UTF-8' : '';
+		return $type && preg_match('/^text\//', $type) ? 'UTF-8' : '';
 	}
 }
  
@@ -4193,11 +4193,11 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree{
+class Less_Tree {
 
 	public $cache_string;
 
-	public function toCSS(){
+	public function toCSS() {
 		$output = new Less_Output();
 		$this->genCSS($output);
 		return $output->toString();
@@ -4210,51 +4210,51 @@ 
      * @param Less_Output $output The output
      * @return void
      */
-    public function genCSS($output){}
+    public function genCSS($output) {}
 
 
 	/**
 	 * @param Less_Tree_Ruleset[] $rules
 	 */
-	public static function outputRuleset( $output, $rules ){
+	public static function outputRuleset($output, $rules) {
 
 		$ruleCnt = count($rules);
 		Less_Environment::$tabLevel++;
 
 
 		// Compressed
-		if( Less_Parser::$options['compress'] ){
+		if (Less_Parser::$options['compress']) {
 			$output->add('{');
-			for( $i = 0; $i < $ruleCnt; $i++ ){
-				$rules[$i]->genCSS( $output );
+			for ($i = 0; $i<$ruleCnt; $i++) {
+				$rules[$i]->genCSS($output);
 			}
 
-			$output->add( '}' );
+			$output->add('}');
 			Less_Environment::$tabLevel--;
 			return;
 		}
 
 
 		// Non-compressed
-		$tabSetStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel-1 );
+		$tabSetStr = "\n".str_repeat('  ', Less_Environment::$tabLevel-1);
 		$tabRuleStr = $tabSetStr.'  ';
 
-		$output->add( " {" );
-		for($i = 0; $i < $ruleCnt; $i++ ){
-			$output->add( $tabRuleStr );
-			$rules[$i]->genCSS( $output );
+		$output->add(" {");
+		for ($i = 0; $i<$ruleCnt; $i++) {
+			$output->add($tabRuleStr);
+			$rules[$i]->genCSS($output);
 		}
 		Less_Environment::$tabLevel--;
-		$output->add( $tabSetStr.'}' );
+		$output->add($tabSetStr.'}');
 
 	}
 
-	public function accept($visitor){}
+	public function accept($visitor) {}
 
 
-	public static function ReferencedArray($rules){
-		foreach($rules as $rule){
-			if( method_exists($rule, 'markReferenced') ){
+	public static function ReferencedArray($rules) {
+		foreach ($rules as $rule) {
+			if (method_exists($rule, 'markReferenced')) {
 				$rule->markReferenced();
 			}
 		}
@@ -4264,11 +4264,11 @@ 
 	/**
 	 * Requires php 5.3+
 	 */
-	public static function __set_state($args){
+	public static function __set_state($args) {
 
 		$class = get_called_class();
-		$obj = new $class(null,null,null,null);
-		foreach($args as $key => $val){
+		$obj = new $class(null, null, null, null);
+		foreach ($args as $key => $val) {
 			$obj->$key = $val;
 		}
 		return $obj;
@@ -4282,7 +4282,7 @@ 
  * @package Less
  * @subpackage output
  */
-class Less_Output{
+class Less_Output {
 
 	/**
 	 * Output holder
@@ -4299,7 +4299,7 @@ 
 	 * @param integer $index The index
 	 * @param mixed $mapLines
 	 */
-	public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null){
+	public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null) {
 		$this->strs[] = $chunk;
 	}
 
@@ -4308,8 +4308,8 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isEmpty(){
-		return count($this->strs) === 0;
+	public function isEmpty() {
+		return count($this->strs)===0;
 	}
 
 
@@ -4318,8 +4318,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function toString(){
-		return implode('',$this->strs);
+	public function toString() {
+		return implode('', $this->strs);
 	}
 
 } 
@@ -4330,43 +4330,43 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor{
+class Less_Visitor {
 
 	protected $methods = array();
 	protected $_visitFnCache = array();
 
-	public function __construct(){
+	public function __construct() {
 		$this->_visitFnCache = get_class_methods(get_class($this));
 		$this->_visitFnCache = array_flip($this->_visitFnCache);
 	}
 
-	public function visitObj( $node ){
+	public function visitObj($node) {
 
 		$funcName = 'visit'.$node->type;
-		if( isset($this->_visitFnCache[$funcName]) ){
+		if (isset($this->_visitFnCache[$funcName])) {
 
 			$visitDeeper = true;
-			$this->$funcName( $node, $visitDeeper );
+			$this->$funcName($node, $visitDeeper);
 
-			if( $visitDeeper ){
+			if ($visitDeeper) {
 				$node->accept($this);
 			}
 
-			$funcName = $funcName . "Out";
-			if( isset($this->_visitFnCache[$funcName]) ){
-				$this->$funcName( $node );
+			$funcName = $funcName."Out";
+			if (isset($this->_visitFnCache[$funcName])) {
+				$this->$funcName($node);
 			}
 
-		}else{
+		}else {
 			$node->accept($this);
 		}
 
 		return $node;
 	}
 
-	public function visitArray( $nodes ){
+	public function visitArray($nodes) {
 
-		array_map( array($this,'visitObj'), $nodes);
+		array_map(array($this, 'visitObj'), $nodes);
 		return $nodes;
 	}
 }
@@ -4379,43 +4379,43 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_VisitorReplacing extends Less_Visitor{
+class Less_VisitorReplacing extends Less_Visitor {
 
-	public function visitObj( $node ){
+	public function visitObj($node) {
 
 		$funcName = 'visit'.$node->type;
-		if( isset($this->_visitFnCache[$funcName]) ){
+		if (isset($this->_visitFnCache[$funcName])) {
 
 			$visitDeeper = true;
-			$node = $this->$funcName( $node, $visitDeeper );
+			$node = $this->$funcName($node, $visitDeeper);
 
-			if( $node ){
-				if( $visitDeeper && is_object($node) ){
+			if ($node) {
+				if ($visitDeeper && is_object($node)) {
 					$node->accept($this);
 				}
 
-				$funcName = $funcName . "Out";
-				if( isset($this->_visitFnCache[$funcName]) ){
-					$this->$funcName( $node );
+				$funcName = $funcName."Out";
+				if (isset($this->_visitFnCache[$funcName])) {
+					$this->$funcName($node);
 				}
 			}
 
-		}else{
+		}else {
 			$node->accept($this);
 		}
 
 		return $node;
 	}
 
-	public function visitArray( $nodes ){
+	public function visitArray($nodes) {
 
 		$newNodes = array();
-		foreach($nodes as $node){
+		foreach ($nodes as $node) {
 			$evald = $this->visitObj($node);
-			if( $evald ){
-				if( is_array($evald) ){
-					self::flatten($evald,$newNodes);
-				}else{
+			if ($evald) {
+				if (is_array($evald)) {
+					self::flatten($evald, $newNodes);
+				}else {
 					$newNodes[] = $evald;
 				}
 			}
@@ -4423,18 +4423,18 @@ 
 		return $newNodes;
 	}
 
-	public function flatten( $arr, &$out ){
+	public function flatten($arr, &$out) {
 
-		foreach($arr as $item){
-			if( !is_array($item) ){
+		foreach ($arr as $item) {
+			if (!is_array($item)) {
 				$out[] = $item;
 				continue;
 			}
 
-			foreach($item as $nestedItem){
-				if( is_array($nestedItem) ){
-					self::flatten( $nestedItem, $out);
-				}else{
+			foreach ($item as $nestedItem) {
+				if (is_array($nestedItem)) {
+					self::flatten($nestedItem, $out);
+				}else {
 					$out[] = $nestedItem;
 				}
 			}
@@ -4481,8 +4481,8 @@ 
 	 * @param array|object $options
 	 *
 	 */
-	public function setOptions($options){
-		$options = array_intersect_key($options,$this->defaultOptions);
+	public function setOptions($options) {
+		$options = array_intersect_key($options, $this->defaultOptions);
 		$this->options = array_merge($this->defaultOptions, $this->options, $options);
 	}
 
@@ -4496,8 +4496,8 @@ 
 	 * @param mixed $default Default value if confiuration of $name is not present
 	 * @return mixed
 	 */
-	public function getOption($name, $default = null){
-		if(isset($this->options[$name])){
+	public function getOption($name, $default = null) {
+		if (isset($this->options[$name])) {
 			return $this->options[$name];
 		}
 		return $default;
@@ -4510,7 +4510,7 @@ 
 	 * @param string $name
 	 * @param mixed $value
 	 */
-	public function setOption($name, $value){
+	public function setOption($name, $value) {
 		$this->options[$name] = $value;
 	}
 
@@ -4522,11 +4522,11 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Alpha extends Less_Tree{
+class Less_Tree_Alpha extends Less_Tree {
 	public $value;
 	public $type = 'Alpha';
 
-	public function __construct($val){
+	public function __construct($val) {
 		$this->value = $val;
 	}
 
@@ -4534,9 +4534,9 @@ 
 	//	$this->value = $visitor->visit( $this->value );
 	//}
 
-	public function compile($env){
+	public function compile($env) {
 
-		if( is_object($this->value) ){
+		if (is_object($this->value)) {
 			$this->value = $this->value->compile($env);
 		}
 
@@ -4546,21 +4546,21 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 
-		$output->add( "alpha(opacity=" );
+		$output->add("alpha(opacity=");
 
-		if( is_string($this->value) ){
-			$output->add( $this->value );
-		}else{
-			$this->value->genCSS( $output);
+		if (is_string($this->value)) {
+			$output->add($this->value);
+		}else {
+			$this->value->genCSS($output);
 		}
 
-		$output->add( ')' );
+		$output->add(')');
 	}
 
-	public function toCSS(){
-		return "alpha(opacity=" . (is_string($this->value) ? $this->value : $this->value->toCSS()) . ")";
+	public function toCSS() {
+		return "alpha(opacity=".(is_string($this->value) ? $this->value : $this->value->toCSS()).")";
 	}
 
 
@@ -4572,7 +4572,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Anonymous extends Less_Tree{
+class Less_Tree_Anonymous extends Less_Tree {
 	public $value;
 	public $quote;
 	public $index;
@@ -4584,40 +4584,40 @@ 
 	 * @param integer $index
 	 * @param boolean $mapLines
 	 */
-	public function __construct($value, $index = null, $currentFileInfo = null, $mapLines = null ){
+	public function __construct($value, $index = null, $currentFileInfo = null, $mapLines = null) {
 		$this->value = $value;
 		$this->index = $index;
 		$this->mapLines = $mapLines;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-	public function compile(){
+	public function compile() {
 		return new Less_Tree_Anonymous($this->value, $this->index, $this->currentFileInfo, $this->mapLines);
 	}
 
-    public function compare($x){
-		if( !is_object($x) ){
+    public function compare($x) {
+		if (!is_object($x)) {
 			return -1;
 		}
 
 		$left = $this->toCSS();
 		$right = $x->toCSS();
 
-		if( $left === $right ){
+		if ($left===$right) {
 			return 0;
 		}
 
-		return $left < $right ? -1 : 1;
+		return $left<$right ? -1 : 1;
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
-		$output->add( $this->value, $this->currentFileInfo, $this->index, $this->mapLines );
+	public function genCSS($output) {
+		$output->add($this->value, $this->currentFileInfo, $this->index, $this->mapLines);
 	}
 
-	public function toCSS(){
+	public function toCSS() {
 		return $this->value;
 	}
 
@@ -4630,7 +4630,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Assignment extends Less_Tree{
+class Less_Tree_Assignment extends Less_Tree {
 
 	public $key;
 	public $value;
@@ -4641,24 +4641,24 @@ 
 		$this->value = $val;
 	}
 
-    public function accept( $visitor ){
-		$this->value = $visitor->visitObj( $this->value );
+    public function accept($visitor) {
+		$this->value = $visitor->visitObj($this->value);
 	}
 
 	public function compile($env) {
-		return new Less_Tree_Assignment( $this->key, $this->value->compile($env));
+		return new Less_Tree_Assignment($this->key, $this->value->compile($env));
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
-		$output->add( $this->key . '=' );
-		$this->value->genCSS( $output );
+	public function genCSS($output) {
+		$output->add($this->key.'=');
+		$this->value->genCSS($output);
 	}
 
-	public function toCss(){
-		return $this->key . '=' . $this->value->toCSS();
+	public function toCss() {
+		return $this->key.'='.$this->value->toCSS();
 	}
 }
  
@@ -4669,30 +4669,30 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Attribute extends Less_Tree{
+class Less_Tree_Attribute extends Less_Tree {
 
 	public $key;
 	public $op;
 	public $value;
 	public $type = 'Attribute';
 
-    public function __construct($key, $op, $value){
+    public function __construct($key, $op, $value) {
 		$this->key = $key;
 		$this->op = $op;
 		$this->value = $value;
 	}
 
-    public function compile($env){
+    public function compile($env) {
 
 		$key_obj = is_object($this->key);
 		$val_obj = is_object($this->value);
 
-		if( !$key_obj && !$val_obj ){
+		if (!$key_obj && !$val_obj) {
 			return $this;
 		}
 
 		return new Less_Tree_Attribute(
-			$key_obj ? $this->key->compile($env) : $this->key ,
+			$key_obj ? $this->key->compile($env) : $this->key,
 			$this->op,
 			$val_obj ? $this->value->compile($env) : $this->value);
 	}
@@ -4700,19 +4700,19 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		$output->add( $this->toCSS() );
+    public function genCSS($output) {
+		$output->add($this->toCSS());
 	}
 
-    public function toCSS(){
+    public function toCSS() {
 		$value = $this->key;
 
-		if( $this->op ){
+		if ($this->op) {
 			$value .= $this->op;
 			$value .= (is_object($this->value) ? $this->value->toCSS() : $this->value);
 		}
 
-		return '[' . $value . ']';
+		return '['.$value.']';
 	}
 } 
 
@@ -4723,7 +4723,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Call extends Less_Tree{
+class Less_Tree_Call extends Less_Tree {
     public $value;
 
     protected $name;
@@ -4732,15 +4732,15 @@ 
     protected $currentFileInfo;
     public $type = 'Call';
 
-	public function __construct($name, $args, $index, $currentFileInfo = null ){
+	public function __construct($name, $args, $index, $currentFileInfo = null) {
 		$this->name = $name;
 		$this->args = $args;
 		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function accept( $visitor ){
-		$this->args = $visitor->visitArray( $this->args );
+    public function accept($visitor) {
+		$this->args = $visitor->visitArray($this->args);
 	}
 
     //
@@ -4755,14 +4755,14 @@ 
     // we try to pass a variable to a function, like: `saturate(@color)`.
     // The function should receive the value, not the variable.
     //
-    public function compile($env=null){
+    public function compile($env = null) {
 		$args = array();
-		foreach($this->args as $a){
+		foreach ($this->args as $a) {
 			$args[] = $a->compile($env);
 		}
 
 		$nameLC = strtolower($this->name);
-		switch($nameLC){
+		switch ($nameLC) {
 			case '%':
 			$nameLC = '_percent';
 			break;
@@ -4781,52 +4781,52 @@ 
 		}
 
 		$result = null;
-		if( $nameLC === 'default' ){
+		if ($nameLC==='default') {
 			$result = Less_Tree_DefaultFunc::compile();
 
-		}else{
+		}else {
 
-			if( method_exists('Less_Functions',$nameLC) ){ // 1.
+			if (method_exists('Less_Functions', $nameLC)) { // 1.
 				try {
 
 					$func = new Less_Functions($env, $this->currentFileInfo);
-					$result = call_user_func_array( array($func,$nameLC),$args);
+					$result = call_user_func_array(array($func, $nameLC), $args);
 
 				} catch (Exception $e) {
-					throw new Less_Exception_Compiler('error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index);
+					throw new Less_Exception_Compiler('error evaluating function `'.$this->name.'` '.$e->getMessage().' index: '.$this->index);
 				}
-			} elseif( isset( $env->functions[$nameLC] ) && is_callable( $env->functions[$nameLC] ) ) {
+			} elseif (isset($env->functions[$nameLC]) && is_callable($env->functions[$nameLC])) {
 				try {
-					$result = call_user_func_array( $env->functions[$nameLC], $args );
+					$result = call_user_func_array($env->functions[$nameLC], $args);
 				} catch (Exception $e) {
-					throw new Less_Exception_Compiler('error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index);
+					throw new Less_Exception_Compiler('error evaluating function `'.$this->name.'` '.$e->getMessage().' index: '.$this->index);
 				}
 			}
 		}
 
-		if( $result !== null ){
+		if ($result!==null) {
 			return $result;
 		}
 
 
-		return new Less_Tree_Call( $this->name, $args, $this->index, $this->currentFileInfo );
+		return new Less_Tree_Call($this->name, $args, $this->index, $this->currentFileInfo);
     }
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 
-		$output->add( $this->name . '(', $this->currentFileInfo, $this->index );
+		$output->add($this->name.'(', $this->currentFileInfo, $this->index);
 		$args_len = count($this->args);
-		for($i = 0; $i < $args_len; $i++ ){
-			$this->args[$i]->genCSS( $output );
-			if( $i + 1 < $args_len ){
-				$output->add( ', ' );
+		for ($i = 0; $i<$args_len; $i++) {
+			$this->args[$i]->genCSS($output);
+			if ($i+1<$args_len) {
+				$output->add(', ');
 			}
 		}
 
-		$output->add( ')' );
+		$output->add(')');
 	}
 
 
@@ -4843,15 +4843,15 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Color extends Less_Tree{
+class Less_Tree_Color extends Less_Tree {
 	public $rgb;
 	public $alpha;
 	public $isTransparentKeyword;
 	public $type = 'Color';
 
-	public function __construct($rgb, $a = 1, $isTransparentKeyword = null ){
+	public function __construct($rgb, $a = 1, $isTransparentKeyword = null) {
 
-		if( $isTransparentKeyword ){
+		if ($isTransparentKeyword) {
 			$this->rgb = $rgb;
 			$this->alpha = $a;
 			$this->isTransparentKeyword = true;
@@ -4859,46 +4859,46 @@ 
 		}
 
 		$this->rgb = array();
-		if( is_array($rgb) ){
+		if (is_array($rgb)) {
 			$this->rgb = $rgb;
-		}else if( strlen($rgb) == 6 ){
-			foreach(str_split($rgb, 2) as $c){
+		}else if (strlen($rgb)==6) {
+			foreach (str_split($rgb, 2) as $c) {
 				$this->rgb[] = hexdec($c);
 			}
-		}else{
-			foreach(str_split($rgb, 1) as $c){
+		}else {
+			foreach (str_split($rgb, 1) as $c) {
 				$this->rgb[] = hexdec($c.$c);
 			}
 		}
 		$this->alpha = is_numeric($a) ? $a : 1;
 	}
 
-	public function compile(){
+	public function compile() {
 		return $this;
 	}
 
-	public function luma(){
+	public function luma() {
 		$r = $this->rgb[0] / 255;
 		$g = $this->rgb[1] / 255;
 		$b = $this->rgb[2] / 255;
 
-		$r = ($r <= 0.03928) ? $r / 12.92 : pow((($r + 0.055) / 1.055), 2.4);
-		$g = ($g <= 0.03928) ? $g / 12.92 : pow((($g + 0.055) / 1.055), 2.4);
-		$b = ($b <= 0.03928) ? $b / 12.92 : pow((($b + 0.055) / 1.055), 2.4);
+		$r = ($r<=0.03928) ? $r / 12.92 : pow((($r+0.055) / 1.055), 2.4);
+		$g = ($g<=0.03928) ? $g / 12.92 : pow((($g+0.055) / 1.055), 2.4);
+		$b = ($b<=0.03928) ? $b / 12.92 : pow((($b+0.055) / 1.055), 2.4);
 
-		return 0.2126 * $r + 0.7152 * $g + 0.0722 * $b;
+		return 0.2126 * $r+0.7152 * $g+0.0722 * $b;
 	}
 
 	/**
 	 * @see Less_Tree::genCSS
 	 */
-	public function genCSS( $output ){
-		$output->add( $this->toCSS() );
+	public function genCSS($output) {
+		$output->add($this->toCSS());
 	}
 
-	public function toCSS( $doNotCompress = false ){
+	public function toCSS($doNotCompress = false) {
 		$compress = Less_Parser::$options['compress'] && !$doNotCompress;
-		$alpha = Less_Functions::fround( $this->alpha );
+		$alpha = Less_Functions::fround($this->alpha);
 
 
 		//
@@ -4907,28 +4907,28 @@ 
 		// which has better compatibility with older browsers.
 		// Values are capped between `0` and `255`, rounded and zero-padded.
 		//
-		if( $alpha < 1 ){
-			if( ( $alpha === 0 || $alpha === 0.0 ) && isset($this->isTransparentKeyword) && $this->isTransparentKeyword ){
+		if ($alpha<1) {
+			if (($alpha===0 || $alpha===0.0) && isset($this->isTransparentKeyword) && $this->isTransparentKeyword) {
 				return 'transparent';
 			}
 
 			$values = array();
-			foreach($this->rgb as $c){
-				$values[] = Less_Functions::clamp( round($c), 255);
+			foreach ($this->rgb as $c) {
+				$values[] = Less_Functions::clamp(round($c), 255);
 			}
 			$values[] = $alpha;
 
 			$glue = ($compress ? ',' : ', ');
-			return "rgba(" . implode($glue, $values) . ")";
-		}else{
+			return "rgba(".implode($glue, $values).")";
+		}else {
 
 			$color = $this->toRGB();
 
-			if( $compress ){
+			if ($compress) {
 
 				// Convert color to short format
-				if( $color[1] === $color[2] && $color[3] === $color[4] && $color[5] === $color[6]) {
-					$color = '#'.$color[1] . $color[3] . $color[5];
+				if ($color[1]===$color[2] && $color[3]===$color[4] && $color[5]===$color[6]) {
+					$color = '#'.$color[1].$color[3].$color[5];
 				}
 			}
 
@@ -4946,20 +4946,20 @@ 
 	/**
 	 * @param string $op
 	 */
-	public function operate( $op, $other) {
+	public function operate($op, $other) {
 		$rgb = array();
-		$alpha = $this->alpha * (1 - $other->alpha) + $other->alpha;
-		for ($c = 0; $c < 3; $c++) {
-			$rgb[$c] = Less_Functions::operate( $op, $this->rgb[$c], $other->rgb[$c]);
+		$alpha = $this->alpha * (1-$other->alpha)+$other->alpha;
+		for ($c = 0; $c<3; $c++) {
+			$rgb[$c] = Less_Functions::operate($op, $this->rgb[$c], $other->rgb[$c]);
 		}
 		return new Less_Tree_Color($rgb, $alpha);
 	}
 
-	public function toRGB(){
+	public function toRGB() {
 		return $this->toHex($this->rgb);
 	}
 
-	public function toHSL(){
+	public function toHSL() {
 		$r = $this->rgb[0] / 255;
 		$g = $this->rgb[1] / 255;
 		$b = $this->rgb[2] / 255;
@@ -4967,21 +4967,21 @@ 
 
 		$max = max($r, $g, $b);
 		$min = min($r, $g, $b);
-		$l = ($max + $min) / 2;
-		$d = $max - $min;
+		$l = ($max+$min) / 2;
+		$d = $max-$min;
 
 		$h = $s = 0;
-		if( $max !== $min ){
-			$s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
+		if ($max!==$min) {
+			$s = $l>0.5 ? $d / (2-$max-$min) : $d / ($max+$min);
 
 			switch ($max) {
-				case $r: $h = ($g - $b) / $d + ($g < $b ? 6 : 0); break;
-				case $g: $h = ($b - $r) / $d + 2;				 break;
-				case $b: $h = ($r - $g) / $d + 4;				 break;
+				case $r: $h = ($g-$b) / $d+($g<$b ? 6 : 0); break;
+				case $g: $h = ($b-$r) / $d+2; break;
+				case $b: $h = ($r-$g) / $d+4; break;
 			}
 			$h /= 6;
 		}
-		return array('h' => $h * 360, 's' => $s, 'l' => $l, 'a' => $a );
+		return array('h' => $h * 360, 's' => $s, 'l' => $l, 'a' => $a);
 	}
 
 	//Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
@@ -4996,49 +4996,49 @@ 
 
 		$v = $max;
 
-		$d = $max - $min;
-		if ($max === 0) {
+		$d = $max-$min;
+		if ($max===0) {
 			$s = 0;
-		} else {
+		}else {
 			$s = $d / $max;
 		}
 
 		$h = 0;
-		if( $max !== $min ){
-			switch($max){
-				case $r: $h = ($g - $b) / $d + ($g < $b ? 6 : 0); break;
-				case $g: $h = ($b - $r) / $d + 2; break;
-				case $b: $h = ($r - $g) / $d + 4; break;
+		if ($max!==$min) {
+			switch ($max) {
+				case $r: $h = ($g-$b) / $d+($g<$b ? 6 : 0); break;
+				case $g: $h = ($b-$r) / $d+2; break;
+				case $b: $h = ($r-$g) / $d+4; break;
 			}
 			$h /= 6;
 		}
-		return array('h'=> $h * 360, 's'=> $s, 'v'=> $v, 'a' => $a );
+		return array('h'=> $h * 360, 's'=> $s, 'v'=> $v, 'a' => $a);
 	}
 
-	public function toARGB(){
-		$argb = array_merge( (array) Less_Parser::round($this->alpha * 255), $this->rgb);
-		return $this->toHex( $argb );
+	public function toARGB() {
+		$argb = array_merge((array)Less_Parser::round($this->alpha * 255), $this->rgb);
+		return $this->toHex($argb);
 	}
 
-	public function compare($x){
+	public function compare($x) {
 
-		if( !property_exists( $x, 'rgb' ) ){
+		if (!property_exists($x, 'rgb')) {
 			return -1;
 		}
 
 
-		return ($x->rgb[0] === $this->rgb[0] &&
-			$x->rgb[1] === $this->rgb[1] &&
-			$x->rgb[2] === $this->rgb[2] &&
-			$x->alpha === $this->alpha) ? 0 : -1;
+		return ($x->rgb[0]===$this->rgb[0] &&
+			$x->rgb[1]===$this->rgb[1] &&
+			$x->rgb[2]===$this->rgb[2] &&
+			$x->alpha===$this->alpha) ? 0 : -1;
 	}
 
-    public function toHex( $v ){
+    public function toHex($v) {
 
 		$ret = '#';
-		foreach($v as $c){
-			$c = Less_Functions::clamp( Less_Parser::round($c), 255);
-			if( $c < 16 ){
+		foreach ($v as $c) {
+			$c = Less_Functions::clamp(Less_Parser::round($c), 255);
+			if ($c<16) {
 				$ret .= '0';
 			}
 			$ret .= dechex($c);
@@ -5051,16 +5051,16 @@ 
 	/**
 	 * @param string $keyword
 	 */
-	public static function fromKeyword( $keyword ){
+	public static function fromKeyword($keyword) {
 		$keyword = strtolower($keyword);
 
-		if( Less_Colors::hasOwnProperty($keyword) ){
+		if (Less_Colors::hasOwnProperty($keyword)) {
 			// detect named color
 			return new Less_Tree_Color(substr(Less_Colors::color($keyword), 1));
 		}
 
-		if( $keyword === 'transparent' ){
-			return new Less_Tree_Color( array(0, 0, 0), 0, true);
+		if ($keyword==='transparent') {
+			return new Less_Tree_Color(array(0, 0, 0), 0, true);
 		}
 	}
 
@@ -5073,7 +5073,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Comment extends Less_Tree{
+class Less_Tree_Comment extends Less_Tree {
 
 	public $value;
 	public $silent;
@@ -5081,37 +5081,37 @@ 
 	public $currentFileInfo;
 	public $type = 'Comment';
 
-	public function __construct($value, $silent, $index = null, $currentFileInfo = null ){
+	public function __construct($value, $silent, $index = null, $currentFileInfo = null) {
 		$this->value = $value;
-		$this->silent = !! $silent;
+		$this->silent = !!$silent;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 		//if( $this->debugInfo ){
 			//$output->add( tree.debugInfo($env, $this), $this->currentFileInfo, $this->index);
 		//}
-		$output->add( trim($this->value) );//TODO shouldn't need to trim, we shouldn't grab the \n
+		$output->add(trim($this->value)); //TODO shouldn't need to trim, we shouldn't grab the \n
 	}
 
-	public function toCSS(){
+	public function toCSS() {
 		return Less_Parser::$options['compress'] ? '' : $this->value;
 	}
 
-	public function isSilent(){
-		$isReference = ($this->currentFileInfo && isset($this->currentFileInfo['reference']) && (!isset($this->isReferenced) || !$this->isReferenced) );
+	public function isSilent() {
+		$isReference = ($this->currentFileInfo && isset($this->currentFileInfo['reference']) && (!isset($this->isReferenced) || !$this->isReferenced));
 		$isCompressed = Less_Parser::$options['compress'] && !preg_match('/^\/\*!/', $this->value);
 		return $this->silent || $isReference || $isCompressed;
 	}
 
-	public function compile(){
+	public function compile() {
 		return $this;
 	}
 
-	public function markReferenced(){
+	public function markReferenced() {
 		$this->isReferenced = true;
 	}
 
@@ -5124,7 +5124,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Condition extends Less_Tree{
+class Less_Tree_Condition extends Less_Tree {
 
 	public $op;
 	public $lvalue;
@@ -5141,16 +5141,16 @@ 
 		$this->negate = $negate;
 	}
 
-	public function accept($visitor){
-		$this->lvalue = $visitor->visitObj( $this->lvalue );
-		$this->rvalue = $visitor->visitObj( $this->rvalue );
+	public function accept($visitor) {
+		$this->lvalue = $visitor->visitObj($this->lvalue);
+		$this->rvalue = $visitor->visitObj($this->rvalue);
 	}
 
     public function compile($env) {
 		$a = $this->lvalue->compile($env);
 		$b = $this->rvalue->compile($env);
 
-		switch( $this->op ){
+		switch ($this->op) {
 			case 'and':
 				$result = $a && $b;
 			break;
@@ -5160,25 +5160,25 @@ 
 			break;
 
 			default:
-				if( Less_Parser::is_method($a, 'compare') ){
+				if (Less_Parser::is_method($a, 'compare')) {
 					$result = $a->compare($b);
-				}elseif( Less_Parser::is_method($b, 'compare') ){
+				}elseif (Less_Parser::is_method($b, 'compare')) {
 					$result = $b->compare($a);
-				}else{
+				}else {
 					throw new Less_Exception_Compiler('Unable to perform comparison', null, $this->index);
 				}
 
 				switch ($result) {
 					case -1:
-					$result = $this->op === '<' || $this->op === '=<' || $this->op === '<=';
+					$result = $this->op==='<' || $this->op==='=<' || $this->op==='<=';
 					break;
 
 					case  0:
-					$result = $this->op === '=' || $this->op === '>=' || $this->op === '=<' || $this->op === '<=';
+					$result = $this->op==='=' || $this->op==='>=' || $this->op==='=<' || $this->op==='<=';
 					break;
 
 					case  1:
-					$result = $this->op === '>' || $this->op === '>=';
+					$result = $this->op==='>' || $this->op==='>=';
 					break;
 				}
 			break;
@@ -5196,29 +5196,29 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_DefaultFunc{
+class Less_Tree_DefaultFunc {
 
 	static $error_;
 	static $value_;
 
-    public static function compile(){
-		if( self::$error_ ){
+    public static function compile() {
+		if (self::$error_) {
 			throw new Exception(self::$error_);
 		}
-		if( self::$value_ !== null ){
+		if (self::$value_!==null) {
 			return self::$value_ ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
 		}
 	}
 
-    public static function value( $v ){
+    public static function value($v) {
 		self::$value_ = $v;
 	}
 
-    public static function error( $e ){
+    public static function error($e) {
 		self::$error_ = $e;
 	}
 
-    public static function reset(){
+    public static function reset() {
 		self::$value_ = self::$error_ = null;
 	}
 } 
@@ -5229,13 +5229,13 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_DetachedRuleset extends Less_Tree{
+class Less_Tree_DetachedRuleset extends Less_Tree {
 
 	public $ruleset;
 	public $frames;
 	public $type = 'DetachedRuleset';
 
-    public function __construct( $ruleset, $frames = null ){
+    public function __construct($ruleset, $frames = null) {
 		$this->ruleset = $ruleset;
 		$this->frames = $frames;
 	}
@@ -5244,20 +5244,20 @@ 
 		$this->ruleset = $visitor->visitObj($this->ruleset);
 	}
 
-    public function compile($env){
-		if( $this->frames ){
+    public function compile($env) {
+		if ($this->frames) {
 			$frames = $this->frames;
-		}else{
+		}else {
 			$frames = $env->frames;
 		}
 		return new Less_Tree_DetachedRuleset($this->ruleset, $frames);
 	}
 
     public function callEval($env) {
-		if( $this->frames ){
-			return $this->ruleset->compile( $env->copyEvalEnv( array_merge($this->frames,$env->frames) ) );
+		if ($this->frames) {
+			return $this->ruleset->compile($env->copyEvalEnv(array_merge($this->frames, $env->frames)));
 		}
-		return $this->ruleset->compile( $env );
+		return $this->ruleset->compile($env);
 	}
 }
 
@@ -5269,29 +5269,29 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Dimension extends Less_Tree{
+class Less_Tree_Dimension extends Less_Tree {
 
 	public $value;
 	public $unit;
 	public $type = 'Dimension';
 
-    public function __construct($value, $unit = null){
+    public function __construct($value, $unit = null) {
         $this->value = floatval($value);
 
-		if( $unit && ($unit instanceof Less_Tree_Unit) ){
+		if ($unit && ($unit instanceof Less_Tree_Unit)) {
 			$this->unit = $unit;
-		}elseif( $unit ){
-			$this->unit = new Less_Tree_Unit( array($unit) );
-		}else{
+		}elseif ($unit) {
+			$this->unit = new Less_Tree_Unit(array($unit));
+		}else {
 			$this->unit = new Less_Tree_Unit( );
 		}
     }
 
-    public function accept( $visitor ){
-		$this->unit = $visitor->visitObj( $this->unit );
+    public function accept($visitor) {
+		$this->unit = $visitor->visitObj($this->unit);
 	}
 
-    public function compile(){
+    public function compile() {
         return $this;
     }
 
@@ -5302,39 +5302,39 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 
-		if( Less_Parser::$options['strictUnits'] && !$this->unit->isSingular() ){
+		if (Less_Parser::$options['strictUnits'] && !$this->unit->isSingular()) {
 			throw new Less_Exception_Compiler("Multiple units in dimension. Correct the units or use the unit function. Bad unit: ".$this->unit->toString());
 		}
 
-		$value = Less_Functions::fround( $this->value );
+		$value = Less_Functions::fround($this->value);
 		$strValue = (string)$value;
 
-		if( $value !== 0 && $value < 0.000001 && $value > -0.000001 ){
+		if ($value!==0 && $value<0.000001 && $value>-0.000001) {
 			// would be output 1e-6 etc.
-			$strValue = number_format($strValue,10);
-			$strValue = preg_replace('/\.?0+$/','', $strValue);
+			$strValue = number_format($strValue, 10);
+			$strValue = preg_replace('/\.?0+$/', '', $strValue);
 		}
 
-		if( Less_Parser::$options['compress'] ){
+		if (Less_Parser::$options['compress']) {
 			// Zero values doesn't need a unit
-			if( $value === 0 && $this->unit->isLength() ){
-				$output->add( $strValue );
+			if ($value===0 && $this->unit->isLength()) {
+				$output->add($strValue);
 				return $strValue;
 			}
 
 			// Float values doesn't need a leading zero
-			if( $value > 0 && $value < 1 && $strValue[0] === '0' ){
-				$strValue = substr($strValue,1);
+			if ($value>0 && $value<1 && $strValue[0]==='0') {
+				$strValue = substr($strValue, 1);
 			}
 		}
 
-		$output->add( $strValue );
-		$this->unit->genCSS( $output );
+		$output->add($strValue);
+		$this->unit->genCSS($output);
 	}
 
-    public function __toString(){
+    public function __toString() {
         return $this->toCSS();
     }
 
@@ -5345,97 +5345,97 @@ 
     /**
      * @param string $op
      */
-    public function operate( $op, $other){
+    public function operate($op, $other) {
 
-		$value = Less_Functions::operate( $op, $this->value, $other->value);
+		$value = Less_Functions::operate($op, $this->value, $other->value);
 		$unit = clone $this->unit;
 
-		if( $op === '+' || $op === '-' ){
+		if ($op==='+' || $op==='-') {
 
-			if( !$unit->numerator && !$unit->denominator ){
+			if (!$unit->numerator && !$unit->denominator) {
 				$unit->numerator = $other->unit->numerator;
 				$unit->denominator = $other->unit->denominator;
-			}elseif( !$other->unit->numerator && !$other->unit->denominator ){
+			}elseif (!$other->unit->numerator && !$other->unit->denominator) {
 				// do nothing
-			}else{
-				$other = $other->convertTo( $this->unit->usedUnits());
+			}else {
+				$other = $other->convertTo($this->unit->usedUnits());
 
-				if( Less_Parser::$options['strictUnits'] && $other->unit->toString() !== $unit->toCSS() ){
-					throw new Less_Exception_Compiler("Incompatible units. Change the units or use the unit function. Bad units: '".$unit->toString() . "' and ".$other->unit->toString()+"'.");
+				if (Less_Parser::$options['strictUnits'] && $other->unit->toString()!==$unit->toCSS()) {
+					throw new Less_Exception_Compiler("Incompatible units. Change the units or use the unit function. Bad units: '".$unit->toString()."' and ".$other->unit->toString()+"'.");
 				}
 
-				$value = Less_Functions::operate( $op, $this->value, $other->value);
+				$value = Less_Functions::operate($op, $this->value, $other->value);
 			}
-		}elseif( $op === '*' ){
+		}elseif ($op==='*') {
 			$unit->numerator = array_merge($unit->numerator, $other->unit->numerator);
 			$unit->denominator = array_merge($unit->denominator, $other->unit->denominator);
 			sort($unit->numerator);
 			sort($unit->denominator);
 			$unit->cancel();
-		}elseif( $op === '/' ){
+		}elseif ($op==='/') {
 			$unit->numerator = array_merge($unit->numerator, $other->unit->denominator);
 			$unit->denominator = array_merge($unit->denominator, $other->unit->numerator);
 			sort($unit->numerator);
 			sort($unit->denominator);
 			$unit->cancel();
 		}
-		return new Less_Tree_Dimension( $value, $unit);
+		return new Less_Tree_Dimension($value, $unit);
     }
 
 	public function compare($other) {
 		if ($other instanceof Less_Tree_Dimension) {
 
-			if( $this->unit->isEmpty() || $other->unit->isEmpty() ){
+			if ($this->unit->isEmpty() || $other->unit->isEmpty()) {
 				$a = $this;
 				$b = $other;
-			} else {
+			}else {
 				$a = $this->unify();
 				$b = $other->unify();
-				if( $a->unit->compare($b->unit) !== 0 ){
+				if ($a->unit->compare($b->unit)!==0) {
 					return -1;
 				}
 			}
 			$aValue = $a->value;
 			$bValue = $b->value;
 
-			if ($bValue > $aValue) {
+			if ($bValue>$aValue) {
 				return -1;
-			} elseif ($bValue < $aValue) {
+			} elseif ($bValue<$aValue) {
 				return 1;
-			} else {
+			}else {
 				return 0;
 			}
-		} else {
+		}else {
 			return -1;
 		}
 	}
 
     public function unify() {
-		return $this->convertTo(array('length'=> 'px', 'duration'=> 's', 'angle' => 'rad' ));
+		return $this->convertTo(array('length'=> 'px', 'duration'=> 's', 'angle' => 'rad'));
 	}
 
     public function convertTo($conversions) {
 		$value = $this->value;
 		$unit = clone $this->unit;
 
-		if( is_string($conversions) ){
+		if (is_string($conversions)) {
 			$derivedConversions = array();
-			foreach( Less_Tree_UnitConversions::$groups as $i ){
-				if( isset(Less_Tree_UnitConversions::${$i}[$conversions]) ){
-					$derivedConversions = array( $i => $conversions);
+			foreach (Less_Tree_UnitConversions::$groups as $i) {
+				if (isset(Less_Tree_UnitConversions::${$i}[$conversions])) {
+					$derivedConversions = array($i => $conversions);
 				}
 			}
 			$conversions = $derivedConversions;
 		}
 
 
-		foreach($conversions as $groupName => $targetUnit){
+		foreach ($conversions as $groupName => $targetUnit) {
 			$group = Less_Tree_UnitConversions::${$groupName};
 
 			//numerator
-			foreach($unit->numerator as $i => $atomicUnit){
+			foreach ($unit->numerator as $i => $atomicUnit) {
 				$atomicUnit = $unit->numerator[$i];
-				if( !isset($group[$atomicUnit]) ){
+				if (!isset($group[$atomicUnit])) {
 					continue;
 				}
 
@@ -5445,9 +5445,9 @@ 
 			}
 
 			//denominator
-			foreach($unit->denominator as $i => $atomicUnit){
+			foreach ($unit->denominator as $i => $atomicUnit) {
 				$atomicUnit = $unit->denominator[$i];
-				if( !isset($group[$atomicUnit]) ){
+				if (!isset($group[$atomicUnit])) {
 					continue;
 				}
 
@@ -5459,7 +5459,7 @@ 
 
 		$unit->cancel();
 
-		return new Less_Tree_Dimension( $value, $unit);
+		return new Less_Tree_Dimension($value, $unit);
     }
 }
  
@@ -5470,7 +5470,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Directive extends Less_Tree{
+class Less_Tree_Directive extends Less_Tree {
 
 	public $name;
 	public $value;
@@ -5481,10 +5481,10 @@ 
 	public $debugInfo;
 	public $type = 'Directive';
 
-	public function __construct($name, $value = null, $rules, $index = null, $currentFileInfo = null, $debugInfo = null ){
+	public function __construct($name, $value = null, $rules, $index = null, $currentFileInfo = null, $debugInfo = null) {
 		$this->name = $name;
 		$this->value = $value;
-		if( $rules ){
+		if ($rules) {
 			$this->rules = $rules;
 			$this->rules->allowImports = true;
 		}
@@ -5495,12 +5495,12 @@ 
 	}
 
 
-    public function accept( $visitor ){
-		if( $this->rules ){
-			$this->rules = $visitor->visitObj( $this->rules );
+    public function accept($visitor) {
+		if ($this->rules) {
+			$this->rules = $visitor->visitObj($this->rules);
 		}
-		if( $this->value ){
-			$this->value = $visitor->visitObj( $this->value );
+		if ($this->value) {
+			$this->value = $visitor->visitObj($this->value);
 		}
 	}
 
@@ -5508,55 +5508,55 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
+    public function genCSS($output) {
 		$value = $this->value;
 		$rules = $this->rules;
-		$output->add( $this->name, $this->currentFileInfo, $this->index );
-		if( $this->value ){
+		$output->add($this->name, $this->currentFileInfo, $this->index);
+		if ($this->value) {
 			$output->add(' ');
 			$this->value->genCSS($output);
 		}
-		if( $this->rules ){
-			Less_Tree::outputRuleset( $output, array($this->rules));
-		} else {
+		if ($this->rules) {
+			Less_Tree::outputRuleset($output, array($this->rules));
+		}else {
 			$output->add(';');
 		}
 	}
 
-	public function compile($env){
+	public function compile($env) {
 
 		$value = $this->value;
 		$rules = $this->rules;
-		if( $value ){
+		if ($value) {
 			$value = $value->compile($env);
 		}
 
-		if( $rules ){
+		if ($rules) {
 			$rules = $rules->compile($env);
 			$rules->root = true;
 		}
 
-		return new Less_Tree_Directive( $this->name, $value, $rules, $this->index, $this->currentFileInfo, $this->debugInfo );
+		return new Less_Tree_Directive($this->name, $value, $rules, $this->index, $this->currentFileInfo, $this->debugInfo);
 	}
 
 
-	public function variable($name){
-		if( $this->rules ){
+	public function variable($name) {
+		if ($this->rules) {
 			return $this->rules->variable($name);
 		}
 	}
 
-	public function find($selector){
-		if( $this->rules ){
+	public function find($selector) {
+		if ($this->rules) {
 			return $this->rules->find($selector, $this);
 		}
 	}
 
 	//rulesets: function () { if (this.rules) return tree.Ruleset.prototype.rulesets.apply(this.rules); },
 
-	public function markReferenced(){
+	public function markReferenced() {
 		$this->isReferenced = true;
-		if( $this->rules ){
+		if ($this->rules) {
 			Less_Tree::ReferencedArray($this->rules->rules);
 		}
 	}
@@ -5570,7 +5570,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Element extends Less_Tree{
+class Less_Tree_Element extends Less_Tree {
 
 	public $combinator = '';
 	public $value = '';
@@ -5580,12 +5580,12 @@ 
 
 	public $value_is_object = false;
 
-	public function __construct($combinator, $value, $index = null, $currentFileInfo = null ){
+	public function __construct($combinator, $value, $index = null, $currentFileInfo = null) {
 
 		$this->value = $value;
 		$this->value_is_object = is_object($value);
 
-		if( $combinator ){
+		if ($combinator) {
 			$this->combinator = $combinator;
 		}
 
@@ -5593,19 +5593,19 @@ 
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function accept( $visitor ){
-		if( $this->value_is_object ){ //object or string
-			$this->value = $visitor->visitObj( $this->value );
+    public function accept($visitor) {
+		if ($this->value_is_object) { //object or string
+			$this->value = $visitor->visitObj($this->value);
 		}
 	}
 
-	public function compile($env){
+	public function compile($env) {
 
-		if( Less_Environment::$mixin_stack ){
-			return new Less_Tree_Element($this->combinator, ($this->value_is_object ? $this->value->compile($env) : $this->value), $this->index, $this->currentFileInfo );
+		if (Less_Environment::$mixin_stack) {
+			return new Less_Tree_Element($this->combinator, ($this->value_is_object ? $this->value->compile($env) : $this->value), $this->index, $this->currentFileInfo);
 		}
 
-		if( $this->value_is_object ){
+		if ($this->value_is_object) {
 			$this->value = $this->value->compile($env);
 		}
 
@@ -5615,25 +5615,25 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
-		$output->add( $this->toCSS(), $this->currentFileInfo, $this->index );
+	public function genCSS($output) {
+		$output->add($this->toCSS(), $this->currentFileInfo, $this->index);
 	}
 
-	public function toCSS(){
+	public function toCSS() {
 
-		if( $this->value_is_object ){
+		if ($this->value_is_object) {
 			$value = $this->value->toCSS();
-		}else{
+		}else {
 			$value = $this->value;
 		}
 
 
-		if( $value === '' && $this->combinator && $this->combinator === '&' ){
+		if ($value==='' && $this->combinator && $this->combinator==='&') {
 			return '';
 		}
 
 
-		return Less_Environment::$_outputMap[$this->combinator] . $value;
+		return Less_Environment::$_outputMap[$this->combinator].$value;
 	}
 
 }
@@ -5645,61 +5645,61 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Expression extends Less_Tree{
+class Less_Tree_Expression extends Less_Tree {
 
 	public $value = array();
 	public $parens = false;
 	public $parensInOp = false;
 	public $type = 'Expression';
 
-	public function __construct( $value, $parens = null ){
+	public function __construct($value, $parens = null) {
 		$this->value = $value;
 		$this->parens = $parens;
 	}
 
-    public function accept( $visitor ){
-		$this->value = $visitor->visitArray( $this->value );
+    public function accept($visitor) {
+		$this->value = $visitor->visitArray($this->value);
 	}
 
 	public function compile($env) {
 
 		$doubleParen = false;
 
-		if( $this->parens && !$this->parensInOp ){
+		if ($this->parens && !$this->parensInOp) {
 			Less_Environment::$parensStack++;
 		}
 
 		$returnValue = null;
-		if( $this->value ){
+		if ($this->value) {
 
 			$count = count($this->value);
 
-			if( $count > 1 ){
+			if ($count>1) {
 
 				$ret = array();
-				foreach($this->value as $e){
+				foreach ($this->value as $e) {
 					$ret[] = $e->compile($env);
 				}
 				$returnValue = new Less_Tree_Expression($ret);
 
-			}else{
+			}else {
 
-				if( ($this->value[0] instanceof Less_Tree_Expression) && $this->value[0]->parens && !$this->value[0]->parensInOp ){
+				if (($this->value[0] instanceof Less_Tree_Expression) && $this->value[0]->parens && !$this->value[0]->parensInOp) {
 					$doubleParen = true;
 				}
 
 				$returnValue = $this->value[0]->compile($env);
 			}
 
-		} else {
+		}else {
 			$returnValue = $this;
 		}
 
-		if( $this->parens ){
-			if( !$this->parensInOp ){
+		if ($this->parens) {
+			if (!$this->parensInOp) {
 				Less_Environment::$parensStack--;
 
-			}elseif( !Less_Environment::isMathOn() && !$doubleParen ){
+			}elseif (!Less_Environment::isMathOn() && !$doubleParen) {
 				$returnValue = new Less_Tree_Paren($returnValue);
 
 			}
@@ -5710,22 +5710,22 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
+    public function genCSS($output) {
 		$val_len = count($this->value);
-		for( $i = 0; $i < $val_len; $i++ ){
-			$this->value[$i]->genCSS( $output );
-			if( $i + 1 < $val_len ){
-				$output->add( ' ' );
+		for ($i = 0; $i<$val_len; $i++) {
+			$this->value[$i]->genCSS($output);
+			if ($i+1<$val_len) {
+				$output->add(' ');
 			}
 		}
 	}
 
     public function throwAwayComments() {
 
-		if( is_array($this->value) ){
+		if (is_array($this->value)) {
 			$new_value = array();
-			foreach($this->value as $v){
-				if( $v instanceof Less_Tree_Comment ){
+			foreach ($this->value as $v) {
+				if ($v instanceof Less_Tree_Comment) {
 					continue;
 				}
 				$new_value[] = $v;
@@ -5742,7 +5742,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Extend extends Less_Tree{
+class Less_Tree_Extend extends Less_Tree {
 
 	public $selector;
 	public $option;
@@ -5761,13 +5761,13 @@ 
 	/**
 	 * @param integer $index
 	 */
-    public function __construct($selector, $option, $index){
+    public function __construct($selector, $option, $index) {
 		static $i = 0;
 		$this->selector = $selector;
 		$this->option = $option;
 		$this->index = $index;
 
-		switch($option){
+		switch ($option) {
 			case "all":
 				$this->allowBefore = true;
 				$this->allowAfter = true;
@@ -5782,29 +5782,29 @@ 
 		$this->parent_ids = array($this->object_id);
 	}
 
-    public function accept( $visitor ){
-		$this->selector = $visitor->visitObj( $this->selector );
+    public function accept($visitor) {
+		$this->selector = $visitor->visitObj($this->selector);
 	}
 
-    public function compile( $env ){
+    public function compile($env) {
 		Less_Parser::$has_extends = true;
 		$this->selector = $this->selector->compile($env);
 		return $this;
 		//return new Less_Tree_Extend( $this->selector->compile($env), $this->option, $this->index);
 	}
 
-    public function findSelfSelectors( $selectors ){
+    public function findSelfSelectors($selectors) {
 		$selfElements = array();
 
 
-		for( $i = 0, $selectors_len = count($selectors); $i < $selectors_len; $i++ ){
+		for ($i = 0, $selectors_len = count($selectors); $i<$selectors_len; $i++) {
 			$selectorElements = $selectors[$i]->elements;
 			// duplicate the logic in genCSS function inside the selector node.
 			// future TODO - move both logics into the selector joiner visitor
-			if( $i && $selectorElements && $selectorElements[0]->combinator === "") {
+			if ($i && $selectorElements && $selectorElements[0]->combinator==="") {
 				$selectorElements[0]->combinator = ' ';
 			}
-			$selfElements = array_merge( $selfElements, $selectors[$i]->elements );
+			$selfElements = array_merge($selfElements, $selectors[$i]->elements);
 		}
 
 		$this->selfSelectors = array(new Less_Tree_Selector($selfElements));
@@ -5827,7 +5827,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Import extends Less_Tree{
+class Less_Tree_Import extends Less_Tree {
 
 	public $options;
 	public $index;
@@ -5839,21 +5839,21 @@ 
 	public $root;
 	public $type = 'Import';
 
-    public function __construct($path, $features, $options, $index, $currentFileInfo = null ){
+    public function __construct($path, $features, $options, $index, $currentFileInfo = null) {
 		$this->options = $options;
 		$this->index = $index;
 		$this->path = $path;
 		$this->features = $features;
 		$this->currentFileInfo = $currentFileInfo;
 
-		if( is_array($options) ){
+		if (is_array($options)) {
 			$this->options += array('inline'=>false);
 
-			if( isset($this->options['less']) || $this->options['inline'] ){
+			if (isset($this->options['less']) || $this->options['inline']) {
 				$this->css = !isset($this->options['less']) || !$this->options['less'] || $this->options['inline'];
-			} else {
+			}else {
 				$pathValue = $this->getPath();
-				if( $pathValue && preg_match('/css([\?;].*)?$/',$pathValue) ){
+				if ($pathValue && preg_match('/css([\?;].*)?$/', $pathValue)) {
 					$this->css = true;
 				}
 			}
@@ -5870,14 +5870,14 @@ 
 // ruleset.
 //
 
-    public function accept($visitor){
+    public function accept($visitor) {
 
-		if( $this->features ){
+		if ($this->features) {
 			$this->features = $visitor->visitObj($this->features);
 		}
 		$this->path = $visitor->visitObj($this->path);
 
-		if( !$this->options['inline'] && $this->root ){
+		if (!$this->options['inline'] && $this->root) {
 			$this->root = $visitor->visit($this->root);
 		}
 	}
@@ -5885,26 +5885,26 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		if( $this->css ){
+    public function genCSS($output) {
+		if ($this->css) {
 
-			$output->add( '@import ', $this->currentFileInfo, $this->index );
+			$output->add('@import ', $this->currentFileInfo, $this->index);
 
-			$this->path->genCSS( $output );
-			if( $this->features ){
-				$output->add( ' ' );
-				$this->features->genCSS( $output );
+			$this->path->genCSS($output);
+			if ($this->features) {
+				$output->add(' ');
+				$this->features->genCSS($output);
 			}
-			$output->add( ';' );
+			$output->add(';');
 		}
 	}
 
-    public function toCSS(){
-		$features = $this->features ? ' ' . $this->features->toCSS() : '';
+    public function toCSS() {
+		$features = $this->features ? ' '.$this->features->toCSS() : '';
 
 		if ($this->css) {
-			return "@import " . $this->path->toCSS() . $features . ";\n";
-		} else {
+			return "@import ".$this->path->toCSS().$features.";\n";
+		}else {
 			return "";
 		}
 	}
@@ -5912,37 +5912,37 @@ 
 	/**
 	 * @return string
 	 */
-    public function getPath(){
+    public function getPath() {
 		if ($this->path instanceof Less_Tree_Quoted) {
 			$path = $this->path->value;
-			$path = ( isset($this->css) || preg_match('/(\.[a-z]*$)|([\?;].*)$/',$path)) ? $path : $path . '.less';
-		} else if ($this->path instanceof Less_Tree_URL) {
+			$path = (isset($this->css) || preg_match('/(\.[a-z]*$)|([\?;].*)$/', $path)) ? $path : $path.'.less';
+		}else if ($this->path instanceof Less_Tree_URL) {
 			$path = $this->path->value->value;
-		}else{
+		}else {
 			return null;
 		}
 
 		//remove query string and fragment
-		return preg_replace('/[\?#][^\?]*$/','',$path);
+		return preg_replace('/[\?#][^\?]*$/', '', $path);
 	}
 
-    public function compileForImport( $env ){
-		return new Less_Tree_Import( $this->path->compile($env), $this->features, $this->options, $this->index, $this->currentFileInfo);
+    public function compileForImport($env) {
+		return new Less_Tree_Import($this->path->compile($env), $this->features, $this->options, $this->index, $this->currentFileInfo);
 	}
 
     public function compilePath($env) {
 		$path = $this->path->compile($env);
 		$rootpath = '';
-		if( $this->currentFileInfo && $this->currentFileInfo['rootpath'] ){
+		if ($this->currentFileInfo && $this->currentFileInfo['rootpath']) {
 			$rootpath = $this->currentFileInfo['rootpath'];
 		}
 
 
-		if( !($path instanceof Less_Tree_URL) ){
-			if( $rootpath ){
+		if (!($path instanceof Less_Tree_URL)) {
+			if ($rootpath) {
 				$pathValue = $path->value;
 				// Add the base path if the import is relative
-				if( $pathValue && Less_Environment::isPathRelative($pathValue) ){
+				if ($pathValue && Less_Environment::isPathRelative($pathValue)) {
 					$path->value = $this->currentFileInfo['uri_root'].$pathValue;
 				}
 			}
@@ -5954,55 +5954,55 @@ 
 		return $path;
 	}
 
-    public function compile( $env ){
+    public function compile($env) {
 
 		$evald = $this->compileForImport($env);
 
 		//get path & uri
 		$path_and_uri = null;
-		if( is_callable(Less_Parser::$options['import_callback']) ){
-			$path_and_uri = call_user_func(Less_Parser::$options['import_callback'],$evald);
+		if (is_callable(Less_Parser::$options['import_callback'])) {
+			$path_and_uri = call_user_func(Less_Parser::$options['import_callback'], $evald);
 		}
 
-		if( !$path_and_uri ){
+		if (!$path_and_uri) {
 			$path_and_uri = $evald->PathAndUri();
 		}
 
-		if( $path_and_uri ){
+		if ($path_and_uri) {
 			list($full_path, $uri) = $path_and_uri;
-		}else{
+		}else {
 			$full_path = $uri = $evald->getPath();
 		}
 
 
 		//import once
-		if( $evald->skip( $full_path, $env) ){
+		if ($evald->skip($full_path, $env)) {
 			return array();
 		}
 
-		if( $this->options['inline'] ){
+		if ($this->options['inline']) {
 			//todo needs to reference css file not import
 			//$contents = new Less_Tree_Anonymous($this->root, 0, array('filename'=>$this->importedFilename), true );
 
 			Less_Parser::AddParsedFile($full_path);
-			$contents = new Less_Tree_Anonymous( file_get_contents($full_path), 0, array(), true );
+			$contents = new Less_Tree_Anonymous(file_get_contents($full_path), 0, array(), true);
 
-			if( $this->features ){
-				return new Less_Tree_Media( array($contents), $this->features->value );
+			if ($this->features) {
+				return new Less_Tree_Media(array($contents), $this->features->value);
 			}
 
-			return array( $contents );
+			return array($contents);
 		}
 
 
 		// css ?
-		if( $evald->css ){
-			$features = ( $evald->features ? $evald->features->compile($env) : null );
-			return new Less_Tree_Import( $this->compilePath( $env), $features, $this->options, $this->index);
+		if ($evald->css) {
+			$features = ($evald->features ? $evald->features->compile($env) : null);
+			return new Less_Tree_Import($this->compilePath($env), $features, $this->options, $this->index);
 		}
 
 
-		return $this->ParseImport( $full_path, $uri, $env );
+		return $this->ParseImport($full_path, $uri, $env);
 	}
 
 
@@ -6011,57 +6011,57 @@ 
 	 *
 	 * @param Less_Tree_Import $evald
 	 */
-    public function PathAndUri(){
+    public function PathAndUri() {
 
 		$evald_path = $this->getPath();
 
-		if( $evald_path ){
+		if ($evald_path) {
 
 			$import_dirs = array();
 
-			if( Less_Environment::isPathRelative($evald_path) ){
+			if (Less_Environment::isPathRelative($evald_path)) {
 				//if the path is relative, the file should be in the current directory
-				$import_dirs[ $this->currentFileInfo['currentDirectory'] ] = $this->currentFileInfo['uri_root'];
+				$import_dirs[$this->currentFileInfo['currentDirectory']] = $this->currentFileInfo['uri_root'];
 
-			}else{
+			}else {
 				//otherwise, the file should be relative to the server root
-				$import_dirs[ $this->currentFileInfo['entryPath'] ] = $this->currentFileInfo['entryUri'];
+				$import_dirs[$this->currentFileInfo['entryPath']] = $this->currentFileInfo['entryUri'];
 
 				//if the user supplied entryPath isn't the actual root
-				$import_dirs[ $_SERVER['DOCUMENT_ROOT'] ] = '';
+				$import_dirs[$_SERVER['DOCUMENT_ROOT']] = '';
 
 			}
 
 			// always look in user supplied import directories
-			$import_dirs = array_merge( $import_dirs, Less_Parser::$options['import_dirs'] );
+			$import_dirs = array_merge($import_dirs, Less_Parser::$options['import_dirs']);
 
 
-			foreach( $import_dirs as $rootpath => $rooturi){
-				if( is_callable($rooturi) ){
+			foreach ($import_dirs as $rootpath => $rooturi) {
+				if (is_callable($rooturi)) {
 					list($path, $uri) = call_user_func($rooturi, $evald_path);
-					if( is_string($path) ){
+					if (is_string($path)) {
 						$full_path = $path;
-						return array( $full_path, $uri );
+						return array($full_path, $uri);
 					}
-				}elseif( !empty($rootpath) ){
+				}elseif (!empty($rootpath)) {
 
 
-					if( $rooturi ){
-						if( strpos($evald_path,$rooturi) === 0 ){
-							$evald_path = substr( $evald_path, strlen($rooturi) );
+					if ($rooturi) {
+						if (strpos($evald_path, $rooturi)===0) {
+							$evald_path = substr($evald_path, strlen($rooturi));
 						}
 					}
 
-					$path = rtrim($rootpath,'/\\').'/'.ltrim($evald_path,'/\\');
+					$path = rtrim($rootpath, '/\\').'/'.ltrim($evald_path, '/\\');
 
-					if( file_exists($path) ){
+					if (file_exists($path)) {
 						$full_path = Less_Environment::normalizePath($path);
 						$uri = Less_Environment::normalizePath(dirname($rooturi.$evald_path));
-						return array( $full_path, $uri );
-					} elseif( file_exists($path.'.less') ){
+						return array($full_path, $uri);
+					} elseif (file_exists($path.'.less')) {
 						$full_path = Less_Environment::normalizePath($path.'.less');
 						$uri = Less_Environment::normalizePath(dirname($rooturi.$evald_path.'.less'));
-						return array( $full_path, $uri );
+						return array($full_path, $uri);
 					}
 				}
 			}
@@ -6074,14 +6074,14 @@ 
 	 *
 	 * @return Less_Tree_Media|array
 	 */
-    public function ParseImport( $full_path, $uri, $env ){
+    public function ParseImport($full_path, $uri, $env) {
 
 		$import_env = clone $env;
-		if( (isset($this->options['reference']) && $this->options['reference']) || isset($this->currentFileInfo['reference']) ){
+		if ((isset($this->options['reference']) && $this->options['reference']) || isset($this->currentFileInfo['reference'])) {
 			$import_env->currentFileInfo['reference'] = true;
 		}
 
-		if( (isset($this->options['multiple']) && $this->options['multiple']) ){
+		if ((isset($this->options['multiple']) && $this->options['multiple'])) {
 			$import_env->importMultiple = true;
 		}
 
@@ -6089,7 +6089,7 @@ 
 		$root = $parser->parseFile($full_path, $uri, true);
 
 
-		$ruleset = new Less_Tree_Ruleset(array(), $root->rules );
+		$ruleset = new Less_Tree_Ruleset(array(), $root->rules);
 		$ruleset->evalImports($import_env);
 
 		return $this->features ? new Less_Tree_Media($ruleset->rules, $this->features->value) : $ruleset->rules;
@@ -6101,13 +6101,13 @@ 
 	 *
 	 * @return boolean|null
 	 */
-	private function Skip($path, $env){
+	private function Skip($path, $env) {
 
 		$path = Less_Parser::winPath(realpath($path));
 
-		if( $path && Less_Parser::FileParsed($path) ){
+		if ($path && Less_Parser::FileParsed($path)) {
 
-			if( isset($this->currentFileInfo['reference']) ){
+			if (isset($this->currentFileInfo['reference'])) {
 				return true;
 			}
 
@@ -6125,7 +6125,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Javascript extends Less_Tree{
+class Less_Tree_Javascript extends Less_Tree {
 
 	public $type = 'Javascript';
 	public $escaped;
@@ -6136,13 +6136,13 @@ 
 	 * @param boolean $index
 	 * @param boolean $escaped
 	 */
-	public function __construct($string, $index, $escaped){
+	public function __construct($string, $index, $escaped) {
 		$this->escaped = $escaped;
 		$this->expression = $string;
 		$this->index = $index;
 	}
 
-	public function compile(){
+	public function compile() {
 		return new Less_Tree_Anonymous('/* Sorry, can not do JavaScript evaluation in PHP... :( */');
 	}
 
@@ -6155,7 +6155,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Keyword extends Less_Tree{
+class Less_Tree_Keyword extends Less_Tree {
 
 	public $value;
 	public $type = 'Keyword';
@@ -6163,30 +6163,30 @@ 
 	/**
 	 * @param string $value
 	 */
-	public function __construct($value){
+	public function __construct($value) {
 		$this->value = $value;
 	}
 
-	public function compile(){
+	public function compile() {
 		return $this;
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 
-		if( $this->value === '%') {
+		if ($this->value==='%') {
 			throw new Less_Exception_Compiler("Invalid % without number");
 		}
 
-		$output->add( $this->value );
+		$output->add($this->value);
 	}
 
 	public function compare($other) {
 		if ($other instanceof Less_Tree_Keyword) {
-			return $other->value === $this->value ? 0 : 1;
-		} else {
+			return $other->value===$this->value ? 0 : 1;
+		}else {
 			return -1;
 		}
 	}
@@ -6199,7 +6199,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Media extends Less_Tree{
+class Less_Tree_Media extends Less_Tree {
 
 	public $features;
 	public $rules;
@@ -6208,7 +6208,7 @@ 
 	public $isReferenced;
 	public $type = 'Media';
 
-	public function __construct($value = array(), $features = array(), $index = null, $currentFileInfo = null ){
+	public function __construct($value = array(), $features = array(), $index = null, $currentFileInfo = null) {
 
 		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
@@ -6221,7 +6221,7 @@ 
 		$this->rules[0]->allowImports = true;
 	}
 
-    public function accept( $visitor ){
+    public function accept($visitor) {
 		$this->features = $visitor->visitObj($this->features);
 		$this->rules = $visitor->visitArray($this->rules);
 	}
@@ -6229,27 +6229,27 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
+    public function genCSS($output) {
 
-		$output->add( '@media ', $this->currentFileInfo, $this->index );
-		$this->features->genCSS( $output );
-		Less_Tree::outputRuleset( $output, $this->rules);
+		$output->add('@media ', $this->currentFileInfo, $this->index);
+		$this->features->genCSS($output);
+		Less_Tree::outputRuleset($output, $this->rules);
 
 	}
 
 	public function compile($env) {
 
-		$media = new Less_Tree_Media(array(), array(), $this->index, $this->currentFileInfo );
+		$media = new Less_Tree_Media(array(), array(), $this->index, $this->currentFileInfo);
 
 		$strictMathBypass = false;
-		if( Less_Parser::$options['strictMath'] === false) {
+		if (Less_Parser::$options['strictMath']===false) {
 			$strictMathBypass = true;
 			Less_Parser::$options['strictMath'] = true;
 		}
 
 		$media->features = $this->features->compile($env);
 
-		if( $strictMathBypass ){
+		if ($strictMathBypass) {
 			Less_Parser::$options['strictMath'] = false;
 		}
 
@@ -6273,14 +6273,14 @@ 
 		return $this->rules[0]->find($selector, $this);
 	}
 
-	public function emptySelectors(){
-		$el = new Less_Tree_Element('','&', $this->index, $this->currentFileInfo );
-		$sels = array( new Less_Tree_Selector(array($el), array(), null, $this->index, $this->currentFileInfo) );
+	public function emptySelectors() {
+		$el = new Less_Tree_Element('', '&', $this->index, $this->currentFileInfo);
+		$sels = array(new Less_Tree_Selector(array($el), array(), null, $this->index, $this->currentFileInfo));
 		$sels[0]->mediaEmpty = true;
         return $sels;
 	}
 
-	public function markReferenced(){
+	public function markReferenced() {
 		$this->rules[0]->markReferenced();
 		$this->isReferenced = true;
 		Less_Tree::ReferencedArray($this->rules[0]->rules);
@@ -6290,7 +6290,7 @@ 
 	public function compileTop($env) {
 		$result = $this;
 
-		if (count($env->mediaBlocks) > 1) {
+		if (count($env->mediaBlocks)>1) {
 			$selectors = $this->emptySelectors();
 			$result = new Less_Tree_Ruleset($selectors, $env->mediaBlocks);
 			$result->multiMedia = true;
@@ -6321,13 +6321,13 @@ 
 
 		$permuted = $this->permute($path);
 		$expressions = array();
-		foreach($permuted as $path){
+		foreach ($permuted as $path) {
 
-			for( $i=0, $len=count($path); $i < $len; $i++){
+			for ($i = 0, $len = count($path); $i<$len; $i++) {
 				$path[$i] = Less_Parser::is_method($path[$i], 'toCSS') ? $path[$i] : new Less_Tree_Anonymous($path[$i]);
 			}
 
-			for( $i = count($path) - 1; $i > 0; $i-- ){
+			for ($i = count($path)-1; $i>0; $i--) {
 				array_splice($path, $i, 0, array(new Less_Tree_Anonymous('and')));
 			}
 
@@ -6345,7 +6345,7 @@ 
 		if (!$arr)
 			return array();
 
-		if (count($arr) == 1)
+		if (count($arr)==1)
 			return $arr[0];
 
 		$result = array();
@@ -6364,9 +6364,9 @@ 
 
     public function bubbleSelectors($selectors) {
 
-		if( !$selectors) return;
+		if (!$selectors) return;
 
-		$this->rules = array(new Less_Tree_Ruleset( $selectors, array($this->rules[0])));
+		$this->rules = array(new Less_Tree_Ruleset($selectors, array($this->rules[0])));
 	}
 
 }
@@ -6382,7 +6382,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_NameValue extends Less_Tree{
+class Less_Tree_NameValue extends Less_Tree {
 
 	public $name;
 	public $value;
@@ -6390,14 +6390,14 @@ 
 	public $currentFileInfo;
 	public $type = 'NameValue';
 
-	public function __construct($name, $value = null, $index = null, $currentFileInfo = null ){
+	public function __construct($name, $value = null, $index = null, $currentFileInfo = null) {
 		$this->name = $name;
 		$this->value = $value;
 		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function genCSS( $output ){
+    public function genCSS($output) {
 
 		$output->add(
 			$this->name
@@ -6407,7 +6407,7 @@ 
 			, $this->currentFileInfo, $this->index);
 	}
 
-	public function compile ($env){
+	public function compile($env) {
 		return $this;
 	}
 }
@@ -6419,12 +6419,12 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Negative extends Less_Tree{
+class Less_Tree_Negative extends Less_Tree {
 
 	public $value;
 	public $type = 'Negative';
 
-    public function __construct($node){
+    public function __construct($node) {
 		$this->value = $node;
 	}
 
@@ -6435,17 +6435,17 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		$output->add( '-' );
-		$this->value->genCSS( $output );
+    public function genCSS($output) {
+		$output->add('-');
+		$this->value->genCSS($output);
 	}
 
     public function compile($env) {
-		if( Less_Environment::isMathOn() ){
-			$ret = new Less_Tree_Operation('*', array( new Less_Tree_Dimension(-1), $this->value ) );
+		if (Less_Environment::isMathOn()) {
+			$ret = new Less_Tree_Operation('*', array(new Less_Tree_Dimension(-1), $this->value));
 			return $ret->compile($env);
 		}
-		return new Less_Tree_Negative( $this->value->compile($env) );
+		return new Less_Tree_Negative($this->value->compile($env));
 	}
 } 
 
@@ -6455,7 +6455,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Operation extends Less_Tree{
+class Less_Tree_Operation extends Less_Tree {
 
 	public $op;
 	public $operands;
@@ -6465,7 +6465,7 @@ 
 	/**
 	 * @param string $op
 	 */
-	public function __construct($op, $operands, $isSpaced = false){
+	public function __construct($op, $operands, $isSpaced = false) {
 		$this->op = trim($op);
 		$this->operands = $operands;
 		$this->isSpaced = $isSpaced;
@@ -6475,45 +6475,45 @@ 
 		$this->operands = $visitor->visitArray($this->operands);
 	}
 
-	public function compile($env){
+	public function compile($env) {
 		$a = $this->operands[0]->compile($env);
 		$b = $this->operands[1]->compile($env);
 
 
-		if( Less_Environment::isMathOn() ){
+		if (Less_Environment::isMathOn()) {
 
-			if( $a instanceof Less_Tree_Dimension && $b instanceof Less_Tree_Color ){
+			if ($a instanceof Less_Tree_Dimension && $b instanceof Less_Tree_Color) {
 				$a = $a->toColor();
 
-			}elseif( $b instanceof Less_Tree_Dimension && $a instanceof Less_Tree_Color ){
+			}elseif ($b instanceof Less_Tree_Dimension && $a instanceof Less_Tree_Color) {
 				$b = $b->toColor();
 
 			}
 
-			if( !method_exists($a,'operate') ){
+			if (!method_exists($a, 'operate')) {
 				throw new Less_Exception_Compiler("Operation on an invalid type");
 			}
 
-			return $a->operate( $this->op, $b);
+			return $a->operate($this->op, $b);
 		}
 
-		return new Less_Tree_Operation($this->op, array($a, $b), $this->isSpaced );
+		return new Less_Tree_Operation($this->op, array($a, $b), $this->isSpaced);
 	}
 
 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		$this->operands[0]->genCSS( $output );
-		if( $this->isSpaced ){
-			$output->add( " " );
+    public function genCSS($output) {
+		$this->operands[0]->genCSS($output);
+		if ($this->isSpaced) {
+			$output->add(" ");
 		}
-		$output->add( $this->op );
-		if( $this->isSpaced ){
-			$output->add( ' ' );
+		$output->add($this->op);
+		if ($this->isSpaced) {
+			$output->add(' ');
 		}
-		$this->operands[1]->genCSS( $output );
+		$this->operands[1]->genCSS($output);
 	}
 
 }
@@ -6525,7 +6525,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Paren extends Less_Tree{
+class Less_Tree_Paren extends Less_Tree {
 
 	public $value;
 	public $type = 'Paren';
@@ -6534,17 +6534,17 @@ 
 		$this->value = $value;
 	}
 
-    public function accept($visitor){
+    public function accept($visitor) {
 		$this->value = $visitor->visitObj($this->value);
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		$output->add( '(' );
-		$this->value->genCSS( $output );
-		$output->add( ')' );
+    public function genCSS($output) {
+		$output->add('(');
+		$this->value->genCSS($output);
+		$output->add(')');
 	}
 
 	public function compile($env) {
@@ -6560,7 +6560,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Quoted extends Less_Tree{
+class Less_Tree_Quoted extends Less_Tree {
 	public $escaped;
 	public $value;
 	public $quote;
@@ -6571,10 +6571,10 @@ 
 	/**
 	 * @param string $str
 	 */
-	public function __construct($str, $content = '', $escaped = false, $index = false, $currentFileInfo = null ){
+	public function __construct($str, $content = '', $escaped = false, $index = false, $currentFileInfo = null) {
 		$this->escaped = $escaped;
 		$this->value = $content;
-		if( $str ){
+		if ($str) {
 			$this->quote = $str[0];
 		}
 		$this->index = $index;
@@ -6584,53 +6584,53 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		if( !$this->escaped ){
-			$output->add( $this->quote, $this->currentFileInfo, $this->index );
+    public function genCSS($output) {
+		if (!$this->escaped) {
+			$output->add($this->quote, $this->currentFileInfo, $this->index);
         }
-        $output->add( $this->value );
-        if( !$this->escaped ){
-			$output->add( $this->quote );
+        $output->add($this->value);
+        if (!$this->escaped) {
+			$output->add($this->quote);
         }
     }
 
-	public function compile($env){
+	public function compile($env) {
 
 		$value = $this->value;
-		if( preg_match_all('/`([^`]+)`/', $this->value, $matches) ){
-			foreach($matches as $i => $match){
+		if (preg_match_all('/`([^`]+)`/', $this->value, $matches)) {
+			foreach ($matches as $i => $match) {
 				$js = new Less_Tree_JavaScript($matches[1], $this->index, true);
 				$js = $js->compile()->value;
 				$value = str_replace($matches[0][$i], $js, $value);
 			}
 		}
 
-		if( preg_match_all('/@\{([\w-]+)\}/',$value,$matches) ){
-			foreach($matches[1] as $i => $match){
-				$v = new Less_Tree_Variable('@' . $match, $this->index, $this->currentFileInfo );
+		if (preg_match_all('/@\{([\w-]+)\}/', $value, $matches)) {
+			foreach ($matches[1] as $i => $match) {
+				$v = new Less_Tree_Variable('@'.$match, $this->index, $this->currentFileInfo);
 				$v = $v->compile($env);
 				$v = ($v instanceof Less_Tree_Quoted) ? $v->value : $v->toCSS();
 				$value = str_replace($matches[0][$i], $v, $value);
 			}
 		}
 
-		return new Less_Tree_Quoted($this->quote . $value . $this->quote, $value, $this->escaped, $this->index, $this->currentFileInfo);
+		return new Less_Tree_Quoted($this->quote.$value.$this->quote, $value, $this->escaped, $this->index, $this->currentFileInfo);
 	}
 
     public function compare($x) {
 
-		if( !Less_Parser::is_method($x, 'toCSS') ){
+		if (!Less_Parser::is_method($x, 'toCSS')) {
 			return -1;
 		}
 
 		$left = $this->toCSS();
 		$right = $x->toCSS();
 
-		if ($left === $right) {
+		if ($left===$right) {
 			return 0;
 		}
 
-		return $left < $right ? -1 : 1;
+		return $left<$right ? -1 : 1;
 	}
 }
  
@@ -6641,7 +6641,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Rule extends Less_Tree{
+class Less_Tree_Rule extends Less_Tree {
 
 	public $name;
 	public $value;
@@ -6656,73 +6656,73 @@ 
 	/**
 	 * @param string $important
 	 */
-	public function __construct($name, $value = null, $important = null, $merge = null, $index = null, $currentFileInfo = null,  $inline = false){
+	public function __construct($name, $value = null, $important = null, $merge = null, $index = null, $currentFileInfo = null, $inline = false) {
 		$this->name = $name;
 		$this->value = ($value instanceof Less_Tree_Value || $value instanceof Less_Tree_Ruleset) ? $value : new Less_Tree_Value(array($value));
-		$this->important = $important ? ' ' . trim($important) : '';
+		$this->important = $important ? ' '.trim($important) : '';
 		$this->merge = $merge;
 		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
 		$this->inline = $inline;
-		$this->variable = ( is_string($name) && $name[0] === '@');
+		$this->variable = (is_string($name) && $name[0]==='@');
 	}
 
     public function accept($visitor) {
-		$this->value = $visitor->visitObj( $this->value );
+		$this->value = $visitor->visitObj($this->value);
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
+    public function genCSS($output) {
 
-		$output->add( $this->name . Less_Environment::$_outputMap[': '], $this->currentFileInfo, $this->index);
-		try{
-			$this->value->genCSS( $output);
+		$output->add($this->name.Less_Environment::$_outputMap[': '], $this->currentFileInfo, $this->index);
+		try {
+			$this->value->genCSS($output);
 
-		}catch( Less_Exception_Parser $e ){
+		} catch (Less_Exception_Parser $e) {
 			$e->index = $this->index;
 			$e->currentFile = $this->currentFileInfo;
 			throw $e;
 		}
-		$output->add( $this->important . (($this->inline || (Less_Environment::$lastRule && Less_Parser::$options['compress'])) ? "" : ";"), $this->currentFileInfo, $this->index);
+		$output->add($this->important.(($this->inline || (Less_Environment::$lastRule && Less_Parser::$options['compress'])) ? "" : ";"), $this->currentFileInfo, $this->index);
 	}
 
-	public function compile ($env){
+	public function compile($env) {
 
 		$name = $this->name;
-		if( is_array($name) ){
+		if (is_array($name)) {
 			// expand 'primitive' name directly to get
 			// things faster (~10% for benchmark.less):
-			if( count($name) === 1 && $name[0] instanceof Less_Tree_Keyword ){
+			if (count($name)===1 && $name[0] instanceof Less_Tree_Keyword) {
 				$name = $name[0]->value;
-			}else{
-				$name = $this->CompileName($env,$name);
+			}else {
+				$name = $this->CompileName($env, $name);
 			}
 		}
 
 		$strictMathBypass = Less_Parser::$options['strictMath'];
-		if( $name === "font" && !Less_Parser::$options['strictMath'] ){
+		if ($name==="font" && !Less_Parser::$options['strictMath']) {
 			Less_Parser::$options['strictMath'] = true;
 		}
 
 		try {
 			$evaldValue = $this->value->compile($env);
 
-			if( !$this->variable && $evaldValue->type === "DetachedRuleset") {
+			if (!$this->variable && $evaldValue->type==="DetachedRuleset") {
 				throw new Less_Exception_Compiler("Rulesets cannot be evaluated on a property.", null, $this->index, $this->currentFileInfo);
 			}
 
-			if( Less_Environment::$mixin_stack ){
+			if (Less_Environment::$mixin_stack) {
 				$return = new Less_Tree_Rule($name, $evaldValue, $this->important, $this->merge, $this->index, $this->currentFileInfo, $this->inline);
-			}else{
+			}else {
 				$this->name = $name;
 				$this->value = $evaldValue;
 				$return = $this;
 			}
 
-		}catch( Less_Exception_Parser $e ){
-			if( !is_numeric($e->index) ){
+		} catch (Less_Exception_Parser $e) {
+			if (!is_numeric($e->index)) {
 				$e->index = $this->index;
 				$e->currentFile = $this->currentFileInfo;
 			}
@@ -6735,15 +6735,15 @@ 
 	}
 
 
-    public function CompileName( $env, $name ){
+    public function CompileName($env, $name) {
 		$output = new Less_Output();
-		foreach($name as $n){
+		foreach ($name as $n) {
 			$n->compile($env)->genCSS($output);
 		}
 		return $output->toString();
 	}
 
-    public function makeImportant(){
+    public function makeImportant() {
 		return new Less_Tree_Rule($this->name, $this->value, '!important', $this->merge, $this->index, $this->currentFileInfo, $this->inline);
 	}
 
@@ -6756,7 +6756,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Ruleset extends Less_Tree{
+class Less_Tree_Ruleset extends Less_Tree {
 
 	protected $lookups;
 	public $_variables;
@@ -6779,20 +6779,20 @@ 
 
 	public $first_oelements;
 
-	public function SetRulesetIndex(){
+	public function SetRulesetIndex() {
 		$this->ruleset_id = Less_Parser::$next_id++;
 		$this->originalRuleset = $this->ruleset_id;
 
-		if( $this->selectors ){
-			foreach($this->selectors as $sel){
-				if( $sel->_oelements ){
+		if ($this->selectors) {
+			foreach ($this->selectors as $sel) {
+				if ($sel->_oelements) {
 					$this->first_oelements[$sel->_oelements[0]] = true;
 				}
 			}
 		}
 	}
 
-	public function __construct($selectors, $rules, $strictImports = null){
+	public function __construct($selectors, $rules, $strictImports = null) {
 		$this->selectors = $selectors;
 		$this->rules = $rules;
 		$this->lookups = array();
@@ -6800,22 +6800,22 @@ 
 		$this->SetRulesetIndex();
 	}
 
-	public function accept( $visitor ){
-		if( $this->paths ){
+	public function accept($visitor) {
+		if ($this->paths) {
 			$paths_len = count($this->paths);
-			for($i = 0,$paths_len; $i < $paths_len; $i++ ){
+			for ($i = 0, $paths_len; $i<$paths_len; $i++) {
 				$this->paths[$i] = $visitor->visitArray($this->paths[$i]);
 			}
-		}elseif( $this->selectors ){
+		}elseif ($this->selectors) {
 			$this->selectors = $visitor->visitArray($this->selectors);
 		}
 
-		if( $this->rules ){
+		if ($this->rules) {
 			$this->rules = $visitor->visitArray($this->rules);
 		}
 	}
 
-	public function compile($env){
+	public function compile($env) {
 
 		$ruleset = $this->PrepareRuleset($env);
 
@@ -6823,43 +6823,43 @@ 
 		// Store the frames around mixin definitions,
 		// so they can be evaluated like closures when the time comes.
 		$rsRuleCnt = count($ruleset->rules);
-		for( $i = 0; $i < $rsRuleCnt; $i++ ){
-			if( $ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition || $ruleset->rules[$i] instanceof Less_Tree_DetachedRuleset ){
+		for ($i = 0; $i<$rsRuleCnt; $i++) {
+			if ($ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition || $ruleset->rules[$i] instanceof Less_Tree_DetachedRuleset) {
 				$ruleset->rules[$i] = $ruleset->rules[$i]->compile($env);
 			}
 		}
 
 		$mediaBlockCount = 0;
-		if( $env instanceof Less_Environment ){
+		if ($env instanceof Less_Environment) {
 			$mediaBlockCount = count($env->mediaBlocks);
 		}
 
 		// Evaluate mixin calls.
-		$this->EvalMixinCalls( $ruleset, $env, $rsRuleCnt );
+		$this->EvalMixinCalls($ruleset, $env, $rsRuleCnt);
 
 
 		// Evaluate everything else
-		for( $i=0; $i<$rsRuleCnt; $i++ ){
-			if(! ($ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition || $ruleset->rules[$i] instanceof Less_Tree_DetachedRuleset) ){
+		for ($i = 0; $i<$rsRuleCnt; $i++) {
+			if (!($ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition || $ruleset->rules[$i] instanceof Less_Tree_DetachedRuleset)) {
 				$ruleset->rules[$i] = $ruleset->rules[$i]->compile($env);
 			}
 		}
 
         // Evaluate everything else
-		for( $i=0; $i<$rsRuleCnt; $i++ ){
+		for ($i = 0; $i<$rsRuleCnt; $i++) {
 			$rule = $ruleset->rules[$i];
 
             // for rulesets, check if it is a css guard and can be removed
-			if( $rule instanceof Less_Tree_Ruleset && $rule->selectors && count($rule->selectors) === 1 ){
+			if ($rule instanceof Less_Tree_Ruleset && $rule->selectors && count($rule->selectors)===1) {
 
                 // check if it can be folded in (e.g. & where)
-				if( $rule->selectors[0]->isJustParentSelector() ){
-					array_splice($ruleset->rules,$i--,1);
+				if ($rule->selectors[0]->isJustParentSelector()) {
+					array_splice($ruleset->rules, $i--, 1);
 					$rsRuleCnt--;
 
-					for($j = 0; $j < count($rule->rules); $j++ ){
+					for ($j = 0; $j<count($rule->rules); $j++) {
 						$subRule = $rule->rules[$j];
-						if( !($subRule instanceof Less_Tree_Rule) || !$subRule->variable ){
+						if (!($subRule instanceof Less_Tree_Rule) || !$subRule->variable) {
 							array_splice($ruleset->rules, ++$i, 0, array($subRule));
 							$rsRuleCnt++;
 						}
@@ -6875,7 +6875,7 @@ 
 
 		if ($mediaBlockCount) {
 			$len = count($env->mediaBlocks);
-			for($i = $mediaBlockCount; $i < $len; $i++ ){
+			for ($i = $mediaBlockCount; $i<$len; $i++) {
 				$env->mediaBlocks[$i]->bubbleSelectors($ruleset->selectors);
 			}
 		}
@@ -6889,23 +6889,23 @@ 
 	 * @param Less_Tree_Ruleset $ruleset
 	 * @param integer $rsRuleCnt
 	 */
-	private function EvalMixinCalls( $ruleset, $env, &$rsRuleCnt ){
-		for($i=0; $i < $rsRuleCnt; $i++){
+	private function EvalMixinCalls($ruleset, $env, &$rsRuleCnt) {
+		for ($i = 0; $i<$rsRuleCnt; $i++) {
 			$rule = $ruleset->rules[$i];
 
-			if( $rule instanceof Less_Tree_Mixin_Call ){
+			if ($rule instanceof Less_Tree_Mixin_Call) {
 				$rule = $rule->compile($env);
 
 				$temp = array();
-				foreach($rule as $r){
-					if( ($r instanceof Less_Tree_Rule) && $r->variable ){
+				foreach ($rule as $r) {
+					if (($r instanceof Less_Tree_Rule) && $r->variable) {
 						// do not pollute the scope if the variable is
 						// already there. consider returning false here
 						// but we need a way to "return" variable from mixins
-						if( !$ruleset->variable($r->name) ){
+						if (!$ruleset->variable($r->name)) {
 							$temp[] = $r;
 						}
-					}else{
+					}else {
 						$temp[] = $r;
 					}
 				}
@@ -6915,12 +6915,12 @@ 
 				$i += $temp_count;
 				$ruleset->resetCache();
 
-			}elseif( $rule instanceof Less_Tree_RulesetCall ){
+			}elseif ($rule instanceof Less_Tree_RulesetCall) {
 
 				$rule = $rule->compile($env);
 				$rules = array();
-				foreach($rule->rules as $r){
-					if( ($r instanceof Less_Tree_Rule) && $r->variable ){
+				foreach ($rule->rules as $r) {
+					if (($r instanceof Less_Tree_Rule) && $r->variable) {
 						continue;
 					}
 					$rules[] = $r;
@@ -6928,7 +6928,7 @@ 
 
 				array_splice($ruleset->rules, $i, 1, $rules);
 				$temp_count = count($rules);
-				$rsRuleCnt += $temp_count - 1;
+				$rsRuleCnt += $temp_count-1;
 				$i += $temp_count-1;
 				$ruleset->resetCache();
 			}
@@ -6941,29 +6941,29 @@ 
 	 * Compile the selectors and create a new ruleset object for the compile() method
 	 *
 	 */
-	private function PrepareRuleset($env){
+	private function PrepareRuleset($env) {
 
 		$hasOnePassingSelector = false;
 		$selectors = array();
-		if( $this->selectors ){
+		if ($this->selectors) {
 			Less_Tree_DefaultFunc::error("it is currently only allowed in parametric mixin guards,");
 
-			foreach($this->selectors as $s){
+			foreach ($this->selectors as $s) {
 				$selector = $s->compile($env);
 				$selectors[] = $selector;
-				if( $selector->evaldCondition ){
+				if ($selector->evaldCondition) {
 					$hasOnePassingSelector = true;
 				}
 			}
 
 			Less_Tree_DefaultFunc::reset();
-		} else {
+		}else {
 			$hasOnePassingSelector = true;
 		}
 
-		if( $this->rules && $hasOnePassingSelector ){
+		if ($this->rules && $hasOnePassingSelector) {
 			$rules = $this->rules;
-		}else{
+		}else {
 			$rules = array();
 		}
 
@@ -6981,7 +6981,7 @@ 
 
 
 		// Evaluate imports
-		if( $ruleset->root || $ruleset->allowImports || !$ruleset->strictImports ){
+		if ($ruleset->root || $ruleset->allowImports || !$ruleset->strictImports) {
 			$ruleset->evalImports($env);
 		}
 
@@ -6991,17 +6991,17 @@ 
 	function evalImports($env) {
 
 		$rules_len = count($this->rules);
-		for($i=0; $i < $rules_len; $i++){
+		for ($i = 0; $i<$rules_len; $i++) {
 			$rule = $this->rules[$i];
 
-			if( $rule instanceof Less_Tree_Import ){
+			if ($rule instanceof Less_Tree_Import) {
 				$rules = $rule->compile($env);
-				if( is_array($rules) ){
+				if (is_array($rules)) {
 					array_splice($this->rules, $i, 1, $rules);
 					$temp_count = count($rules)-1;
 					$i += $temp_count;
 					$rules_len += $temp_count;
-				}else{
+				}else {
 					array_splice($this->rules, $i, 1, array($rules));
 				}
 
@@ -7010,67 +7010,67 @@ 
 		}
 	}
 
-	function makeImportant(){
+	function makeImportant() {
 
 		$important_rules = array();
-		foreach($this->rules as $rule){
-			if( $rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_Ruleset ){
+		foreach ($this->rules as $rule) {
+			if ($rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_Ruleset) {
 				$important_rules[] = $rule->makeImportant();
-			}else{
+			}else {
 				$important_rules[] = $rule;
 			}
 		}
 
-		return new Less_Tree_Ruleset($this->selectors, $important_rules, $this->strictImports );
+		return new Less_Tree_Ruleset($this->selectors, $important_rules, $this->strictImports);
 	}
 
-	public function matchArgs($args){
+	public function matchArgs($args) {
 		return !$args;
 	}
 
 	// lets you call a css selector with a guard
-	public function matchCondition( $args, $env ){
+	public function matchCondition($args, $env) {
 		$lastSelector = end($this->selectors);
 
-		if( !$lastSelector->evaldCondition ){
+		if (!$lastSelector->evaldCondition) {
 			return false;
 		}
-		if( $lastSelector->condition && !$lastSelector->condition->compile( $env->copyEvalEnv( $env->frames ) ) ){
+		if ($lastSelector->condition && !$lastSelector->condition->compile($env->copyEvalEnv($env->frames))) {
 			return false;
 		}
 		return true;
 	}
 
-	function resetCache(){
+	function resetCache() {
 		$this->_rulesets = null;
 		$this->_variables = null;
 		$this->lookups = array();
 	}
 
-	public function variables(){
+	public function variables() {
 		$this->_variables = array();
-		foreach( $this->rules as $r){
-			if ($r instanceof Less_Tree_Rule && $r->variable === true) {
+		foreach ($this->rules as $r) {
+			if ($r instanceof Less_Tree_Rule && $r->variable===true) {
 				$this->_variables[$r->name] = $r;
 			}
 		}
 	}
 
-	public function variable($name){
+	public function variable($name) {
 
-		if( is_null($this->_variables) ){
+		if (is_null($this->_variables)) {
 			$this->variables();
 		}
 		return isset($this->_variables[$name]) ? $this->_variables[$name] : null;
 	}
 
-	public function find( $selector, $self = null ){
+	public function find($selector, $self = null) {
 
-		$key = implode(' ',$selector->_oelements);
+		$key = implode(' ', $selector->_oelements);
 
-		if( !isset($this->lookups[$key]) ){
+		if (!isset($this->lookups[$key])) {
 
-			if( !$self ){
+			if (!$self) {
 				$self = $this->ruleset_id;
 			}
 
@@ -7078,17 +7078,17 @@ 
 
 			$first_oelement = $selector->_oelements[0];
 
-			foreach($this->rules as $rule){
-				if( $rule instanceof Less_Tree_Ruleset && $rule->ruleset_id != $self ){
+			foreach ($this->rules as $rule) {
+				if ($rule instanceof Less_Tree_Ruleset && $rule->ruleset_id!=$self) {
 
-					if( isset($rule->first_oelements[$first_oelement]) ){
+					if (isset($rule->first_oelements[$first_oelement])) {
 
-						foreach( $rule->selectors as $ruleSelector ){
+						foreach ($rule->selectors as $ruleSelector) {
 							$match = $selector->match($ruleSelector);
-							if( $match ){
-								if( $selector->elements_len > $match ){
-									$this->lookups[$key] = array_merge($this->lookups[$key], $rule->find( new Less_Tree_Selector(array_slice($selector->elements, $match)), $self));
-								} else {
+							if ($match) {
+								if ($selector->elements_len>$match) {
+									$this->lookups[$key] = array_merge($this->lookups[$key], $rule->find(new Less_Tree_Selector(array_slice($selector->elements, $match)), $self));
+								}else {
 									$this->lookups[$key][] = $rule;
 								}
 								break;
@@ -7106,18 +7106,18 @@ 
 	/**
 	 * @see Less_Tree::genCSS
 	 */
-	public function genCSS( $output ){
+	public function genCSS($output) {
 
-		if( !$this->root ){
+		if (!$this->root) {
 			Less_Environment::$tabLevel++;
 		}
 
 		$tabRuleStr = $tabSetStr = '';
-		if( !Less_Parser::$options['compress'] ){
-			if( Less_Environment::$tabLevel ){
-				$tabRuleStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel );
-				$tabSetStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel-1 );
-			}else{
+		if (!Less_Parser::$options['compress']) {
+			if (Less_Environment::$tabLevel) {
+				$tabRuleStr = "\n".str_repeat('  ', Less_Environment::$tabLevel);
+				$tabSetStr = "\n".str_repeat('  ', Less_Environment::$tabLevel-1);
+			}else {
 				$tabSetStr = $tabRuleStr = "\n";
 			}
 		}
@@ -7125,19 +7125,19 @@ 
 
 		$ruleNodes = array();
 		$rulesetNodes = array();
-		foreach($this->rules as $rule){
+		foreach ($this->rules as $rule) {
 
 			$class = get_class($rule);
-			if( ($class === 'Less_Tree_Media') || ($class === 'Less_Tree_Directive') || ($this->root && $class === 'Less_Tree_Comment') || ($class === 'Less_Tree_Ruleset' && $rule->rules) ){
+			if (($class==='Less_Tree_Media') || ($class==='Less_Tree_Directive') || ($this->root && $class==='Less_Tree_Comment') || ($class==='Less_Tree_Ruleset' && $rule->rules)) {
 				$rulesetNodes[] = $rule;
-			}else{
+			}else {
 				$ruleNodes[] = $rule;
 			}
 		}
 
 		// If this is the root node, we don't render
 		// a selector, or {}.
-		if( !$this->root ){
+		if (!$this->root) {
 
 			/*
 			debugInfo = tree.debugInfo(env, this, tabSetStr);
@@ -7149,102 +7149,102 @@ 
 			*/
 
 			$paths_len = count($this->paths);
-			for( $i = 0; $i < $paths_len; $i++ ){
+			for ($i = 0; $i<$paths_len; $i++) {
 				$path = $this->paths[$i];
 				$firstSelector = true;
 
-				foreach($path as $p){
-					$p->genCSS( $output, $firstSelector );
+				foreach ($path as $p) {
+					$p->genCSS($output, $firstSelector);
 					$firstSelector = false;
 				}
 
-				if( $i + 1 < $paths_len ){
-					$output->add( ',' . $tabSetStr );
+				if ($i+1<$paths_len) {
+					$output->add(','.$tabSetStr);
 				}
 			}
 
-			$output->add( (Less_Parser::$options['compress'] ? '{' : " {") . $tabRuleStr );
+			$output->add((Less_Parser::$options['compress'] ? '{' : " {").$tabRuleStr);
 		}
 
 		// Compile rules and rulesets
 		$ruleNodes_len = count($ruleNodes);
 		$rulesetNodes_len = count($rulesetNodes);
-		for( $i = 0; $i < $ruleNodes_len; $i++ ){
+		for ($i = 0; $i<$ruleNodes_len; $i++) {
 			$rule = $ruleNodes[$i];
 
 			// @page{ directive ends up with root elements inside it, a mix of rules and rulesets
 			// In this instance we do not know whether it is the last property
-			if( $i + 1 === $ruleNodes_len && (!$this->root || $rulesetNodes_len === 0 || $this->firstRoot ) ){
+			if ($i+1===$ruleNodes_len && (!$this->root || $rulesetNodes_len===0 || $this->firstRoot)) {
 				Less_Environment::$lastRule = true;
 			}
 
-			$rule->genCSS( $output );
+			$rule->genCSS($output);
 
-			if( !Less_Environment::$lastRule ){
-				$output->add( $tabRuleStr );
-			}else{
+			if (!Less_Environment::$lastRule) {
+				$output->add($tabRuleStr);
+			}else {
 				Less_Environment::$lastRule = false;
 			}
 		}
 
-		if( !$this->root ){
-			$output->add( $tabSetStr . '}' );
+		if (!$this->root) {
+			$output->add($tabSetStr.'}');
 			Less_Environment::$tabLevel--;
 		}
 
 		$firstRuleset = true;
 		$space = ($this->root ? $tabRuleStr : $tabSetStr);
-		for( $i = 0; $i < $rulesetNodes_len; $i++ ){
+		for ($i = 0; $i<$rulesetNodes_len; $i++) {
 
-			if( $ruleNodes_len && $firstRuleset ){
-				$output->add( $space );
-			}elseif( !$firstRuleset ){
-				$output->add( $space );
+			if ($ruleNodes_len && $firstRuleset) {
+				$output->add($space);
+			}elseif (!$firstRuleset) {
+				$output->add($space);
 			}
 			$firstRuleset = false;
-			$rulesetNodes[$i]->genCSS( $output);
+			$rulesetNodes[$i]->genCSS($output);
 		}
 
-		if( !Less_Parser::$options['compress'] && $this->firstRoot ){
-			$output->add( "\n" );
+		if (!Less_Parser::$options['compress'] && $this->firstRoot) {
+			$output->add("\n");
 		}
 
 	}
 
 
-	function markReferenced(){
-		if( !$this->selectors ){
+	function markReferenced() {
+		if (!$this->selectors) {
 			return;
 		}
-		foreach($this->selectors as $selector){
+		foreach ($this->selectors as $selector) {
 			$selector->markReferenced();
 		}
 	}
 
-	public function joinSelectors( $context, $selectors ){
+	public function joinSelectors($context, $selectors) {
 		$paths = array();
-		if( is_array($selectors) ){
-			foreach($selectors as $selector) {
-				$this->joinSelector( $paths, $context, $selector);
+		if (is_array($selectors)) {
+			foreach ($selectors as $selector) {
+				$this->joinSelector($paths, $context, $selector);
 			}
 		}
 		return $paths;
 	}
 
-	public function joinSelector( &$paths, $context, $selector){
+	public function joinSelector(&$paths, $context, $selector) {
 
 		$hasParentSelector = false;
 
-		foreach($selector->elements as $el) {
-			if( $el->value === '&') {
+		foreach ($selector->elements as $el) {
+			if ($el->value==='&') {
 				$hasParentSelector = true;
 			}
 		}
 
-		if( !$hasParentSelector ){
-			if( $context ){
-				foreach($context as $context_el){
-					$paths[] = array_merge($context_el, array($selector) );
+		if (!$hasParentSelector) {
+			if ($context) {
+				foreach ($context as $context_el) {
+					$paths[] = array_merge($context_el, array($selector));
 				}
 			}else {
 				$paths[] = array($selector);
@@ -7272,38 +7272,38 @@ 
 		$newSelectors = array(array());
 
 
-		foreach( $selector->elements as $el){
+		foreach ($selector->elements as $el) {
 
 			// non parent reference elements just get added
-			if( $el->value !== '&' ){
+			if ($el->value!=='&') {
 				$currentElements[] = $el;
-			} else {
+			}else {
 				// the new list of selectors to add
 				$selectorsMultiplied = array();
 
 				// merge the current list of non parent selector elements
 				// on to the current list of selectors to add
-				if( $currentElements ){
-					$this->mergeElementsOnToSelectors( $currentElements, $newSelectors);
+				if ($currentElements) {
+					$this->mergeElementsOnToSelectors($currentElements, $newSelectors);
 				}
 
 				// loop through our current selectors
-				foreach($newSelectors as $sel){
+				foreach ($newSelectors as $sel) {
 
 					// if we don't have any parent paths, the & might be in a mixin so that it can be used
 					// whether there are parents or not
-					if( !$context ){
+					if (!$context) {
 						// the combinator used on el should now be applied to the next element instead so that
 						// it is not lost
-						if( $sel ){
-							$sel[0]->elements = array_slice($sel[0]->elements,0);
-							$sel[0]->elements[] = new Less_Tree_Element($el->combinator, '', $el->index, $el->currentFileInfo );
+						if ($sel) {
+							$sel[0]->elements = array_slice($sel[0]->elements, 0);
+							$sel[0]->elements[] = new Less_Tree_Element($el->combinator, '', $el->index, $el->currentFileInfo);
 						}
 						$selectorsMultiplied[] = $sel;
 					}else {
 
 						// and the parent selectors
-						foreach($context as $parentSel){
+						foreach ($context as $parentSel) {
 							// We need to put the current selectors
 							// then join the last selector's elements on to the parents selectors
 
@@ -7315,10 +7315,10 @@ 
 
 							//construct the joined selector - if & is the first thing this will be empty,
 							// if not newJoinedSelector will be the last set of elements in the selector
-							if( $sel ){
+							if ($sel) {
 								$newSelectorPath = $sel;
 								$lastSelector = array_pop($newSelectorPath);
-								$newJoinedSelector = $selector->createDerived( array_slice($lastSelector->elements,0) );
+								$newJoinedSelector = $selector->createDerived(array_slice($lastSelector->elements, 0));
 								$newJoinedSelectorEmpty = false;
 							}
 							else {
@@ -7326,17 +7326,17 @@ 
 							}
 
 							//put together the parent selectors after the join
-							if ( count($parentSel) > 1) {
-								$afterParentJoin = array_merge($afterParentJoin, array_slice($parentSel,1) );
+							if (count($parentSel)>1) {
+								$afterParentJoin = array_merge($afterParentJoin, array_slice($parentSel, 1));
 							}
 
-							if ( $parentSel ){
+							if ($parentSel) {
 								$newJoinedSelectorEmpty = false;
 
 								// join the elements so far with the first part of the parent
-								$newJoinedSelector->elements[] = new Less_Tree_Element( $el->combinator, $parentSel[0]->elements[0]->value, $el->index, $el->currentFileInfo);
+								$newJoinedSelector->elements[] = new Less_Tree_Element($el->combinator, $parentSel[0]->elements[0]->value, $el->index, $el->currentFileInfo);
 
-								$newJoinedSelector->elements = array_merge( $newJoinedSelector->elements, array_slice($parentSel[0]->elements, 1) );
+								$newJoinedSelector->elements = array_merge($newJoinedSelector->elements, array_slice($parentSel[0]->elements, 1));
 							}
 
 							if (!$newJoinedSelectorEmpty) {
@@ -7361,32 +7361,32 @@ 
 
 		// if we have any elements left over (e.g. .a& .b == .b)
 		// add them on to all the current selectors
-		if( $currentElements ){
+		if ($currentElements) {
 			$this->mergeElementsOnToSelectors($currentElements, $newSelectors);
 		}
-		foreach( $newSelectors as $new_sel){
-			if( $new_sel ){
+		foreach ($newSelectors as $new_sel) {
+			if ($new_sel) {
 				$paths[] = $new_sel;
 			}
 		}
 	}
 
-	function mergeElementsOnToSelectors( $elements, &$selectors){
+	function mergeElementsOnToSelectors($elements, &$selectors) {
 
-		if( !$selectors ){
-			$selectors[] = array( new Less_Tree_Selector($elements) );
+		if (!$selectors) {
+			$selectors[] = array(new Less_Tree_Selector($elements));
 			return;
 		}
 
 
-		foreach( $selectors as &$sel){
+		foreach ($selectors as &$sel) {
 
 			// if the previous thing in sel is a parent this needs to join on to it
-			if( $sel ){
+			if ($sel) {
 				$last = count($sel)-1;
-				$sel[$last] = $sel[$last]->createDerived( array_merge($sel[$last]->elements, $elements) );
-			}else{
-				$sel[] = new Less_Tree_Selector( $elements );
+				$sel[$last] = $sel[$last]->createDerived(array_merge($sel[$last]->elements, $elements));
+			}else {
+				$sel[] = new Less_Tree_Selector($elements);
 			}
 		}
 	}
@@ -7399,18 +7399,18 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_RulesetCall extends Less_Tree{
+class Less_Tree_RulesetCall extends Less_Tree {
 
 	public $variable;
 	public $type = "RulesetCall";
 
-    public function __construct($variable){
+    public function __construct($variable) {
 		$this->variable = $variable;
 	}
 
     public function accept($visitor) {}
 
-    public function compile( $env ){
+    public function compile($env) {
 		$variable = new Less_Tree_Variable($this->variable);
 		$detachedRuleset = $variable->compile($env);
 		return $detachedRuleset->callEval($env);
@@ -7425,7 +7425,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Selector extends Less_Tree{
+class Less_Tree_Selector extends Less_Tree {
 
 	public $elements;
 	public $condition;
@@ -7447,17 +7447,17 @@ 
 	/**
 	 * @param boolean $isReferenced
 	 */
-	public function __construct( $elements, $extendList = array() , $condition = null, $index=null, $currentFileInfo=null, $isReferenced=null ){
+	public function __construct($elements, $extendList = array(), $condition = null, $index = null, $currentFileInfo = null, $isReferenced = null) {
 
 		$this->elements = $elements;
 		$this->elements_len = count($elements);
 		$this->extendList = $extendList;
 		$this->condition = $condition;
-		if( $currentFileInfo ){
+		if ($currentFileInfo) {
 			$this->currentFileInfo = $currentFileInfo;
 		}
 		$this->isReferenced = $isReferenced;
-		if( !$condition ){
+		if (!$condition) {
 			$this->evaldCondition = true;
 		}
 
@@ -7467,30 +7467,30 @@ 
     public function accept($visitor) {
 		$this->elements = $visitor->visitArray($this->elements);
 		$this->extendList = $visitor->visitArray($this->extendList);
-		if( $this->condition ){
+		if ($this->condition) {
 			$this->condition = $visitor->visitObj($this->condition);
 		}
 
-		if( $visitor instanceof Less_Visitor_extendFinder ){
+		if ($visitor instanceof Less_Visitor_extendFinder) {
 			$this->CacheElements();
 		}
 	}
 
-    public function createDerived( $elements, $extendList = null, $evaldCondition = null ){
-		$newSelector = new Less_Tree_Selector( $elements, ($extendList ? $extendList : $this->extendList), null, $this->index, $this->currentFileInfo, $this->isReferenced);
+    public function createDerived($elements, $extendList = null, $evaldCondition = null) {
+		$newSelector = new Less_Tree_Selector($elements, ($extendList ? $extendList : $this->extendList), null, $this->index, $this->currentFileInfo, $this->isReferenced);
 		$newSelector->evaldCondition = $evaldCondition ? $evaldCondition : $this->evaldCondition;
 		return $newSelector;
 	}
 
 
-	public function match( $other ){
+	public function match($other) {
 
-		if( !$other->_oelements || ($this->elements_len < $other->_oelements_len) ){
+		if (!$other->_oelements || ($this->elements_len<$other->_oelements_len)) {
 			return 0;
 		}
 
-		for( $i = 0; $i < $other->_oelements_len; $i++ ){
-			if( $this->elements[$i]->value !== $other->_oelements[$i]) {
+		for ($i = 0; $i<$other->_oelements_len; $i++) {
+			if ($this->elements[$i]->value!==$other->_oelements[$i]) {
 				return 0;
 			}
 		}
@@ -7499,20 +7499,20 @@ 
 	}
 
 
-	public function CacheElements(){
+	public function CacheElements() {
 
 		$this->_oelements = array();
 		$css = '';
 
-		foreach($this->elements as $v){
+		foreach ($this->elements as $v) {
 
 			$css .= $v->combinator;
-			if( !$v->value_is_object ){
+			if (!$v->value_is_object) {
 				$css .= $v->value;
 				continue;
 			}
 
-			if( !property_exists($v->value,'value') || !is_string($v->value->value) ){
+			if (!property_exists($v->value, 'value') || !is_string($v->value->value)) {
 				$this->cacheable = false;
 				return;
 			}
@@ -7520,67 +7520,67 @@ 
 		}
 
 		$this->_oelements_len = preg_match_all('/[,&#\.\w-](?:[\w-]|(?:\\\\.))*/', $css, $matches);
-		if( $this->_oelements_len ){
+		if ($this->_oelements_len) {
 			$this->_oelements = $matches[0];
 
-			if( $this->_oelements[0] === '&' ){
+			if ($this->_oelements[0]==='&') {
 				array_shift($this->_oelements);
 				$this->_oelements_len--;
 			}
 		}
 	}
 
-	public function isJustParentSelector(){
+	public function isJustParentSelector() {
 		return !$this->mediaEmpty &&
-			count($this->elements) === 1 &&
-			$this->elements[0]->value === '&' &&
-			($this->elements[0]->combinator === ' ' || $this->elements[0]->combinator === '');
+			count($this->elements)===1 &&
+			$this->elements[0]->value==='&' &&
+			($this->elements[0]->combinator===' ' || $this->elements[0]->combinator==='');
 	}
 
 	public function compile($env) {
 
 		$elements = array();
-		foreach($this->elements as $el){
+		foreach ($this->elements as $el) {
 			$elements[] = $el->compile($env);
 		}
 
 		$extendList = array();
-		foreach($this->extendList as $el){
+		foreach ($this->extendList as $el) {
 			$extendList[] = $el->compile($el);
 		}
 
 		$evaldCondition = false;
-		if( $this->condition ){
+		if ($this->condition) {
 			$evaldCondition = $this->condition->compile($env);
 		}
 
-		return $this->createDerived( $elements, $extendList, $evaldCondition );
+		return $this->createDerived($elements, $extendList, $evaldCondition);
 	}
 
 
 	/**
 	 * @see Less_Tree::genCSS
 	 */
-    public function genCSS( $output, $firstSelector = true ){
+    public function genCSS($output, $firstSelector = true) {
 
-		if( !$firstSelector && $this->elements[0]->combinator === "" ){
+		if (!$firstSelector && $this->elements[0]->combinator==="") {
 			$output->add(' ', $this->currentFileInfo, $this->index);
 		}
 
-		foreach($this->elements as $element){
-			$element->genCSS( $output );
+		foreach ($this->elements as $element) {
+			$element->genCSS($output);
 		}
 	}
 
-    public function markReferenced(){
+    public function markReferenced() {
 		$this->isReferenced = true;
 	}
 
-    public function getIsReferenced(){
+    public function getIsReferenced() {
 		return !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference'] || $this->isReferenced;
 	}
 
-    public function getIsOutput(){
+    public function getIsOutput() {
 		return $this->evaldCondition;
 	}
 
@@ -7593,23 +7593,23 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_UnicodeDescriptor extends Less_Tree{
+class Less_Tree_UnicodeDescriptor extends Less_Tree {
 
 	public $value;
 	public $type = 'UnicodeDescriptor';
 
-	public function __construct($value){
+	public function __construct($value) {
 		$this->value = $value;
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-	public function genCSS( $output ){
-		$output->add( $this->value );
+	public function genCSS($output) {
+		$output->add($this->value);
 	}
 
-	public function compile(){
+	public function compile() {
 		return $this;
 	}
 }
@@ -7622,46 +7622,46 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Unit extends Less_Tree{
+class Less_Tree_Unit extends Less_Tree {
 
 	var $numerator = array();
 	var $denominator = array();
 	public $backupUnit;
 	public $type = 'Unit';
 
-    public function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
+    public function __construct($numerator = array(), $denominator = array(), $backupUnit = null) {
 		$this->numerator = $numerator;
 		$this->denominator = $denominator;
 		$this->backupUnit = $backupUnit;
 	}
 
-    public function __clone(){
+    public function __clone() {
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-
-		if( $this->numerator ){
-			$output->add( $this->numerator[0] );
-		}elseif( $this->denominator ){
-			$output->add( $this->denominator[0] );
-		}elseif( !Less_Parser::$options['strictUnits'] && $this->backupUnit ){
-			$output->add( $this->backupUnit );
-			return ;
+    public function genCSS($output) {
+
+		if ($this->numerator) {
+			$output->add($this->numerator[0]);
+		}elseif ($this->denominator) {
+			$output->add($this->denominator[0]);
+		}elseif (!Less_Parser::$options['strictUnits'] && $this->backupUnit) {
+			$output->add($this->backupUnit);
+			return;
 		}
 	}
 
-    public function toString(){
-		$returnStr = implode('*',$this->numerator);
-		foreach($this->denominator as $d){
+    public function toString() {
+		$returnStr = implode('*', $this->numerator);
+		foreach ($this->denominator as $d) {
 			$returnStr .= '/'.$d;
 		}
 		return $returnStr;
 	}
 
-    public function __toString(){
+    public function __toString() {
 		return $this->toString();
 	}
 
@@ -7670,45 +7670,45 @@ 
 	 * @param Less_Tree_Unit $other
 	 */
     public function compare($other) {
-		return $this->is( $other->toString() ) ? 0 : -1;
+		return $this->is($other->toString()) ? 0 : -1;
 	}
 
-    public function is($unitString){
-		return $this->toString() === $unitString;
+    public function is($unitString) {
+		return $this->toString()===$unitString;
 	}
 
-    public function isLength(){
+    public function isLength() {
 		$css = $this->toCSS();
-		return !!preg_match('/px|em|%|in|cm|mm|pc|pt|ex/',$css);
+		return !!preg_match('/px|em|%|in|cm|mm|pc|pt|ex/', $css);
 	}
 
     public function isAngle() {
-		return isset( Less_Tree_UnitConversions::$angle[$this->toCSS()] );
+		return isset(Less_Tree_UnitConversions::$angle[$this->toCSS()]);
 	}
 
-    public function isEmpty(){
+    public function isEmpty() {
 		return !$this->numerator && !$this->denominator;
 	}
 
     public function isSingular() {
-		return count($this->numerator) <= 1 && !$this->denominator;
+		return count($this->numerator)<=1 && !$this->denominator;
 	}
 
 
-    public function usedUnits(){
+    public function usedUnits() {
 		$result = array();
 
-		foreach(Less_Tree_UnitConversions::$groups as $groupName){
+		foreach (Less_Tree_UnitConversions::$groups as $groupName) {
 			$group = Less_Tree_UnitConversions::${$groupName};
 
-			foreach($this->numerator as $atomicUnit){
-				if( isset($group[$atomicUnit]) && !isset($result[$groupName]) ){
+			foreach ($this->numerator as $atomicUnit) {
+				if (isset($group[$atomicUnit]) && !isset($result[$groupName])) {
 					$result[$groupName] = $atomicUnit;
 				}
 			}
 
-			foreach($this->denominator as $atomicUnit){
-				if( isset($group[$atomicUnit]) && !isset($result[$groupName]) ){
+			foreach ($this->denominator as $atomicUnit) {
+				if (isset($group[$atomicUnit]) && !isset($result[$groupName])) {
 					$result[$groupName] = $atomicUnit;
 				}
 			}
@@ -7717,40 +7717,40 @@ 
 		return $result;
 	}
 
-    public function cancel(){
+    public function cancel() {
 		$counter = array();
 		$backup = null;
 
-		foreach($this->numerator as $atomicUnit){
-			if( !$backup ){
+		foreach ($this->numerator as $atomicUnit) {
+			if (!$backup) {
 				$backup = $atomicUnit;
 			}
-			$counter[$atomicUnit] = ( isset($counter[$atomicUnit]) ? $counter[$atomicUnit] : 0) + 1;
+			$counter[$atomicUnit] = (isset($counter[$atomicUnit]) ? $counter[$atomicUnit] : 0)+1;
 		}
 
-		foreach($this->denominator as $atomicUnit){
-			if( !$backup ){
+		foreach ($this->denominator as $atomicUnit) {
+			if (!$backup) {
 				$backup = $atomicUnit;
 			}
-			$counter[$atomicUnit] = ( isset($counter[$atomicUnit]) ? $counter[$atomicUnit] : 0) - 1;
+			$counter[$atomicUnit] = (isset($counter[$atomicUnit]) ? $counter[$atomicUnit] : 0)-1;
 		}
 
 		$this->numerator = array();
 		$this->denominator = array();
 
-		foreach($counter as $atomicUnit => $count){
-			if( $count > 0 ){
-				for( $i = 0; $i < $count; $i++ ){
+		foreach ($counter as $atomicUnit => $count) {
+			if ($count>0) {
+				for ($i = 0; $i<$count; $i++) {
 					$this->numerator[] = $atomicUnit;
 				}
-			}elseif( $count < 0 ){
-				for( $i = 0; $i < -$count; $i++ ){
+			}elseif ($count<0) {
+				for ($i = 0; $i<-$count; $i++) {
 					$this->denominator[] = $atomicUnit;
 				}
 			}
 		}
 
-		if( !$this->numerator && !$this->denominator && $backup ){
+		if (!$this->numerator && !$this->denominator && $backup) {
 			$this->backupUnit = $backup;
 		}
 
@@ -7769,9 +7769,9 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_UnitConversions{
+class Less_Tree_UnitConversions {
 
-	public static $groups = array('length','duration','angle');
+	public static $groups = array('length', 'duration', 'angle');
 
 	public static $length = array(
 		'm'=> 1,
@@ -7789,9 +7789,9 @@ 
 		);
 
 	public static $angle = array(
-		'rad' => 0.1591549430919,	// 1/(2*M_PI),
-		'deg' => 0.002777778, 		// 1/360,
-		'grad'=> 0.0025,			// 1/400,
+		'rad' => 0.1591549430919, // 1/(2*M_PI),
+		'deg' => 0.002777778, // 1/360,
+		'grad'=> 0.0025, // 1/400,
 		'turn'=> 1
 		);
 
@@ -7803,7 +7803,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Url extends Less_Tree{
+class Less_Tree_Url extends Less_Tree {
 
 	public $attrs;
 	public $value;
@@ -7811,57 +7811,57 @@ 
 	public $isEvald;
 	public $type = 'Url';
 
-	public function __construct($value, $currentFileInfo = null, $isEvald = null){
+	public function __construct($value, $currentFileInfo = null, $isEvald = null) {
 		$this->value = $value;
 		$this->currentFileInfo = $currentFileInfo;
 		$this->isEvald = $isEvald;
 	}
 
-    public function accept( $visitor ){
+    public function accept($visitor) {
 		$this->value = $visitor->visitObj($this->value);
 	}
 
     /**
      * @see Less_Tree::genCSS
      */
-    public function genCSS( $output ){
-		$output->add( 'url(' );
-		$this->value->genCSS( $output );
-		$output->add( ')' );
+    public function genCSS($output) {
+		$output->add('url(');
+		$this->value->genCSS($output);
+		$output->add(')');
 	}
 
 	/**
 	 * @param Less_Functions $ctx
 	 */
-	public function compile($ctx){
+	public function compile($ctx) {
 		$val = $this->value->compile($ctx);
 
-		if( !$this->isEvald ){
+		if (!$this->isEvald) {
 			// Add the base path if the URL is relative
-			if( Less_Parser::$options['relativeUrls']
+			if (Less_Parser::$options['relativeUrls']
 				&& $this->currentFileInfo
 				&& is_string($val->value)
 				&& Less_Environment::isPathRelative($val->value)
-			){
+			) {
 				$rootpath = $this->currentFileInfo['uri_root'];
-				if ( !$val->quote ){
-					$rootpath = preg_replace('/[\(\)\'"\s]/', '\\$1', $rootpath );
+				if (!$val->quote) {
+					$rootpath = preg_replace('/[\(\)\'"\s]/', '\\$1', $rootpath);
 				}
-				$val->value = $rootpath . $val->value;
+				$val->value = $rootpath.$val->value;
 			}
 
-			$val->value = Less_Environment::normalizePath( $val->value);
+			$val->value = Less_Environment::normalizePath($val->value);
 		}
 
 		// Add cache buster if enabled
-		if( Less_Parser::$options['urlArgs'] ){
-			if( !preg_match('/^\s*data:/',$val->value) ){
-				$delimiter = strpos($val->value,'?') === false ? '?' : '&';
-				$urlArgs = $delimiter . Less_Parser::$options['urlArgs'];
-				$hash_pos = strpos($val->value,'#');
-				if( $hash_pos !== false ){
-					$val->value = substr_replace($val->value,$urlArgs, $hash_pos, 0);
-				} else {
+		if (Less_Parser::$options['urlArgs']) {
+			if (!preg_match('/^\s*data:/', $val->value)) {
+				$delimiter = strpos($val->value, '?')===false ? '?' : '&';
+				$urlArgs = $delimiter.Less_Parser::$options['urlArgs'];
+				$hash_pos = strpos($val->value, '#');
+				if ($hash_pos!==false) {
+					$val->value = substr_replace($val->value, $urlArgs, $hash_pos, 0);
+				}else {
 					$val->value .= $urlArgs;
 				}
 			}
@@ -7879,12 +7879,12 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Value extends Less_Tree{
+class Less_Tree_Value extends Less_Tree {
 
 	public $type = 'Value';
 	public $value;
 
-	public function __construct($value){
+	public function __construct($value) {
 		$this->value = $value;
 	}
 
@@ -7892,14 +7892,14 @@ 
 		$this->value = $visitor->visitArray($this->value);
 	}
 
-	public function compile($env){
+	public function compile($env) {
 
 		$ret = array();
 		$i = 0;
-		foreach($this->value as $i => $v){
+		foreach ($this->value as $i => $v) {
 			$ret[] = $v->compile($env);
 		}
-		if( $i > 0 ){
+		if ($i>0) {
 			return new Less_Tree_Value($ret);
 		}
 		return $ret[0];
@@ -7908,12 +7908,12 @@ 
     /**
      * @see Less_Tree::genCSS
      */
-	function genCSS( $output ){
+	function genCSS($output) {
 		$len = count($this->value);
-		for($i = 0; $i < $len; $i++ ){
-			$this->value[$i]->genCSS( $output );
-			if( $i+1 < $len ){
-				$output->add( Less_Environment::$_outputMap[','] );
+		for ($i = 0; $i<$len; $i++) {
+			$this->value[$i]->genCSS($output);
+			if ($i+1<$len) {
+				$output->add(Less_Environment::$_outputMap[',']);
 			}
 		}
 	}
@@ -7927,7 +7927,7 @@ 
  * @package Less
  * @subpackage tree
  */
-class Less_Tree_Variable extends Less_Tree{
+class Less_Tree_Variable extends Less_Tree {
 
 	public $name;
 	public $index;
@@ -7946,35 +7946,35 @@ 
 
 	public function compile($env) {
 
-		if( $this->name[1] === '@' ){
-			$v = new Less_Tree_Variable(substr($this->name, 1), $this->index + 1, $this->currentFileInfo);
-			$name = '@' . $v->compile($env)->value;
-		}else{
+		if ($this->name[1]==='@') {
+			$v = new Less_Tree_Variable(substr($this->name, 1), $this->index+1, $this->currentFileInfo);
+			$name = '@'.$v->compile($env)->value;
+		}else {
 			$name = $this->name;
 		}
 
 		if ($this->evaluating) {
-			throw new Less_Exception_Compiler("Recursive variable definition for " . $name, null, $this->index, $this->currentFileInfo);
+			throw new Less_Exception_Compiler("Recursive variable definition for ".$name, null, $this->index, $this->currentFileInfo);
 		}
 
 		$this->evaluating = true;
 
-		foreach($env->frames as $frame){
-			if( $v = $frame->variable($name) ){
+		foreach ($env->frames as $frame) {
+			if ($v = $frame->variable($name)) {
 				$r = $v->value->compile($env);
 				$this->evaluating = false;
 				return $r;
 			}
 		}
 
-		throw new Less_Exception_Compiler("variable " . $name . " is undefined in file ".$this->currentFileInfo["filename"], null, $this->index, $this->currentFileInfo);
+		throw new Less_Exception_Compiler("variable ".$name." is undefined in file ".$this->currentFileInfo["filename"], null, $this->index, $this->currentFileInfo);
 	}
 
 }
  
 
 
-class Less_Tree_Mixin_Call extends Less_Tree{
+class Less_Tree_Mixin_Call extends Less_Tree {
 
 	public $selector;
 	public $arguments;
@@ -7988,7 +7988,7 @@ 
 	 * less.js: tree.mixin.Call
 	 *
 	 */
-	public function __construct($elements, $args, $index, $currentFileInfo, $important = false){
+	public function __construct($elements, $args, $index, $currentFileInfo, $important = false) {
 		$this->selector = new Less_Tree_Selector($elements);
 		$this->arguments = $args;
 		$this->index = $index;
@@ -8002,7 +8002,7 @@ 
 	//}
 
 
-	public function compile($env){
+	public function compile($env) {
 
 		$rules = array();
 		$match = false;
@@ -8012,15 +8012,15 @@ 
 		$conditionResult = array();
 
 		$args = array();
-		foreach($this->arguments as $a){
-			$args[] = array('name'=> $a['name'], 'value' => $a['value']->compile($env) );
+		foreach ($this->arguments as $a) {
+			$args[] = array('name'=> $a['name'], 'value' => $a['value']->compile($env));
 		}
 
-		foreach($env->frames as $frame){
+		foreach ($env->frames as $frame) {
 
 			$mixins = $frame->find($this->selector);
 
-			if( !$mixins ){
+			if (!$mixins) {
 				continue;
 			}
 
@@ -8035,31 +8035,31 @@ 
 			// we make a final decision.
 
 			$mixins_len = count($mixins);
-			for( $m = 0; $m < $mixins_len; $m++ ){
+			for ($m = 0; $m<$mixins_len; $m++) {
 				$mixin = $mixins[$m];
 
-				if( $this->IsRecursive( $env, $mixin ) ){
+				if ($this->IsRecursive($env, $mixin)) {
 					continue;
 				}
 
-				if( $mixin->matchArgs($args, $env) ){
+				if ($mixin->matchArgs($args, $env)) {
 
 					$candidate = array('mixin' => $mixin, 'group' => $defNone);
 
-					if( $mixin instanceof Less_Tree_Ruleset ){
+					if ($mixin instanceof Less_Tree_Ruleset) {
 
-						for( $f = 0; $f < 2; $f++ ){
+						for ($f = 0; $f<2; $f++) {
 							Less_Tree_DefaultFunc::value($f);
-							$conditionResult[$f] = $mixin->matchCondition( $args, $env);
+							$conditionResult[$f] = $mixin->matchCondition($args, $env);
 						}
-						if( $conditionResult[0] || $conditionResult[1] ){
-							if( $conditionResult[0] != $conditionResult[1] ){
+						if ($conditionResult[0] || $conditionResult[1]) {
+							if ($conditionResult[0]!=$conditionResult[1]) {
 								$candidate['group'] = $conditionResult[1] ? $defTrue : $defFalse;
 							}
 
 							$candidates[] = $candidate;
 						}
-					}else{
+					}else {
 						$candidates[] = $candidate;
 					}
 
@@ -8071,29 +8071,29 @@ 
 
 
 			$count = array(0, 0, 0);
-			for( $m = 0; $m < count($candidates); $m++ ){
-				$count[ $candidates[$m]['group'] ]++;
+			for ($m = 0; $m<count($candidates); $m++) {
+				$count[$candidates[$m]['group']]++;
 			}
 
-			if( $count[$defNone] > 0 ){
+			if ($count[$defNone]>0) {
 				$defaultResult = $defFalse;
-			} else {
+			}else {
 				$defaultResult = $defTrue;
-				if( ($count[$defTrue] + $count[$defFalse]) > 1 ){
-					throw new Exception( 'Ambiguous use of `default()` found when matching for `'. $this->format($args) + '`' );
+				if (($count[$defTrue]+$count[$defFalse])>1) {
+					throw new Exception('Ambiguous use of `default()` found when matching for `'.$this->format($args)+'`');
 				}
 			}
 
 
 			$candidates_length = count($candidates);
-			$length_1 = ($candidates_length == 1);
+			$length_1 = ($candidates_length==1);
 
-			for( $m = 0; $m < $candidates_length; $m++){
+			for ($m = 0; $m<$candidates_length; $m++) {
 				$candidate = $candidates[$m]['group'];
-				if( ($candidate === $defNone) || ($candidate === $defaultResult) ){
-					try{
+				if (($candidate===$defNone) || ($candidate===$defaultResult)) {
+					try {
 						$mixin = $candidates[$m]['mixin'];
-						if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
+						if (!($mixin instanceof Less_Tree_Mixin_Definition)) {
 							$mixin = new Less_Tree_Mixin_Definition('', array(), $mixin->rules, null, false);
 							$mixin->originalRuleset = $mixins[$m]->originalRuleset;
 						}
@@ -8105,8 +8105,8 @@ 
 				}
 			}
 
-			if( $match ){
-				if( !$this->currentFileInfo || !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference'] ){
+			if ($match) {
+				if (!$this->currentFileInfo || !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference']) {
 					Less_Tree::ReferencedArray($rules);
 				}
 
@@ -8114,11 +8114,11 @@ 
 			}
 		}
 
-		if( $isOneFound ){
-			throw new Less_Exception_Compiler('No matching definition was found for `'.$this->Format( $args ).'`', null, $this->index, $this->currentFileInfo);
+		if ($isOneFound) {
+			throw new Less_Exception_Compiler('No matching definition was found for `'.$this->Format($args).'`', null, $this->index, $this->currentFileInfo);
 
-		}else{
-			throw new Less_Exception_Compiler(trim($this->selector->toCSS()) . " is undefined in ".$this->currentFileInfo['filename'], null, $this->index);
+		}else {
+			throw new Less_Exception_Compiler(trim($this->selector->toCSS())." is undefined in ".$this->currentFileInfo['filename'], null, $this->index);
 		}
 
 	}
@@ -8127,23 +8127,23 @@ 
 	 * Format the args for use in exception messages
 	 *
 	 */
-	private function Format($args){
+	private function Format($args) {
 		$message = array();
-		if( $args ){
-			foreach($args as $a){
+		if ($args) {
+			foreach ($args as $a) {
 				$argValue = '';
-				if( $a['name'] ){
+				if ($a['name']) {
 					$argValue += $a['name']+':';
 				}
-				if( is_object($a['value']) ){
+				if (is_object($a['value'])) {
 					$argValue += $a['value']->toCSS();
-				}else{
+				}else {
 					$argValue += '???';
 				}
 				$message[] = $argValue;
 			}
 		}
-		return implode(', ',$message);
+		return implode(', ', $message);
 	}
 
 
@@ -8152,16 +8152,16 @@ 
 	 *
 	 * @return bool
 	 */
-	private function IsRecursive( $env, $mixin ){
+	private function IsRecursive($env, $mixin) {
 
-		foreach($env->frames as $recur_frame){
-			if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
+		foreach ($env->frames as $recur_frame) {
+			if (!($mixin instanceof Less_Tree_Mixin_Definition)) {
 
-				if( $mixin === $recur_frame ){
+				if ($mixin===$recur_frame) {
 					return true;
 				}
 
-				if( isset($recur_frame->originalRuleset) && $mixin->ruleset_id === $recur_frame->originalRuleset ){
+				if (isset($recur_frame->originalRuleset) && $mixin->ruleset_id===$recur_frame->originalRuleset) {
 					return true;
 				}
 			}
@@ -8175,34 +8175,34 @@ 
 
  
 
-class Less_Tree_Mixin_Definition extends Less_Tree_Ruleset{
+class Less_Tree_Mixin_Definition extends Less_Tree_Ruleset {
 	public $name;
 	public $selectors;
 	public $params;
-	public $arity		= 0;
+	public $arity = 0;
 	public $rules;
 	public $lookups		= array();
 	public $required	= 0;
-	public $frames		= array();
+	public $frames = array();
 	public $condition;
 	public $variadic;
-	public $type		= 'MixinDefinition';
+	public $type = 'MixinDefinition';
 
 
 	// less.js : /lib/less/tree/mixin.js : tree.mixin.Definition
-	public function __construct($name, $params, $rules, $condition, $variadic = false, $frames = array() ){
+	public function __construct($name, $params, $rules, $condition, $variadic = false, $frames = array()) {
 		$this->name = $name;
-		$this->selectors = array(new Less_Tree_Selector(array( new Less_Tree_Element(null, $name))));
+		$this->selectors = array(new Less_Tree_Selector(array(new Less_Tree_Element(null, $name))));
 
 		$this->params = $params;
 		$this->condition = $condition;
 		$this->variadic = $variadic;
 		$this->rules = $rules;
 
-		if( $params ){
+		if ($params) {
 			$this->arity = count($params);
-			foreach( $params as $p ){
-				if (! isset($p['name']) || ($p['name'] && !isset($p['value']))) {
+			foreach ($params as $p) {
+				if (!isset($p['name']) || ($p['name'] && !isset($p['value']))) {
 					$this->required++;
 				}
 			}
@@ -8221,29 +8221,29 @@ 
 	//}
 
 
-	public function toCSS(){
+	public function toCSS() {
 		return '';
 	}
 
 	// less.js : /lib/less/tree/mixin.js : tree.mixin.Definition.evalParams
-	public function compileParams($env, $mixinFrames, $args = array() , &$evaldArguments = array() ){
+	public function compileParams($env, $mixinFrames, $args = array(), &$evaldArguments = array()) {
 		$frame = new Less_Tree_Ruleset(null, array());
 		$params = $this->params;
 		$mixinEnv = null;
 		$argsLength = 0;
 
-		if( $args ){
+		if ($args) {
 			$argsLength = count($args);
-			for($i = 0; $i < $argsLength; $i++ ){
+			for ($i = 0; $i<$argsLength; $i++) {
 				$arg = $args[$i];
 
-				if( $arg && $arg['name'] ){
+				if ($arg && $arg['name']) {
 					$isNamedFound = false;
 
-					foreach($params as $j => $param){
-						if( !isset($evaldArguments[$j]) && $arg['name'] === $params[$j]['name']) {
+					foreach ($params as $j => $param) {
+						if (!isset($evaldArguments[$j]) && $arg['name']===$params[$j]['name']) {
 							$evaldArguments[$j] = $arg['value']->compile($env);
-							array_unshift($frame->rules, new Less_Tree_Rule( $arg['name'], $arg['value']->compile($env) ) );
+							array_unshift($frame->rules, new Less_Tree_Rule($arg['name'], $arg['value']->compile($env)));
 							$isNamedFound = true;
 							break;
 						}
@@ -8253,48 +8253,48 @@ 
 						$i--;
 						$argsLength--;
 						continue;
-					} else {
-						throw new Less_Exception_Compiler("Named argument for " . $this->name .' '.$args[$i]['name'] . ' not found');
+					}else {
+						throw new Less_Exception_Compiler("Named argument for ".$this->name.' '.$args[$i]['name'].' not found');
 					}
 				}
 			}
 		}
 
 		$argIndex = 0;
-		foreach($params as $i => $param){
+		foreach ($params as $i => $param) {
 
-			if ( isset($evaldArguments[$i]) ){ continue; }
+			if (isset($evaldArguments[$i])) { continue; }
 
 			$arg = null;
-			if( isset($args[$argIndex]) ){
+			if (isset($args[$argIndex])) {
 				$arg = $args[$argIndex];
 			}
 
 			if (isset($param['name']) && $param['name']) {
 
-				if( isset($param['variadic']) ){
+				if (isset($param['variadic'])) {
 					$varargs = array();
-					for ($j = $argIndex; $j < $argsLength; $j++) {
+					for ($j = $argIndex; $j<$argsLength; $j++) {
 						$varargs[] = $args[$j]['value']->compile($env);
 					}
 					$expression = new Less_Tree_Expression($varargs);
 					array_unshift($frame->rules, new Less_Tree_Rule($param['name'], $expression->compile($env)));
-				}else{
+				}else {
 					$val = ($arg && $arg['value']) ? $arg['value'] : false;
 
 					if ($val) {
 						$val = $val->compile($env);
-					} else if ( isset($param['value']) ) {
+					}else if (isset($param['value'])) {
 
-						if( !$mixinEnv ){
+						if (!$mixinEnv) {
 							$mixinEnv = new Less_Environment();
-							$mixinEnv->frames = array_merge( array($frame), $mixinFrames);
+							$mixinEnv->frames = array_merge(array($frame), $mixinFrames);
 						}
 
 						$val = $param['value']->compile($mixinEnv);
 						$frame->resetCache();
-					} else {
-						throw new Less_Exception_Compiler("Wrong number of arguments for " . $this->name . " (" . $argsLength . ' for ' . $this->arity . ")");
+					}else {
+						throw new Less_Exception_Compiler("Wrong number of arguments for ".$this->name." (".$argsLength.' for '.$this->arity.")");
 					}
 
 					array_unshift($frame->rules, new Less_Tree_Rule($param['name'], $val));
@@ -8302,8 +8302,8 @@ 
 				}
 			}
 
-			if ( isset($param['variadic']) && $args) {
-				for ($j = $argIndex; $j < $argsLength; $j++) {
+			if (isset($param['variadic']) && $args) {
+				for ($j = $argIndex; $j<$argsLength; $j++) {
 					$evaldArguments[$j] = $args[$j]['value']->compile($env);
 				}
 			}
@@ -8317,10 +8317,10 @@ 
 	}
 
 	public function compile($env) {
-		if( $this->frames ){
-			return new Less_Tree_Mixin_Definition($this->name, $this->params, $this->rules, $this->condition, $this->variadic, $this->frames );
+		if ($this->frames) {
+			return new Less_Tree_Mixin_Definition($this->name, $this->params, $this->rules, $this->condition, $this->variadic, $this->frames);
 		}
-		return new Less_Tree_Mixin_Definition($this->name, $this->params, $this->rules, $this->condition, $this->variadic, $env->frames );
+		return new Less_Tree_Mixin_Definition($this->name, $this->params, $this->rules, $this->condition, $this->variadic, $env->frames);
 	}
 
 	public function evalCall($env, $args = NULL, $important = NULL) {
@@ -8329,9 +8329,9 @@ 
 
 		$_arguments = array();
 
-		if( $this->frames ){
+		if ($this->frames) {
 			$mixinFrames = array_merge($this->frames, $env->frames);
-		}else{
+		}else {
 			$mixinFrames = $env->frames;
 		}
 
@@ -8346,10 +8346,10 @@ 
 
 
 		$ruleSetEnv = new Less_Environment();
-		$ruleSetEnv->frames = array_merge( array($this, $frame), $mixinFrames );
-		$ruleset = $ruleset->compile( $ruleSetEnv );
+		$ruleSetEnv->frames = array_merge(array($this, $frame), $mixinFrames);
+		$ruleset = $ruleset->compile($ruleSetEnv);
 
-		if( $important ){
+		if ($important) {
 			$ruleset = $ruleset->makeImportant();
 		}
 
@@ -8361,16 +8361,16 @@ 
 
 	public function matchCondition($args, $env) {
 
-		if( !$this->condition ){
+		if (!$this->condition) {
 			return true;
 		}
 
 		// set array to prevent error on array_merge
-		if(!is_array($this->frames)) {
+		if (!is_array($this->frames)) {
              $this->frames = array();
         }
 
-		$frame = $this->compileParams($env, array_merge($this->frames,$env->frames), $args );
+		$frame = $this->compileParams($env, array_merge($this->frames, $env->frames), $args);
 
 		$compile_env = new Less_Environment();
 		$compile_env->frames = array_merge(
@@ -8384,27 +8384,27 @@ 
 		return (bool)$this->condition->compile($compile_env);
 	}
 
-	public function matchArgs($args, $env = NULL){
+	public function matchArgs($args, $env = NULL) {
 		$argsLength = count($args);
 
-		if( !$this->variadic ){
-			if( $argsLength < $this->required ){
+		if (!$this->variadic) {
+			if ($argsLength<$this->required) {
 				return false;
 			}
-			if( $argsLength > count($this->params) ){
+			if ($argsLength>count($this->params)) {
 				return false;
 			}
-		}else{
-			if( $argsLength < ($this->required - 1)){
+		}else {
+			if ($argsLength<($this->required-1)) {
 				return false;
 			}
 		}
 
 		$len = min($argsLength, $this->arity);
 
-		for( $i = 0; $i < $len; $i++ ){
-			if( !isset($this->params[$i]['name']) && !isset($this->params[$i]['variadic']) ){
-				if( $args[$i]['value']->compile($env)->toCSS() != $this->params[$i]['value']->compile($env)->toCSS() ){
+		for ($i = 0; $i<$len; $i++) {
+			if (!isset($this->params[$i]['name']) && !isset($this->params[$i]['variadic'])) {
+				if ($args[$i]['value']->compile($env)->toCSS()!=$this->params[$i]['value']->compile($env)->toCSS()) {
 					return false;
 				}
 			}
@@ -8422,13 +8422,13 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_extendFinder extends Less_Visitor{
+class Less_Visitor_extendFinder extends Less_Visitor {
 
 	public $contexts = array();
 	public $allExtendsStack;
 	public $foundExtends;
 
-	public function __construct(){
+	public function __construct() {
 		$this->contexts = array();
 		$this->allExtendsStack = array(array());
 		parent::__construct();
@@ -8437,32 +8437,32 @@ 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-    public function run($root){
+    public function run($root) {
 		$root = $this->visitObj($root);
-		$root->allExtends =& $this->allExtendsStack[0];
+		$root->allExtends = & $this->allExtendsStack[0];
 		return $root;
 	}
 
-    public function visitRule($ruleNode, &$visitDeeper ){
+    public function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset($rulesetNode){
+    public function visitRuleset($rulesetNode) {
 
-		if( $rulesetNode->root ){
+		if ($rulesetNode->root) {
 			return;
 		}
 
 		$allSelectorsExtendList = array();
 
 		// get &:extend(.a); rules which apply to all selectors in this ruleset
-		if( $rulesetNode->rules ){
-			foreach($rulesetNode->rules as $rule){
-				if( $rule instanceof Less_Tree_Extend ){
+		if ($rulesetNode->rules) {
+			foreach ($rulesetNode->rules as $rule) {
+				if ($rule instanceof Less_Tree_Extend) {
 					$allSelectorsExtendList[] = $rule;
 					$rulesetNode->extendOnEveryPath = true;
 				}
@@ -8472,14 +8472,14 @@ 
 
 		// now find every selector and apply the extends that apply to all extends
 		// and the ones which apply to an individual extend
-		foreach($rulesetNode->paths as $selectorPath){
+		foreach ($rulesetNode->paths as $selectorPath) {
 			$selector = end($selectorPath); //$selectorPath[ count($selectorPath)-1];
 
 			$j = 0;
-			foreach($selector->extendList as $extend){
+			foreach ($selector->extendList as $extend) {
 				$this->allExtendsStackPush($rulesetNode, $selectorPath, $extend, $j);
 			}
-			foreach($allSelectorsExtendList as $extend){
+			foreach ($allSelectorsExtendList as $extend) {
 				$this->allExtendsStackPush($rulesetNode, $selectorPath, $extend, $j);
 			}
 		}
@@ -8487,12 +8487,12 @@ 
 		$this->contexts[] = $rulesetNode->selectors;
 	}
 
-    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
+    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j) {
 		$this->foundExtends = true;
 		$extend = clone $extend;
-		$extend->findSelfSelectors( $selectorPath );
+		$extend->findSelfSelectors($selectorPath);
 		$extend->ruleset = $rulesetNode;
-		if( $j === 0 ){
+		if ($j===0) {
 			$extend->firstExtendOnThisSelectorPath = true;
 		}
 
@@ -8502,27 +8502,27 @@ 
 	}
 
 
-    public function visitRulesetOut( $rulesetNode ){
-		if( !is_object($rulesetNode) || !$rulesetNode->root ){
+    public function visitRulesetOut($rulesetNode) {
+		if (!is_object($rulesetNode) || !$rulesetNode->root) {
 			array_pop($this->contexts);
 		}
 	}
 
-    public function visitMedia( $mediaNode ){
+    public function visitMedia($mediaNode) {
 		$mediaNode->allExtends = array();
-		$this->allExtendsStack[] =& $mediaNode->allExtends;
+		$this->allExtendsStack[] = & $mediaNode->allExtends;
 	}
 
-    public function visitMediaOut(){
+    public function visitMediaOut() {
 		array_pop($this->allExtendsStack);
 	}
 
-    public function visitDirective( $directiveNode ){
+    public function visitDirective($directiveNode) {
 		$directiveNode->allExtends = array();
-		$this->allExtendsStack[] =& $directiveNode->allExtends;
+		$this->allExtendsStack[] = & $directiveNode->allExtends;
 	}
 
-    public function visitDirectiveOut(){
+    public function visitDirectiveOut() {
 		array_pop($this->allExtendsStack);
 	}
 }
@@ -8675,46 +8675,46 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_joinSelector extends Less_Visitor{
+class Less_Visitor_joinSelector extends Less_Visitor {
 
-	public $contexts = array( array() );
+	public $contexts = array(array());
 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-	public function run( $root ){
+	public function run($root) {
 		return $this->visitObj($root);
 	}
 
-    public function visitRule( $ruleNode, &$visitDeeper ){
+    public function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset( $rulesetNode ){
+    public function visitRuleset($rulesetNode) {
 
 		$paths = array();
 
-		if( !$rulesetNode->root ){
+		if (!$rulesetNode->root) {
 			$selectors = array();
 
-			if( $rulesetNode->selectors && $rulesetNode->selectors ){
-				foreach($rulesetNode->selectors as $selector){
-					if( $selector->getIsOutput() ){
+			if ($rulesetNode->selectors && $rulesetNode->selectors) {
+				foreach ($rulesetNode->selectors as $selector) {
+					if ($selector->getIsOutput()) {
 						$selectors[] = $selector;
 					}
 				}
 			}
 
-			if( !$selectors ){
+			if (!$selectors) {
 				$rulesetNode->selectors = null;
 				$rulesetNode->rules = null;
-			}else{
+			}else {
 				$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
-				$paths = $rulesetNode->joinSelectors( $context, $selectors);
+				$paths = $rulesetNode->joinSelectors($context, $selectors);
 			}
 
 			$rulesetNode->paths = $paths;
@@ -8723,14 +8723,14 @@ 
 		$this->contexts[] = $paths; //different from less.js. Placed after joinSelectors() so that $this->contexts will get correct $paths
 	}
 
-    public function visitRulesetOut(){
+    public function visitRulesetOut() {
 		array_pop($this->contexts);
 	}
 
     public function visitMedia($mediaNode) {
 		$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
-		if( !count($context) || (is_object($context[0]) && $context[0]->multiMedia) ){
+		if (!count($context) || (is_object($context[0]) && $context[0]->multiMedia)) {
 			$mediaNode->rules[0]->root = true;
 		}
 	}
@@ -8745,29 +8745,29 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_processExtends extends Less_Visitor{
+class Less_Visitor_processExtends extends Less_Visitor {
 
 	public $allExtendsStack;
 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-	public function run( $root ){
+	public function run($root) {
 		$extendFinder = new Less_Visitor_extendFinder();
-		$extendFinder->run( $root );
-		if( !$extendFinder->foundExtends){
+		$extendFinder->run($root);
+		if (!$extendFinder->foundExtends) {
 			return $root;
 		}
 
-		$root->allExtends = $this->doExtendChaining( $root->allExtends, $root->allExtends);
+		$root->allExtends = $this->doExtendChaining($root->allExtends, $root->allExtends);
 
 		$this->allExtendsStack = array();
 		$this->allExtendsStack[] = &$root->allExtends;
 
-		return $this->visitObj( $root );
+		return $this->visitObj($root);
 	}
 
-	private function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0){
+	private function doExtendChaining($extendsList, $extendsListTarget, $iterationCount = 0) {
 		//
 		// chaining is different from normal extension.. if we extend an extend then we are not just copying, altering and pasting
 		// the selector we would do normally, but we are also adding an extend with the same target selector
@@ -8786,33 +8786,33 @@ 
 		// and the second is the target.
 		// the separation into two lists allows us to process a subset of chains with a bigger set, as is the
 		// case when processing media queries
-		for( $extendIndex = 0, $extendsList_len = count($extendsList); $extendIndex < $extendsList_len; $extendIndex++ ){
-			for( $targetExtendIndex = 0; $targetExtendIndex < count($extendsListTarget); $targetExtendIndex++ ){
+		for ($extendIndex = 0, $extendsList_len = count($extendsList); $extendIndex<$extendsList_len; $extendIndex++) {
+			for ($targetExtendIndex = 0; $targetExtendIndex<count($extendsListTarget); $targetExtendIndex++) {
 
 				$extend = $extendsList[$extendIndex];
 				$targetExtend = $extendsListTarget[$targetExtendIndex];
 
 				// look for circular references
-				if( in_array($targetExtend->object_id, $extend->parent_ids,true) ){
+				if (in_array($targetExtend->object_id, $extend->parent_ids, true)) {
 					continue;
 				}
 
 				// find a match in the target extends self selector (the bit before :extend)
-				$selectorPath = array( $targetExtend->selfSelectors[0] );
-				$matches = $this->findMatch( $extend, $selectorPath);
+				$selectorPath = array($targetExtend->selfSelectors[0]);
+				$matches = $this->findMatch($extend, $selectorPath);
 
 
-				if( $matches ){
+				if ($matches) {
 
 					// we found a match, so for each self selector..
-					foreach($extend->selfSelectors as $selfSelector ){
+					foreach ($extend->selfSelectors as $selfSelector) {
 
 
 						// process the extend as usual
-						$newSelector = $this->extendSelector( $matches, $selectorPath, $selfSelector);
+						$newSelector = $this->extendSelector($matches, $selectorPath, $selfSelector);
 
 						// but now we create a new extend from it
-						$newExtend = new Less_Tree_Extend( $targetExtend->selector, $targetExtend->option, 0);
+						$newExtend = new Less_Tree_Extend($targetExtend->selector, $targetExtend->option, 0);
 						$newExtend->selfSelectors = $newSelector;
 
 						// add the extend onto the list of extends for that selector
@@ -8824,12 +8824,12 @@ 
 						$newExtend->ruleset = $targetExtend->ruleset;
 
 						//remember its parents for circular references
-						$newExtend->parent_ids = array_merge($newExtend->parent_ids,$targetExtend->parent_ids,$extend->parent_ids);
+						$newExtend->parent_ids = array_merge($newExtend->parent_ids, $targetExtend->parent_ids, $extend->parent_ids);
 
 						// only process the selector once.. if we have :extend(.a,.b) then multiple
 						// extends will look at the same selector path, so when extending
 						// we know that any others will be duplicates in terms of what is added to the css
-						if( $targetExtend->firstExtendOnThisSelectorPath ){
+						if ($targetExtend->firstExtendOnThisSelectorPath) {
 							$newExtend->firstExtendOnThisSelectorPath = true;
 							$targetExtend->ruleset->paths[] = $newSelector;
 						}
@@ -8838,79 +8838,79 @@ 
 			}
 		}
 
-		if( $extendsToAdd ){
+		if ($extendsToAdd) {
 			// try to detect circular references to stop a stack overflow.
 			// may no longer be needed.			$this->extendChainCount++;
-			if( $iterationCount > 100) {
+			if ($iterationCount>100) {
 
-				try{
+				try {
 					$selectorOne = $extendsToAdd[0]->selfSelectors[0]->toCSS();
 					$selectorTwo = $extendsToAdd[0]->selector->toCSS();
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					$selectorOne = "{unable to calculate}";
 					$selectorTwo = "{unable to calculate}";
 				}
 
-				throw new Less_Exception_Parser("extend circular reference detected. One of the circular extends is currently:"+$selectorOne+":extend(" + $selectorTwo+")");
+				throw new Less_Exception_Parser("extend circular reference detected. One of the circular extends is currently:"+$selectorOne+":extend(" +$selectorTwo+")");
 			}
 
 			// now process the new extends on the existing rules so that we can handle a extending b extending c ectending d extending e...
-			$extendsToAdd = $this->doExtendChaining( $extendsToAdd, $extendsListTarget, $iterationCount+1);
+			$extendsToAdd = $this->doExtendChaining($extendsToAdd, $extendsListTarget, $iterationCount+1);
 		}
 
 		return array_merge($extendsList, $extendsToAdd);
 	}
 
 
-	protected function visitRule( $ruleNode, &$visitDeeper ){
+	protected function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	protected function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitSelector( $selectorNode, &$visitDeeper ){
+	protected function visitSelector($selectorNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitRuleset($rulesetNode){
+	protected function visitRuleset($rulesetNode) {
 
 
-		if( $rulesetNode->root ){
+		if ($rulesetNode->root) {
 			return;
 		}
 
-		$allExtends	= end($this->allExtendsStack);
+		$allExtends = end($this->allExtendsStack);
 		$paths_len = count($rulesetNode->paths);
 
 		// look at each selector path in the ruleset, find any extend matches and then copy, find and replace
-		foreach($allExtends as $allExtend){
-			for($pathIndex = 0; $pathIndex < $paths_len; $pathIndex++ ){
+		foreach ($allExtends as $allExtend) {
+			for ($pathIndex = 0; $pathIndex<$paths_len; $pathIndex++) {
 
 				// extending extends happens initially, before the main pass
-				if( isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath ){
+				if (isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath) {
 					continue;
 				}
 
 				$selectorPath = $rulesetNode->paths[$pathIndex];
 
-				if( end($selectorPath)->extendList ){
+				if (end($selectorPath)->extendList) {
 					continue;
 				}
 
-				$this->ExtendMatch( $rulesetNode, $allExtend, $selectorPath);
+				$this->ExtendMatch($rulesetNode, $allExtend, $selectorPath);
 
 			}
 		}
 	}
 
 
-	private function ExtendMatch( $rulesetNode, $extend, $selectorPath ){
+	private function ExtendMatch($rulesetNode, $extend, $selectorPath) {
 		$matches = $this->findMatch($extend, $selectorPath);
 
-		if( $matches ){
-			foreach($extend->selfSelectors as $selfSelector ){
+		if ($matches) {
+			foreach ($extend->selfSelectors as $selfSelector) {
 				$rulesetNode->paths[] = $this->extendSelector($matches, $selectorPath, $selfSelector);
 			}
 		}
@@ -8918,10 +8918,10 @@ 
 
 
 
-	private function findMatch($extend, $haystackSelectorPath ){
+	private function findMatch($extend, $haystackSelectorPath) {
 
 
-		if( !$this->HasMatches($extend, $haystackSelectorPath) ){
+		if (!$this->HasMatches($extend, $haystackSelectorPath)) {
 			return false;
 		}
 
@@ -8940,41 +8940,41 @@ 
 
 		// loop through the haystack elements
 		$haystack_path_len = count($haystackSelectorPath);
-		for($haystackSelectorIndex = 0; $haystackSelectorIndex < $haystack_path_len; $haystackSelectorIndex++ ){
+		for ($haystackSelectorIndex = 0; $haystackSelectorIndex<$haystack_path_len; $haystackSelectorIndex++) {
 			$hackstackSelector = $haystackSelectorPath[$haystackSelectorIndex];
 
 			$haystack_elements_len = count($hackstackSelector->elements);
-			for($hackstackElementIndex = 0; $hackstackElementIndex < $haystack_elements_len; $hackstackElementIndex++ ){
+			for ($hackstackElementIndex = 0; $hackstackElementIndex<$haystack_elements_len; $hackstackElementIndex++) {
 
 				$haystackElement = $hackstackSelector->elements[$hackstackElementIndex];
 
 				// if we allow elements before our match we can add a potential match every time. otherwise only at the first element.
-				if( $extend->allowBefore || ($haystackSelectorIndex === 0 && $hackstackElementIndex === 0) ){
+				if ($extend->allowBefore || ($haystackSelectorIndex===0 && $hackstackElementIndex===0)) {
 					$potentialMatches[] = array('pathIndex'=> $haystackSelectorIndex, 'index'=> $hackstackElementIndex, 'matched'=> 0, 'initialCombinator'=> $haystackElement->combinator);
 					$potentialMatches_len++;
 				}
 
-				for($i = 0; $i < $potentialMatches_len; $i++ ){
+				for ($i = 0; $i<$potentialMatches_len; $i++) {
 
 					$potentialMatch = &$potentialMatches[$i];
-					$potentialMatch = $this->PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex );
+					$potentialMatch = $this->PotentialMatch($potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex);
 
 
 					// if we are still valid and have finished, test whether we have elements after and whether these are allowed
-					if( $potentialMatch && $potentialMatch['matched'] === $extend->selector->elements_len ){
+					if ($potentialMatch && $potentialMatch['matched']===$extend->selector->elements_len) {
 						$potentialMatch['finished'] = true;
 
-						if( !$extend->allowAfter && ($hackstackElementIndex+1 < $haystack_elements_len || $haystackSelectorIndex+1 < $haystack_path_len) ){
+						if (!$extend->allowAfter && ($hackstackElementIndex+1<$haystack_elements_len || $haystackSelectorIndex+1<$haystack_path_len)) {
 							$potentialMatch = null;
 						}
 					}
 
 					// if null we remove, if not, we are still valid, so either push as a valid match or continue
-					if( $potentialMatch ){
-						if( $potentialMatch['finished'] ){
+					if ($potentialMatch) {
+						if ($potentialMatch['finished']) {
 							$potentialMatch['length'] = $extend->selector->elements_len;
 							$potentialMatch['endPathIndex'] = $haystackSelectorIndex;
-							$potentialMatch['endPathElementIndex'] = $hackstackElementIndex + 1; // index after end of match
+							$potentialMatch['endPathElementIndex'] = $hackstackElementIndex+1; // index after end of match
 							$potentialMatches = array(); // we don't allow matches to overlap, so start matching again
 							$potentialMatches_len = 0;
 							$matches[] = $potentialMatch;
@@ -8995,20 +8995,20 @@ 
 
 	// Before going through all the nested loops, lets check to see if a match is possible
 	// Reduces Bootstrap 3.1 compile time from ~6.5s to ~5.6s
-	private function HasMatches($extend, $haystackSelectorPath){
+	private function HasMatches($extend, $haystackSelectorPath) {
 
-		if( !$extend->selector->cacheable ){
+		if (!$extend->selector->cacheable) {
 			return true;
 		}
 
 		$first_el = $extend->selector->_oelements[0];
 
-		foreach($haystackSelectorPath as $hackstackSelector){
-			if( !$hackstackSelector->cacheable ){
+		foreach ($haystackSelectorPath as $hackstackSelector) {
+			if (!$hackstackSelector->cacheable) {
 				return true;
 			}
 
-			if( in_array($first_el, $hackstackSelector->_oelements) ){
+			if (in_array($first_el, $hackstackSelector->_oelements)) {
 				return true;
 			}
 		}
@@ -9020,26 +9020,26 @@ 
 	/**
 	 * @param integer $hackstackElementIndex
 	 */
-	private function PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex ){
+	private function PotentialMatch($potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex) {
 
 
-		if( $potentialMatch['matched'] > 0 ){
+		if ($potentialMatch['matched']>0) {
 
 			// selectors add " " onto the first element. When we use & it joins the selectors together, but if we don't
 			// then each selector in haystackSelectorPath has a space before it added in the toCSS phase. so we need to work out
 			// what the resulting combinator will be
 			$targetCombinator = $haystackElement->combinator;
-			if( $targetCombinator === '' && $hackstackElementIndex === 0 ){
+			if ($targetCombinator==='' && $hackstackElementIndex===0) {
 				$targetCombinator = ' ';
 			}
 
-			if( $needleElements[ $potentialMatch['matched'] ]->combinator !== $targetCombinator ){
+			if ($needleElements[$potentialMatch['matched']]->combinator!==$targetCombinator) {
 				return null;
 			}
 		}
 
 		// if we don't match, null our match to indicate failure
-		if( !$this->isElementValuesEqual( $needleElements[$potentialMatch['matched'] ]->value, $haystackElement->value) ){
+		if (!$this->isElementValuesEqual($needleElements[$potentialMatch['matched']]->value, $haystackElement->value)) {
 			return null;
 		}
 
@@ -9050,23 +9050,23 @@ 
 	}
 
 
-	private function isElementValuesEqual( $elementValue1, $elementValue2 ){
+	private function isElementValuesEqual($elementValue1, $elementValue2) {
 
-		if( $elementValue1 === $elementValue2 ){
+		if ($elementValue1===$elementValue2) {
 			return true;
 		}
 
-		if( is_string($elementValue1) || is_string($elementValue2) ) {
+		if (is_string($elementValue1) || is_string($elementValue2)) {
 			return false;
 		}
 
-		if( $elementValue1 instanceof Less_Tree_Attribute ){
-			return $this->isAttributeValuesEqual( $elementValue1, $elementValue2 );
+		if ($elementValue1 instanceof Less_Tree_Attribute) {
+			return $this->isAttributeValuesEqual($elementValue1, $elementValue2);
 		}
 
 		$elementValue1 = $elementValue1->value;
-		if( $elementValue1 instanceof Less_Tree_Selector ){
-			return $this->isSelectorValuesEqual( $elementValue1, $elementValue2 );
+		if ($elementValue1 instanceof Less_Tree_Selector) {
+			return $this->isSelectorValuesEqual($elementValue1, $elementValue2);
 		}
 
 		return false;
@@ -9076,22 +9076,22 @@ 
 	/**
 	 * @param Less_Tree_Selector $elementValue1
 	 */
-	private function isSelectorValuesEqual( $elementValue1, $elementValue2 ){
+	private function isSelectorValuesEqual($elementValue1, $elementValue2) {
 
 		$elementValue2 = $elementValue2->value;
-		if( !($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len !== $elementValue2->elements_len ){
+		if (!($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len!==$elementValue2->elements_len) {
 			return false;
 		}
 
-		for( $i = 0; $i < $elementValue1->elements_len; $i++ ){
+		for ($i = 0; $i<$elementValue1->elements_len; $i++) {
 
-			if( $elementValue1->elements[$i]->combinator !== $elementValue2->elements[$i]->combinator ){
-				if( $i !== 0 || ($elementValue1->elements[$i]->combinator || ' ') !== ($elementValue2->elements[$i]->combinator || ' ') ){
+			if ($elementValue1->elements[$i]->combinator!==$elementValue2->elements[$i]->combinator) {
+				if ($i!==0 || ($elementValue1->elements[$i]->combinator || ' ')!==($elementValue2->elements[$i]->combinator || ' ')) {
 					return false;
 				}
 			}
 
-			if( !$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value) ){
+			if (!$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value)) {
 				return false;
 			}
 		}
@@ -9103,27 +9103,27 @@ 
 	/**
 	 * @param Less_Tree_Attribute $elementValue1
 	 */
-	private function isAttributeValuesEqual( $elementValue1, $elementValue2 ){
+	private function isAttributeValuesEqual($elementValue1, $elementValue2) {
 
-		if( $elementValue1->op !== $elementValue2->op || $elementValue1->key !== $elementValue2->key ){
+		if ($elementValue1->op!==$elementValue2->op || $elementValue1->key!==$elementValue2->key) {
 			return false;
 		}
 
-		if( !$elementValue1->value || !$elementValue2->value ){
-			if( $elementValue1->value || $elementValue2->value ) {
+		if (!$elementValue1->value || !$elementValue2->value) {
+			if ($elementValue1->value || $elementValue2->value) {
 				return false;
 			}
 			return true;
 		}
 
-		$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value );
-		$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value );
+		$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value);
+		$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value);
 
-		return $elementValue1 === $elementValue2;
+		return $elementValue1===$elementValue2;
 	}
 
 
-	private function extendSelector($matches, $selectorPath, $replacementSelector){
+	private function extendSelector($matches, $selectorPath, $replacementSelector) {
 
 		//for a set of matches, replace each match with the replacement selector
 
@@ -9132,11 +9132,11 @@ 
 		$path = array();
 		$selectorPath_len = count($selectorPath);
 
-		for($matchIndex = 0, $matches_len = count($matches); $matchIndex < $matches_len; $matchIndex++ ){
+		for ($matchIndex = 0, $matches_len = count($matches); $matchIndex<$matches_len; $matchIndex++) {
 
 
 			$match = $matches[$matchIndex];
-			$selector = $selectorPath[ $match['pathIndex'] ];
+			$selector = $selectorPath[$match['pathIndex']];
 
 			$firstElement = new Less_Tree_Element(
 				$match['initialCombinator'],
@@ -9145,63 +9145,63 @@ 
 				$replacementSelector->elements[0]->currentFileInfo
 			);
 
-			if( $match['pathIndex'] > $currentSelectorPathIndex && $currentSelectorPathElementIndex > 0 ){
+			if ($match['pathIndex']>$currentSelectorPathIndex && $currentSelectorPathElementIndex>0) {
 				$last_path = end($path);
-				$last_path->elements = array_merge( $last_path->elements, array_slice( $selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
+				$last_path->elements = array_merge($last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
 				$currentSelectorPathElementIndex = 0;
 				$currentSelectorPathIndex++;
 			}
 
 			$newElements = array_merge(
-				array_slice($selector->elements, $currentSelectorPathElementIndex, ($match['index'] - $currentSelectorPathElementIndex) ) // last parameter of array_slice is different than the last parameter of javascript's slice
+				array_slice($selector->elements, $currentSelectorPathElementIndex, ($match['index']-$currentSelectorPathElementIndex)) // last parameter of array_slice is different than the last parameter of javascript's slice
 				, array($firstElement)
-				, array_slice($replacementSelector->elements,1)
+				, array_slice($replacementSelector->elements, 1)
 				);
 
-			if( $currentSelectorPathIndex === $match['pathIndex'] && $matchIndex > 0 ){
+			if ($currentSelectorPathIndex===$match['pathIndex'] && $matchIndex>0) {
 				$last_key = count($path)-1;
-				$path[$last_key]->elements = array_merge($path[$last_key]->elements,$newElements);
-			}else{
-				$path = array_merge( $path, array_slice( $selectorPath, $currentSelectorPathIndex, $match['pathIndex'] ));
-				$path[] = new Less_Tree_Selector( $newElements );
+				$path[$last_key]->elements = array_merge($path[$last_key]->elements, $newElements);
+			}else {
+				$path = array_merge($path, array_slice($selectorPath, $currentSelectorPathIndex, $match['pathIndex']));
+				$path[] = new Less_Tree_Selector($newElements);
 			}
 
 			$currentSelectorPathIndex = $match['endPathIndex'];
 			$currentSelectorPathElementIndex = $match['endPathElementIndex'];
-			if( $currentSelectorPathElementIndex >= count($selectorPath[$currentSelectorPathIndex]->elements) ){
+			if ($currentSelectorPathElementIndex>=count($selectorPath[$currentSelectorPathIndex]->elements)) {
 				$currentSelectorPathElementIndex = 0;
 				$currentSelectorPathIndex++;
 			}
 		}
 
-		if( $currentSelectorPathIndex < $selectorPath_len && $currentSelectorPathElementIndex > 0 ){
+		if ($currentSelectorPathIndex<$selectorPath_len && $currentSelectorPathElementIndex>0) {
 			$last_path = end($path);
-			$last_path->elements = array_merge( $last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
+			$last_path->elements = array_merge($last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
 			$currentSelectorPathIndex++;
 		}
 
-		$slice_len = $selectorPath_len - $currentSelectorPathIndex;
+		$slice_len = $selectorPath_len-$currentSelectorPathIndex;
 		$path = array_merge($path, array_slice($selectorPath, $currentSelectorPathIndex, $slice_len));
 
 		return $path;
 	}
 
 
-	protected function visitMedia( $mediaNode ){
-		$newAllExtends = array_merge( $mediaNode->allExtends, end($this->allExtendsStack) );
+	protected function visitMedia($mediaNode) {
+		$newAllExtends = array_merge($mediaNode->allExtends, end($this->allExtendsStack));
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $mediaNode->allExtends);
 	}
 
-	protected function visitMediaOut(){
-		array_pop( $this->allExtendsStack );
+	protected function visitMediaOut() {
+		array_pop($this->allExtendsStack);
 	}
 
-	protected function visitDirective( $directiveNode ){
-		$newAllExtends = array_merge( $directiveNode->allExtends, end($this->allExtendsStack) );
+	protected function visitDirective($directiveNode) {
+		$newAllExtends = array_merge($directiveNode->allExtends, end($this->allExtendsStack));
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $directiveNode->allExtends);
 	}
 
-	protected function visitDirectiveOut(){
+	protected function visitDirectiveOut() {
 		array_pop($this->allExtendsStack);
 	}
 
@@ -9213,65 +9213,65 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_toCSS extends Less_VisitorReplacing{
+class Less_Visitor_toCSS extends Less_VisitorReplacing {
 
 	private $charset;
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 	}
 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-	public function run( $root ){
+	public function run($root) {
 		return $this->visitObj($root);
 	}
 
-	public function visitRule( $ruleNode ){
-		if( $ruleNode->variable ){
+	public function visitRule($ruleNode) {
+		if ($ruleNode->variable) {
 			return array();
 		}
 		return $ruleNode;
 	}
 
-	public function visitMixinDefinition($mixinNode){
+	public function visitMixinDefinition($mixinNode) {
 		// mixin definitions do not get eval'd - this means they keep state
 		// so we have to clear that state here so it isn't used if toCSS is called twice
 		$mixinNode->frames = array();
 		return array();
 	}
 
-	public function visitExtend(){
+	public function visitExtend() {
 		return array();
 	}
 
-	public function visitComment( $commentNode ){
-		if( $commentNode->isSilent() ){
+	public function visitComment($commentNode) {
+		if ($commentNode->isSilent()) {
 			return array();
 		}
 		return $commentNode;
 	}
 
-	public function visitMedia( $mediaNode, &$visitDeeper ){
+	public function visitMedia($mediaNode, &$visitDeeper) {
 		$mediaNode->accept($this);
 		$visitDeeper = false;
 
-		if( !$mediaNode->rules ){
+		if (!$mediaNode->rules) {
 			return array();
 		}
 		return $mediaNode;
 	}
 
-	public function visitDirective( $directiveNode ){
-		if( isset($directiveNode->currentFileInfo['reference']) && (!property_exists($directiveNode,'isReferenced') || !$directiveNode->isReferenced) ){
+	public function visitDirective($directiveNode) {
+		if (isset($directiveNode->currentFileInfo['reference']) && (!property_exists($directiveNode, 'isReferenced') || !$directiveNode->isReferenced)) {
 			return array();
 		}
-		if( $directiveNode->name === '@charset' ){
+		if ($directiveNode->name==='@charset') {
 			// Only output the debug info together with subsequent @charset definitions
 			// a comment (or @media statement) before the actual @charset directive would
 			// be considered illegal css as it has to be on the first line
-			if( isset($this->charset) && $this->charset ){
+			if (isset($this->charset) && $this->charset) {
 
 				//if( $directiveNode->debugInfo ){
 				//	$comment = new Less_Tree_Comment('/* ' . str_replace("\n",'',$directiveNode->toCSS())." */\n");
@@ -9287,14 +9287,14 @@ 
 		return $directiveNode;
 	}
 
-	public function checkPropertiesInRoot( $rulesetNode ){
+	public function checkPropertiesInRoot($rulesetNode) {
 
-		if( !$rulesetNode->firstRoot ){
+		if (!$rulesetNode->firstRoot) {
 			return;
 		}
 
-		foreach($rulesetNode->rules as $ruleNode){
-			if( $ruleNode instanceof Less_Tree_Rule && !$ruleNode->variable ){
+		foreach ($rulesetNode->rules as $ruleNode) {
+			if ($ruleNode instanceof Less_Tree_Rule && !$ruleNode->variable) {
 				$msg = "properties must be inside selector blocks, they cannot be in the root. Index ".$ruleNode->index.($ruleNode->currentFileInfo ? (' Filename: '.$ruleNode->currentFileInfo['filename']) : null);
 				throw new Less_Exception_Compiler($msg);
 			}
@@ -9302,14 +9302,14 @@ 
 	}
 
 
-	public function visitRuleset( $rulesetNode, &$visitDeeper ){
+	public function visitRuleset($rulesetNode, &$visitDeeper) {
 
 		$visitDeeper = false;
 
-		$this->checkPropertiesInRoot( $rulesetNode );
+		$this->checkPropertiesInRoot($rulesetNode);
 
-		if( $rulesetNode->root ){
-			return $this->visitRulesetRoot( $rulesetNode );
+		if ($rulesetNode->root) {
+			return $this->visitRulesetRoot($rulesetNode);
 		}
 
 		$rulesets = array();
@@ -9318,13 +9318,13 @@ 
 
 		// Compile rules and rulesets
 		$nodeRuleCnt = count($rulesetNode->rules);
-		for( $i = 0; $i < $nodeRuleCnt; ){
+		for ($i = 0; $i<$nodeRuleCnt;) {
 			$rule = $rulesetNode->rules[$i];
 
-			if( property_exists($rule,'rules') ){
+			if (property_exists($rule, 'rules')) {
 				// visit because we are moving them out from being a child
 				$rulesets[] = $this->visitObj($rule);
-				array_splice($rulesetNode->rules,$i,1);
+				array_splice($rulesetNode->rules, $i, 1);
 				$nodeRuleCnt--;
 				continue;
 			}
@@ -9334,27 +9334,27 @@ 
 
 		// accept the visitor to remove rules and refactor itself
 		// then we can decide now whether we want it or not
-		if( $nodeRuleCnt > 0 ){
+		if ($nodeRuleCnt>0) {
 			$rulesetNode->accept($this);
 
-			if( $rulesetNode->rules ){
+			if ($rulesetNode->rules) {
 
-				if( count($rulesetNode->rules) >  1 ){
-					$this->_mergeRules( $rulesetNode->rules );
-					$this->_removeDuplicateRules( $rulesetNode->rules );
+				if (count($rulesetNode->rules)>1) {
+					$this->_mergeRules($rulesetNode->rules);
+					$this->_removeDuplicateRules($rulesetNode->rules);
 				}
 
 				// now decide whether we keep the ruleset
-				if( $rulesetNode->paths ){
+				if ($rulesetNode->paths) {
 					//array_unshift($rulesets, $rulesetNode);
-					array_splice($rulesets,0,0,array($rulesetNode));
+					array_splice($rulesets, 0, 0, array($rulesetNode));
 				}
 			}
 
 		}
 
 
-		if( count($rulesets) === 1 ){
+		if (count($rulesets)===1) {
 			return $rulesets[0];
 		}
 		return $rulesets;
@@ -9366,9 +9366,9 @@ 
 	 *
 	 * return array|Less_Tree_Ruleset
 	 */
-	private function visitRulesetRoot( $rulesetNode ){
-		$rulesetNode->accept( $this );
-		if( $rulesetNode->firstRoot || $rulesetNode->rules ){
+	private function visitRulesetRoot($rulesetNode) {
+		$rulesetNode->accept($this);
+		if ($rulesetNode->firstRoot || $rulesetNode->rules) {
 			return $rulesetNode;
 		}
 		return array();
@@ -9380,16 +9380,16 @@ 
 	 *
 	 * @return array
 	 */
-	private function visitRulesetPaths($rulesetNode){
+	private function visitRulesetPaths($rulesetNode) {
 
 		$paths = array();
-		foreach($rulesetNode->paths as $p){
-			if( $p[0]->elements[0]->combinator === ' ' ){
+		foreach ($rulesetNode->paths as $p) {
+			if ($p[0]->elements[0]->combinator===' ') {
 				$p[0]->elements[0]->combinator = '';
 			}
 
-			foreach($p as $pi){
-				if( $pi->getIsReferenced() && $pi->getIsOutput() ){
+			foreach ($p as $pi) {
+				if ($pi->getIsReferenced() && $pi->getIsOutput()) {
 					$paths[] = $p;
 					break;
 				}
@@ -9399,26 +9399,26 @@ 
 		return $paths;
 	}
 
-	protected function _removeDuplicateRules( &$rules ){
+	protected function _removeDuplicateRules(&$rules) {
 		// remove duplicates
 		$ruleCache = array();
-		for( $i = count($rules)-1; $i >= 0 ; $i-- ){
+		for ($i = count($rules)-1; $i>=0; $i--) {
 			$rule = $rules[$i];
-			if( $rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_NameValue ){
+			if ($rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_NameValue) {
 
-				if( !isset($ruleCache[$rule->name]) ){
+				if (!isset($ruleCache[$rule->name])) {
 					$ruleCache[$rule->name] = $rule;
-				}else{
-					$ruleList =& $ruleCache[$rule->name];
+				}else {
+					$ruleList = & $ruleCache[$rule->name];
 
-					if( $ruleList instanceof Less_Tree_Rule || $ruleList instanceof Less_Tree_NameValue ){
-						$ruleList = $ruleCache[$rule->name] = array( $ruleCache[$rule->name]->toCSS() );
+					if ($ruleList instanceof Less_Tree_Rule || $ruleList instanceof Less_Tree_NameValue) {
+						$ruleList = $ruleCache[$rule->name] = array($ruleCache[$rule->name]->toCSS());
 					}
 
 					$ruleCSS = $rule->toCSS();
-					if( array_search($ruleCSS,$ruleList) !== false ){
-						array_splice($rules,$i,1);
-					}else{
+					if (array_search($ruleCSS, $ruleList)!==false) {
+						array_splice($rules, $i, 1);
+					}else {
 						$ruleList[] = $ruleCSS;
 					}
 				}
@@ -9426,25 +9426,25 @@ 
 		}
 	}
 
-	protected function _mergeRules( &$rules ){
+	protected function _mergeRules(&$rules) {
 		$groups = array();
 
 		//obj($rules);
 
 		$rules_len = count($rules);
-		for( $i = 0; $i < $rules_len; $i++ ){
+		for ($i = 0; $i<$rules_len; $i++) {
 			$rule = $rules[$i];
 
-			if( ($rule instanceof Less_Tree_Rule) && $rule->merge ){
+			if (($rule instanceof Less_Tree_Rule) && $rule->merge) {
 
 				$key = $rule->name;
-				if( $rule->important ){
+				if ($rule->important) {
 					$key .= ',!';
 				}
 
-				if( !isset($groups[$key]) ){
+				if (!isset($groups[$key])) {
 					$groups[$key] = array();
-				}else{
+				}else {
 					array_splice($rules, $i--, 1);
 					$rules_len--;
 				}
@@ -9454,16 +9454,16 @@ 
 		}
 
 
-		foreach($groups as $parts){
+		foreach ($groups as $parts) {
 
-			if( count($parts) > 1 ){
+			if (count($parts)>1) {
 				$rule = $parts[0];
 				$spacedGroups = array();
 				$lastSpacedGroup = array();
 				$parts_mapped = array();
-				foreach($parts as $p){
-					if( $p->merge === '+' ){
-						if( $lastSpacedGroup ){
+				foreach ($parts as $p) {
+					if ($p->merge==='+') {
+						if ($lastSpacedGroup) {
 							$spacedGroups[] = self::toExpression($lastSpacedGroup);
 						}
 						$lastSpacedGroup = array();
@@ -9478,19 +9478,19 @@ 
 
 	}
 
-	public static function toExpression($values){
+	public static function toExpression($values) {
 		$mapped = array();
-		foreach($values as $p){
+		foreach ($values as $p) {
 			$mapped[] = $p->value;
 		}
-		return new Less_Tree_Expression( $mapped );
+		return new Less_Tree_Expression($mapped);
 	}
 
-	public static function toValue($values){
+	public static function toValue($values) {
 		//return new Less_Tree_Value($values); ??
 
 		$mapped = array();
-		foreach($values as $p){
+		foreach ($values as $p) {
 			$mapped[] = $p;
 		}
 		return new Less_Tree_Value($mapped);
@@ -9505,7 +9505,7 @@ 
  * @package Less
  * @subpackage exception
  */
-class Less_Exception_Parser extends Exception{
+class Less_Exception_Parser extends Exception {
 
 	/**
 	 * The current file
@@ -9535,12 +9535,12 @@ 
 	 * @param Less_FileInfo|string $currentFile The file
 	 * @param integer $code The exception code
 	 */
-	public function __construct($message = null, Exception $previous = null, $index = null, $currentFile = null, $code = 0){
+	public function __construct($message = null, Exception $previous = null, $index = null, $currentFile = null, $code = 0) {
 
-		if (PHP_VERSION_ID < 50300) {
+		if (PHP_VERSION_ID<50300) {
 			$this->previous = $previous;
 			parent::__construct($message, $code);
-		} else {
+		}else {
 			parent::__construct($message, $code, $previous);
 		}
 
@@ -9551,10 +9551,10 @@ 
 	}
 
 
-	protected function getInput(){
+	protected function getInput() {
 
-		if( !$this->input && $this->currentFile && $this->currentFile['filename'] && file_exists($this->currentFile['filename']) ){
-			$this->input = file_get_contents( $this->currentFile['filename'] );
+		if (!$this->input && $this->currentFile && $this->currentFile['filename'] && file_exists($this->currentFile['filename'])) {
+			$this->input = file_get_contents($this->currentFile['filename']);
 		}
 	}
 
@@ -9565,26 +9565,26 @@ 
 	 *
 	 * @return string
 	 */
-	public function genMessage(){
+	public function genMessage() {
 
-		if( $this->currentFile && $this->currentFile['filename'] ){
+		if ($this->currentFile && $this->currentFile['filename']) {
 			$this->message .= ' in '.basename($this->currentFile['filename']);
 		}
 
-		if( $this->index !== null ){
+		if ($this->index!==null) {
 			$this->getInput();
-			if( $this->input ){
+			if ($this->input) {
 				$line = self::getLineNumber();
 				$this->message .= ' on line '.$line.', column '.self::getColumn();
 
-				$lines = explode("\n",$this->input);
+				$lines = explode("\n", $this->input);
 
 				$count = count($lines);
 				$start_line = max(0, $line-3);
 				$last_line = min($count, $start_line+6);
 				$num_len = strlen($last_line);
-				for( $i = $start_line; $i < $last_line; $i++ ){
-					$this->message .= "\n".str_pad($i+1,$num_len,'0',STR_PAD_LEFT).'| '.$lines[$i];
+				for ($i = $start_line; $i<$last_line; $i++) {
+					$this->message .= "\n".str_pad($i+1, $num_len, '0', STR_PAD_LEFT).'| '.$lines[$i];
 				}
 			}
 		}
@@ -9596,13 +9596,13 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getLineNumber(){
-		if( $this->index ){
+	public function getLineNumber() {
+		if ($this->index) {
 			// https://bugs.php.net/bug.php?id=49790
 			if (ini_get("mbstring.func_overload")) {
-				return substr_count(substr($this->input, 0, $this->index), "\n") + 1;
-			} else {
-				return substr_count($this->input, "\n", 0, $this->index) + 1;
+				return substr_count(substr($this->input, 0, $this->index), "\n")+1;
+			}else {
+				return substr_count($this->input, "\n", 0, $this->index)+1;
 			}
 		}
 		return 1;
@@ -9614,11 +9614,11 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getColumn(){
+	public function getColumn() {
 
 		$part = substr($this->input, 0, $this->index);
-		$pos = strrpos($part,"\n");
-		return $this->index - $pos;
+		$pos = strrpos($part, "\n");
+		return $this->index-$pos;
 	}
 
 }
@@ -9630,7 +9630,7 @@ 
  * @package Less
  * @subpackage exception
  */
-class Less_Exception_Chunk extends Less_Exception_Parser{
+class Less_Exception_Chunk extends Less_Exception_Parser {
 
 
 	protected $parserCurrentIndex = 0;
@@ -9649,7 +9649,7 @@ 
 	 * @param Less_FileInfo|string $currentFile The file
 	 * @param integer $code The exception code
 	 */
-	public function __construct($input, Exception $previous = null, $index = null, $currentFile = null, $code = 0){
+	public function __construct($input, Exception $previous = null, $index = null, $currentFile = null, $code = 0) {
 
 		$this->message = 'ParseError: Unexpected input'; //default message
 
@@ -9670,7 +9670,7 @@ 
 	 * We don't actually need the chunks
 	 *
 	 */
-	protected function Chunks(){
+	protected function Chunks() {
 		$level = 0;
 		$parenLevel = 0;
 		$lastMultiCommentEndBrace = null;
@@ -9678,9 +9678,9 @@ 
 		$lastMultiComment = null;
 		$lastParen = null;
 
-		for( $this->parserCurrentIndex = 0; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++ ){
+		for ($this->parserCurrentIndex = 0; $this->parserCurrentIndex<$this->input_len; $this->parserCurrentIndex++) {
 			$cc = $this->CharCode($this->parserCurrentIndex);
-			if ((($cc >= 97) && ($cc <= 122)) || ($cc < 34)) {
+			if ((($cc>=97) && ($cc<=122)) || ($cc<34)) {
 				// a-z or whitespace
 				continue;
 			}
@@ -9696,7 +9696,7 @@ 
 				// )
 				case 41:
 					$parenLevel--;
-					if( $parenLevel < 0 ){
+					if ($parenLevel<0) {
 						return $this->fail("missing opening `(`");
 					}
 					continue;
@@ -9715,7 +9715,7 @@ 
 				// }
 				case 125:
 					$level--;
-					if( $level < 0 ){
+					if ($level<0) {
 						return $this->fail("missing opening `{`");
 
 					}
@@ -9723,7 +9723,7 @@ 
 					continue;
 				// \
 				case 92:
-					if ($this->parserCurrentIndex < $this->input_len - 1) { $this->parserCurrentIndex++; continue; }
+					if ($this->parserCurrentIndex<$this->input_len-1) { $this->parserCurrentIndex++; continue; }
 					return $this->fail("unescaped `\\`");
 
 				// ", ' and `
@@ -9732,40 +9732,40 @@ 
 				case 96:
 					$matched = 0;
 					$currentChunkStartIndex = $this->parserCurrentIndex;
-					for ($this->parserCurrentIndex = $this->parserCurrentIndex + 1; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++) {
+					for ($this->parserCurrentIndex = $this->parserCurrentIndex+1; $this->parserCurrentIndex<$this->input_len; $this->parserCurrentIndex++) {
 						$cc2 = $this->CharCode($this->parserCurrentIndex);
-						if ($cc2 > 96) { continue; }
-						if ($cc2 == $cc) { $matched = 1; break; }
-						if ($cc2 == 92) {        // \
-							if ($this->parserCurrentIndex == $this->input_len - 1) {
+						if ($cc2>96) { continue; }
+						if ($cc2==$cc) { $matched = 1; break; }
+						if ($cc2==92) {        // \
+							if ($this->parserCurrentIndex==$this->input_len-1) {
 								return $this->fail("unescaped `\\`");
 							}
 							$this->parserCurrentIndex++;
 						}
 					}
 					if ($matched) { continue; }
-					return $this->fail("unmatched `" + chr($cc) + "`", $currentChunkStartIndex);
+					return $this->fail("unmatched `" +chr($cc)+"`", $currentChunkStartIndex);
 
 				// /, check for comment
 				case 47:
-					if ($parenLevel || ($this->parserCurrentIndex == $this->input_len - 1)) { continue; }
+					if ($parenLevel || ($this->parserCurrentIndex==$this->input_len-1)) { continue; }
 					$cc2 = $this->CharCode($this->parserCurrentIndex+1);
-					if ($cc2 == 47) {
+					if ($cc2==47) {
 						// //, find lnfeed
-						for ($this->parserCurrentIndex = $this->parserCurrentIndex + 2; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++) {
+						for ($this->parserCurrentIndex = $this->parserCurrentIndex+2; $this->parserCurrentIndex<$this->input_len; $this->parserCurrentIndex++) {
 							$cc2 = $this->CharCode($this->parserCurrentIndex);
-							if (($cc2 <= 13) && (($cc2 == 10) || ($cc2 == 13))) { break; }
+							if (($cc2<=13) && (($cc2==10) || ($cc2==13))) { break; }
 						}
-					} else if ($cc2 == 42) {
+					}else if ($cc2==42) {
 						// /*, find */
 						$lastMultiComment = $currentChunkStartIndex = $this->parserCurrentIndex;
-						for ($this->parserCurrentIndex = $this->parserCurrentIndex + 2; $this->parserCurrentIndex < $this->input_len - 1; $this->parserCurrentIndex++) {
+						for ($this->parserCurrentIndex = $this->parserCurrentIndex+2; $this->parserCurrentIndex<$this->input_len-1; $this->parserCurrentIndex++) {
 							$cc2 = $this->CharCode($this->parserCurrentIndex);
-							if ($cc2 == 125) { $lastMultiCommentEndBrace = $this->parserCurrentIndex; }
-							if ($cc2 != 42) { continue; }
-							if ($this->CharCode($this->parserCurrentIndex+1) == 47) { break; }
+							if ($cc2==125) { $lastMultiCommentEndBrace = $this->parserCurrentIndex; }
+							if ($cc2!=42) { continue; }
+							if ($this->CharCode($this->parserCurrentIndex+1)==47) { break; }
 						}
-						if ($this->parserCurrentIndex == $this->input_len - 1) {
+						if ($this->parserCurrentIndex==$this->input_len-1) {
 							return $this->fail("missing closing `*/`", $currentChunkStartIndex);
 						}
 					}
@@ -9773,20 +9773,20 @@ 
 
 				// *, check for unmatched */
 				case 42:
-					if (($this->parserCurrentIndex < $this->input_len - 1) && ($this->CharCode($this->parserCurrentIndex+1) == 47)) {
+					if (($this->parserCurrentIndex<$this->input_len-1) && ($this->CharCode($this->parserCurrentIndex+1)==47)) {
 						return $this->fail("unmatched `/*`");
 					}
 					continue;
 			}
 		}
 
-		if( $level !== 0 ){
-			if( ($lastMultiComment > $lastOpening) && ($lastMultiCommentEndBrace > $lastMultiComment) ){
+		if ($level!==0) {
+			if (($lastMultiComment>$lastOpening) && ($lastMultiCommentEndBrace>$lastMultiComment)) {
 				return $this->fail("missing closing `}` or `*/`", $lastOpening);
-			} else {
+			}else {
 				return $this->fail("missing closing `}`", $lastOpening);
 			}
-		} else if ( $parenLevel !== 0 ){
+		}else if ($parenLevel!==0) {
 			return $this->fail("missing closing `)`", $lastParen);
 		}
 
@@ -9797,16 +9797,16 @@ 
 		//$this->emitChunk(true);
 	}
 
-	public function CharCode($pos){
+	public function CharCode($pos) {
 		return ord($this->input[$pos]);
 	}
 
 
-	public function fail( $msg, $index = null ){
+	public function fail($msg, $index = null) {
 
-		if( !$index ){
+		if (!$index) {
 			$this->index = $this->parserCurrentIndex;
-		}else{
+		}else {
 			$this->index = $index;
 		}
 		$this->message = 'ParseError: '.$msg;
@@ -9833,7 +9833,7 @@ 
  * @package Less
  * @subpackage exception
  */
-class Less_Exception_Compiler extends Less_Exception_Parser{
+class Less_Exception_Compiler extends Less_Exception_Parser {
 
 } 
 
@@ -9879,7 +9879,7 @@ 
 	 * @param array $contentsMap Array of filename to contents map
 	 * @param Less_SourceMap_Generator $generator
 	 */
-	public function __construct(array $contentsMap, $generator){
+	public function __construct(array $contentsMap, $generator) {
 		$this->contentsMap = $contentsMap;
 		$this->generator = $generator;
 	}
@@ -9893,10 +9893,10 @@ 
 	 * @param integer $index
 	 * @param mixed $mapLines
 	 */
-	public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null){
+	public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null) {
 
 		//ignore adding empty strings
-		if( $chunk === '' ){
+		if ($chunk==='') {
 			return;
 		}
 
@@ -9905,15 +9905,15 @@ 
 		$sourceColumns = ' ';
 
 
-		if( $fileInfo ){
+		if ($fileInfo) {
 
 			$url = $fileInfo['currentUri'];
 
-			if( isset($this->contentsMap[$url]) ){
+			if (isset($this->contentsMap[$url])) {
 				$inputSource = substr($this->contentsMap[$url], 0, $index);
 				$sourceLines = explode("\n", $inputSource);
 				$sourceColumns = end($sourceLines);
-			}else{
+			}else {
 				throw new Exception('Filename '.$url.' not in contentsMap');
 			}
 
@@ -9922,33 +9922,33 @@ 
 		$lines = explode("\n", $chunk);
 		$columns = end($lines);
 
-		if($fileInfo){
+		if ($fileInfo) {
 
-			if(!$mapLines){
+			if (!$mapLines) {
 				$this->generator->addMapping(
-						$this->lineNumber + 1,					// generated_line
-						$this->column,							// generated_column
-						count($sourceLines),					// original_line
-						strlen($sourceColumns),					// original_column
+						$this->lineNumber+1, // generated_line
+						$this->column, // generated_column
+						count($sourceLines), // original_line
+						strlen($sourceColumns), // original_column
 						$fileInfo
 				);
-			}else{
-				for($i = 0, $count = count($lines); $i < $count; $i++){
+			}else {
+				for ($i = 0, $count = count($lines); $i<$count; $i++) {
 					$this->generator->addMapping(
-						$this->lineNumber + $i + 1,				// generated_line
-						$i === 0 ? $this->column : 0,			// generated_column
-						count($sourceLines) + $i,				// original_line
-						$i === 0 ? strlen($sourceColumns) : 0, 	// original_column
+						$this->lineNumber+$i+1, // generated_line
+						$i===0 ? $this->column : 0, // generated_column
+						count($sourceLines)+$i, // original_line
+						$i===0 ? strlen($sourceColumns) : 0, // original_column
 						$fileInfo
 					);
 				}
 			}
 		}
 
-		if(count($lines) === 1){
+		if (count($lines)===1) {
 			$this->column += strlen($columns);
-		}else{
-			$this->lineNumber += count($lines) - 1;
+		}else {
+			$this->lineNumber += count($lines)-1;
 			$this->column = strlen($columns);
 		}
 
@@ -9994,14 +9994,14 @@ 
 	 */
 	private $charToIntMap = array(
 		'A' => 0, 'B' => 1, 'C' => 2, 'D' => 3, 'E' => 4, 'F' => 5, 'G' => 6,
-		'H' => 7,'I' => 8, 'J' => 9, 'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13,
+		'H' => 7, 'I' => 8, 'J' => 9, 'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13,
 		'O' => 14, 'P' => 15, 'Q' => 16, 'R' => 17, 'S' => 18, 'T' => 19, 'U' => 20,
 		'V' => 21, 'W' => 22, 'X' => 23, 'Y' => 24, 'Z' => 25, 'a' => 26, 'b' => 27,
 		'c' => 28, 'd' => 29, 'e' => 30, 'f' => 31, 'g' => 32, 'h' => 33, 'i' => 34,
 		'j' => 35, 'k' => 36, 'l' => 37, 'm' => 38, 'n' => 39, 'o' => 40, 'p' => 41,
 		'q' => 42, 'r' => 43, 's' => 44, 't' => 45, 'u' => 46, 'v' => 47, 'w' => 48,
 		'x' => 49, 'y' => 50, 'z' => 51, 0 => 52, 1 => 53, 2 => 54, 3 => 55, 4 => 56,
-		5 => 57,	6 => 58, 7 => 59, 8 => 60, 9 => 61, '+' => 62, '/' => 63,
+		5 => 57, 6 => 58, 7 => 59, 8 => 60, 9 => 61, '+' => 62, '/' => 63,
 	);
 
 	/**
@@ -10025,7 +10025,7 @@ 
 	/**
 	 * Constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		// I leave it here for future reference
 		// foreach(str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') as $i => $char)
 		// {
@@ -10043,8 +10043,8 @@ 
 	 * even on a 64 bit machine.
 	 * @param string $aValue
 	 */
-	public function toVLQSigned($aValue){
-		return 0xffffffff & ($aValue < 0 ? ((-$aValue) << 1) + 1 : ($aValue << 1) + 0);
+	public function toVLQSigned($aValue) {
+		return 0xffffffff&($aValue<0 ? ((-$aValue) << 1)+1 : ($aValue << 1)+0);
 	}
 
 	/**
@@ -10058,8 +10058,8 @@ 
 	 * even on a 64 bit machine.
 	 * @param integer $aValue
 	 */
-	public function fromVLQSigned($aValue){
-		return $aValue & 1 ? $this->zeroFill(~$aValue + 2, 1) | (-1 - 0x7fffffff) : $this->zeroFill($aValue, 1);
+	public function fromVLQSigned($aValue) {
+		return $aValue&1 ? $this->zeroFill(~$aValue+2, 1)|(-1-0x7fffffff) : $this->zeroFill($aValue, 1);
 	}
 
 	/**
@@ -10068,18 +10068,18 @@ 
 	 * @param string $aValue The value to encode
 	 * @return string The encoded value
 	 */
-	public function encode($aValue){
+	public function encode($aValue) {
 		$encoded = '';
 		$vlq = $this->toVLQSigned($aValue);
 		do
 		{
-			$digit = $vlq & $this->mask;
+			$digit = $vlq&$this->mask;
 			$vlq = $this->zeroFill($vlq, $this->shift);
-			if($vlq > 0){
+			if ($vlq>0) {
 				$digit |= $this->continuationBit;
 			}
 			$encoded .= $this->base64Encode($digit);
-		} while($vlq > 0);
+		} while ($vlq>0);
 
 		return $encoded;
 	}
@@ -10090,15 +10090,15 @@ 
 	 * @param string $encoded The encoded value to decode
 	 * @return integer The decoded value
 	 */
-	public function decode($encoded){
+	public function decode($encoded) {
 		$vlq = 0;
 		$i = 0;
 		do
 		{
 			$digit = $this->base64Decode($encoded[$i]);
-			$vlq |= ($digit & $this->mask) << ($i * $this->shift);
+			$vlq |= ($digit&$this->mask) << ($i * $this->shift);
 			$i++;
-		} while($digit & $this->continuationBit);
+		} while ($digit&$this->continuationBit);
 
 		return $this->fromVLQSigned($vlq);
 	}
@@ -10110,8 +10110,8 @@ 
 	 * @param integer $b number of bits to shift
 	 * @return integer
 	 */
-	public function zeroFill($a, $b){
-		return ($a >= 0) ? ($a >> $b) : ($a >> $b) & (PHP_INT_MAX >> ($b - 1));
+	public function zeroFill($a, $b) {
+		return ($a>=0) ? ($a >> $b) : ($a >> $b)&(PHP_INT_MAX >> ($b-1));
 	}
 
 	/**
@@ -10121,8 +10121,8 @@ 
 	 * @return string
 	 * @throws Exception If the number is invalid
 	 */
-	public function base64Encode($number){
-		if($number < 0 || $number > 63){
+	public function base64Encode($number) {
+		if ($number<0 || $number>63) {
 			throw new Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
 		}
 		return $this->intToCharMap[$number];
@@ -10135,8 +10135,8 @@ 
 	 * @return number
 	 * @throws Exception If the number is invalid
 	 */
-	public function base64Decode($char){
-		if(!array_key_exists($char, $this->charToIntMap)){
+	public function base64Decode($char) {
+		if (!array_key_exists($char, $this->charToIntMap)) {
 			throw new Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
 		}
 		return $this->charToIntMap[$char];
@@ -10230,7 +10230,7 @@ 
 	 * @param Less_Tree_Ruleset $root The root node
 	 * @param array $options Array of options
 	 */
-	public function __construct(Less_Tree_Ruleset $root, $contentsMap, $options = array()){
+	public function __construct(Less_Tree_Ruleset $root, $contentsMap, $options = array()) {
 		$this->root = $root;
 		$this->contentsMap = $contentsMap;
 		$this->encoder = new Less_SourceMap_Base64VLQ();
@@ -10246,34 +10246,34 @@ 
 	 *
 	 * @return string
 	 */
-	public function generateCSS(){
+	public function generateCSS() {
 		$output = new Less_Output_Mapped($this->contentsMap, $this);
 
 		// catch the output
 		$this->root->genCSS($output);
 
 
-		$sourceMapUrl				= $this->getOption('sourceMapURL');
-		$sourceMapFilename			= $this->getOption('sourceMapFilename');
+		$sourceMapUrl = $this->getOption('sourceMapURL');
+		$sourceMapFilename = $this->getOption('sourceMapFilename');
 		$sourceMapContent			= $this->generateJson();
 		$sourceMapWriteTo			= $this->getOption('sourceMapWriteTo');
 
-		if( !$sourceMapUrl && $sourceMapFilename ){
+		if (!$sourceMapUrl && $sourceMapFilename) {
 			$sourceMapUrl = $this->normalizeFilename($sourceMapFilename);
 		}
 
 		// write map to a file
-		if( $sourceMapWriteTo ){
+		if ($sourceMapWriteTo) {
 			$this->saveMap($sourceMapWriteTo, $sourceMapContent);
 		}
 
 		// inline the map
-		if( !$sourceMapUrl ){
+		if (!$sourceMapUrl) {
 			$sourceMapUrl = sprintf('data:application/json,%s', Less_Functions::encodeURIComponent($sourceMapContent));
 		}
 
-		if( $sourceMapUrl ){
-			$output->add( sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl) );
+		if ($sourceMapUrl) {
+			$output->add(sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl));
 		}
 
 		return $output->toString();
@@ -10286,15 +10286,15 @@ 
 	 * @param string $content The content to write
 	 * @throws Exception If the file could not be saved
 	 */
-	protected function saveMap($file, $content){
+	protected function saveMap($file, $content) {
 		$dir = dirname($file);
 		// directory does not exist
-		if( !is_dir($dir) ){
+		if (!is_dir($dir)) {
 			// FIXME: create the dir automatically?
 			throw new Exception(sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir));
 		}
 		// FIXME: proper saving, with dir write check!
-		if(file_put_contents($file, $content) === false){
+		if (file_put_contents($file, $content)===false) {
 			throw new Exception(sprintf('Cannot save the source map to "%s"', $file));
 		}
 		return true;
@@ -10306,7 +10306,7 @@ 
 	 * @param string $filename
 	 * @return string
 	 */
-	protected function normalizeFilename($filename){
+	protected function normalizeFilename($filename) {
 
 		$filename = $this->fixWindowsPath($filename);
 
@@ -10314,16 +10314,16 @@ 
 		$basePath = $this->getOption('sourceMapBasepath');
 
 		// "Trim" the 'sourceMapBasepath' from the output filename.
-		if (strpos($filename, $basePath) === 0) {
+		if (strpos($filename, $basePath)===0) {
 			$filename = substr($filename, strlen($basePath));
 		}
 
 		// Remove extra leading path separators.
-		if(strpos($filename, '\\') === 0 || strpos($filename, '/') === 0){
+		if (strpos($filename, '\\')===0 || strpos($filename, '/')===0) {
 			$filename = substr($filename, 1);
 		}
 
-		return $rootpath . $filename;
+		return $rootpath.$filename;
 	}
 
 	/**
@@ -10335,7 +10335,7 @@ 
 	 * @param integer $originalColumn The column number in original file
 	 * @param string $sourceFile The original source file
 	 */
-	public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $fileInfo ){
+	public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $fileInfo) {
 
 		$this->mappings[] = array(
 			'generated_line' => $generatedLine,
@@ -10355,7 +10355,7 @@ 
 	 * @return string
 	 * @see https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#
 	 */
-	protected function generateJson(){
+	protected function generateJson() {
 
 		$sourceMap = array();
 		$mappings = $this->generateMappings();
@@ -10366,21 +10366,21 @@ 
 
 		// An optional name of the generated code that this source map is associated with.
 		$file = $this->getOption('sourceMapFilename');
-		if( $file ){
+		if ($file) {
 			$sourceMap['file'] = $file;
 		}
 
 
 		// An optional source root, useful for relocating source files on a server or removing repeated values in the 'sources' entry.	This value is prepended to the individual entries in the 'source' field.
 		$root = $this->getOption('sourceRoot');
-		if( $root ){
+		if ($root) {
 			$sourceMap['sourceRoot'] = $root;
 		}
 
 
 		// A list of original sources used by the 'mappings' entry.
 		$sourceMap['sources'] = array();
-		foreach($this->sources as $source_uri => $source_filename){
+		foreach ($this->sources as $source_uri => $source_filename) {
 			$sourceMap['sources'][] = $this->normalizeFilename($source_filename);
 		}
 
@@ -10391,7 +10391,7 @@ 
 		// A string with the encoded mapping data.
 		$sourceMap['mappings'] = $mappings;
 
-		if( $this->getOption('outputSourceFiles') ){
+		if ($this->getOption('outputSourceFiles')) {
 			// An optional list of source content, useful when the 'source' can't be hosted.
 			// The contents are listed in the same order as the sources above.
 			// 'null' may be used if some original sources should be retrieved by name.
@@ -10399,7 +10399,7 @@ 
 		}
 
 		// less.js compat fixes
-		if( count($sourceMap['sources']) && empty($sourceMap['sourceRoot']) ){
+		if (count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
 			unset($sourceMap['sourceRoot']);
 		}
 
@@ -10411,12 +10411,12 @@ 
 	 *
 	 * @return array|null
 	 */
-	protected function getSourcesContent(){
-		if(empty($this->sources)){
+	protected function getSourcesContent() {
+		if (empty($this->sources)) {
 			return;
 		}
 		$content = array();
-		foreach($this->sources as $sourceFile){
+		foreach ($this->sources as $sourceFile) {
 			$content[] = file_get_contents($sourceFile);
 		}
 		return $content;
@@ -10427,9 +10427,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function generateMappings(){
+	public function generateMappings() {
 
-		if( !count($this->mappings) ){
+		if (!count($this->mappings)) {
 			return '';
 		}
 
@@ -10438,37 +10438,37 @@ 
 
 		// group mappings by generated line number.
 		$groupedMap = $groupedMapEncoded = array();
-		foreach($this->mappings as $m){
+		foreach ($this->mappings as $m) {
 			$groupedMap[$m['generated_line']][] = $m;
 		}
 		ksort($groupedMap);
 
 		$lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
 
-		foreach($groupedMap as $lineNumber => $line_map){
-			while(++$lastGeneratedLine < $lineNumber){
+		foreach ($groupedMap as $lineNumber => $line_map) {
+			while (++$lastGeneratedLine<$lineNumber) {
 				$groupedMapEncoded[] = ';';
 			}
 
 			$lineMapEncoded = array();
 			$lastGeneratedColumn = 0;
 
-			foreach($line_map as $m){
-				$mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
+			foreach ($line_map as $m) {
+				$mapEncoded = $this->encoder->encode($m['generated_column']-$lastGeneratedColumn);
 				$lastGeneratedColumn = $m['generated_column'];
 
 				// find the index
-				if( $m['source_file'] ){
+				if ($m['source_file']) {
 					$index = $this->findFileIndex($m['source_file']);
-					if( $index !== false ){
-						$mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
+					if ($index!==false) {
+						$mapEncoded .= $this->encoder->encode($index-$lastOriginalIndex);
 						$lastOriginalIndex = $index;
 
 						// lines are stored 0-based in SourceMap spec version 3
-						$mapEncoded .= $this->encoder->encode($m['original_line'] - 1 - $lastOriginalLine);
-						$lastOriginalLine = $m['original_line'] - 1;
+						$mapEncoded .= $this->encoder->encode($m['original_line']-1-$lastOriginalLine);
+						$lastOriginalLine = $m['original_line']-1;
 
-						$mapEncoded .= $this->encoder->encode($m['original_column'] - $lastOriginalColumn);
+						$mapEncoded .= $this->encoder->encode($m['original_column']-$lastOriginalColumn);
 						$lastOriginalColumn = $m['original_column'];
 					}
 				}
@@ -10476,7 +10476,7 @@ 
 				$lineMapEncoded[] = $mapEncoded;
 			}
 
-			$groupedMapEncoded[] = implode(',', $lineMapEncoded) . ';';
+			$groupedMapEncoded[] = implode(',', $lineMapEncoded).';';
 		}
 
 		return rtrim(implode($groupedMapEncoded), ';');
@@ -10488,7 +10488,7 @@ 
 	 * @param string $filename
 	 * @return integer|false
 	 */
-	protected function findFileIndex($filename){
+	protected function findFileIndex($filename) {
 		return $this->source_keys[$filename];
 	}
 
@@ -10497,11 +10497,11 @@ 
 	 * @param  string $path
 	 * @return string      
 	 */
-	public function fixWindowsPath($path, $addEndSlash = false){
+	public function fixWindowsPath($path, $addEndSlash = false) {
 		$slash = ($addEndSlash) ? '/' : '';
-		if( !empty($path) ){
+		if (!empty($path)) {
 			$path = str_replace('\\', '/', $path);
-			$path = rtrim($path,'/') . $slash;
+			$path = rtrim($path, '/').$slash;
 		}
 
 		return $path;

Contrib/less.php/Version.php

Indentation +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
 
 	const version = '1.7.0.9';			// The current build number of less.php
 	const less_version = '1.7';			// The less.js version that this build should be compatible with
-    const cache_version = '170';		// The parser cache version
+	const cache_version = '170';		// The parser cache version
 
 }

Spacing +4 added lines, -4 removed lines

@@ -6,10 +6,10 @@
  * @package Less
  * @subpackage version
  */
-class Less_Version{
+class Less_Version {
 
-	const version = '1.7.0.9';			// The current build number of less.php
-	const less_version = '1.7';			// The less.js version that this build should be compatible with
-    const cache_version = '170';		// The parser cache version
+	const version = '1.7.0.9'; // The current build number of less.php
+	const less_version = '1.7'; // The less.js version that this build should be compatible with
+    const cache_version = '170'; // The parser cache version
 
 }