Add spaces between operators in the calc functions

Author: raxbg

lib/Sabberworm/CSS/OutputFormat.php

@@ -41,6 +41,10 @@ class OutputFormat {
 	// This is what’s printed after the comma of value lists
 	public $sSpaceBeforeListArgumentSeparator = '';
 	public $sSpaceAfterListArgumentSeparator = '';
+
+	// This is what’s printed after the operators in a calc function
+	public $sSpaceBeforeCalcListArgumentSeparator = ' ';
+	public $sSpaceAfterCalcListArgumentSeparator = ' ';
 
 	public $sSpaceBeforeOpeningBrace = ' ';
 
@@ -219,6 +223,14 @@ public function spaceAfterListArgumentSeparator($sSeparator) {
 		return $this->space('AfterListArgumentSeparator', $sSeparator);
 	}
 
+	public function spaceBeforeCalcListArgumentSeparator($sSeparator) {
+		return $this->space('BeforeCalcListArgumentSeparator', $sSeparator);
+	}
+
+	public function spaceAfterCalcListArgumentSeparator($sSeparator) {
+		return $this->space('AfterCalcListArgumentSeparator', $sSeparator);
+	}
+
 	public function spaceBeforeOpeningBrace() {
 		return $this->space('BeforeOpeningBrace');
 	}
@@ -286,4 +298,4 @@ private function prepareSpace($sSpaceString) {
 	private function indent() {
 		return str_repeat($this->oFormat->sIndentation, $this->oFormat->level());
 	}
-}
+}

lib/Sabberworm/CSS/Parser.php

@@ -14,7 +14,9 @@
 use Sabberworm\CSS\CSSList\AtRuleBlockList;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
 use Sabberworm\CSS\Value\CSSFunction;
+use Sabberworm\CSS\Value\CalcFunction;
 use Sabberworm\CSS\Value\RuleValueList;
+use Sabberworm\CSS\Value\CalcRuleValueList;
 use Sabberworm\CSS\Value\Size;
 use Sabberworm\CSS\Value\Color;
 use Sabberworm\CSS\Value\URL;
@@ -372,7 +374,7 @@ private function parseRule() {
 		return $oRule;
 	}
 
-	private function parseValue($aListDelimiters) {
+	private function parseValue($aListDelimiters, $ruleValueListClass = '\Sabberworm\CSS\Value\RuleValueList') {
 		$aStack = array();
 		$this->consumeWhiteSpace();
 		//Build a list of delimiters and parsed values
@@ -408,7 +410,7 @@ private function parseValue($aListDelimiters) {
 						break;
 					}
 				}
-				$oList = new RuleValueList($sDelimiter, $this->iLineNo);
+				$oList = new $ruleValueListClass($sDelimiter, $this->iLineNo);
 				for ($i = $iStartPosition - 1; $i - $iStartPosition + 1 < $iLength * 2; $i+=2) {
 					$oList->addListComponent($aStack[$i]);
 				}
@@ -527,8 +529,8 @@ private function parseCalcValue() {
 		$this->consume($func);
 		$this->consumeWhiteSpace();
 		$this->consume('(');
-		$aArguments = $this->parseValue(array('+', '-', '*', '/', ' '));
-		return new CSSFunction($func, $aArguments, ',', $this->iLineNo);
+		$aArguments = $this->parseValue(array('+', '-', '*', '/', ' '), '\Sabberworm\CSS\Value\CalcRuleValueList');
+		return new CalcFunction($func, $aArguments, ',', $this->iLineNo);
 	}
 
 	/**

lib/Sabberworm/CSS/Value/CSSFunction.php

@@ -4,7 +4,7 @@
 
 class CSSFunction extends ValueList {
 
-	private $sName;
+	protected $sName;
 
 	public function __construct($sName, $aArguments, $sSeparator = ',', $iLineNo = 0) {
 		if($aArguments instanceof RuleValueList) {
@@ -37,4 +37,4 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 		return "{$this->sName}({$aArguments})";
 	}
 
-}
+}

lib/Sabberworm/CSS/Value/CalcFunction.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Sabberworm\CSS\Value;
+
+class CalcFunction extends CSSFunction {
+
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		$aArguments = $oOutputFormat->implode($oOutputFormat->spaceBeforeCalcListArgumentSeparator($this->sSeparator) . $this->sSeparator . $oOutputFormat->spaceAfterCalcListArgumentSeparator($this->sSeparator), $this->aComponents);
+		return "{$this->sName}({$aArguments})";
+	}
+
+}

lib/Sabberworm/CSS/Value/CalcRuleValueList.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Sabberworm\CSS\Value;
+
+class CalcRuleValueList extends RuleValueList {
+
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return $oOutputFormat->implode($oOutputFormat->spaceBeforeCalcListArgumentSeparator($this->sSeparator) . $this->sSeparator . $oOutputFormat->spaceAfterCalcListArgumentSeparator($this->sSeparator), $this->aComponents);
+	}
+
+}

tests/Sabberworm/CSS/ParserTest.php

@@ -389,8 +389,8 @@ function testUrlInFile() {
 
 	function testCalcInFile() {
 		$oDoc = $this->parsedStructureForFile('calc', Settings::create()->withMultibyteSupport(true));
-		$sExpected = 'div {width: calc(100%/4);}
-div {height: -webkit-calc(9/16*100%);}';
+		$sExpected = 'div {width: calc(100% / 4);}
+div {height: -webkit-calc(9 / 16 * 100%);}';
 		$this->assertSame($sExpected, $oDoc->render());
 	}