Initial output formatting options

catching output exceptions not yet implemented

Author: sabberworm

README.md

@@ -107,7 +107,6 @@ There are a few convenience methods on Document to ease finding, manipulating an
 ## To-Do
 
 * More convenience methods [like `selectorsWithElement($sId/Class/TagName)`, `attributesOfType($sType)`, `removeAttributesOfType($sType)`]
-* Options for output (compact, verbose, etc.)
 * Real multibyte support. Currently only multibyte charsets whose first 255 code points take up only one byte and are identical with ASCII are supported (yes, UTF-8 fits this description).
 * Named color support (using `Color` instead of an anonymous string literal)
 
@@ -152,6 +151,18 @@ To output the entire CSS document into a variable, just use `->render()`:
 	$oCssDocument = $oCssParser->parse();
 	print $oCssDocument->render();
 
+If you want to format the output, pass an instance of type `Sabberworm\CSS\OutputFormat`:
+
+	$oFormat = Sabberworm\CSS\OutputFormat::create()->indentWithSpaces(4)->setSpaceBetweenRules("\n");
+	print $oCssDocument->render(oFormat);
+
+Or use one of the predefined formats:
+
+	print $oCssDocument->render(Sabberworm\CSS\OutputFormat::createPretty());
+	print $oCssDocument->render(Sabberworm\CSS\OutputFormat::createCompact());
+
+To see what you can do with output formatting, look at the tests in `tests/Sabberworm/CSS/OutputFormatTest.php`.
+
 ## Examples
 
 ### Example 1 (At-Rules)

lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php

@@ -31,10 +31,14 @@ public function __toString() {
 	}
 
 	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
-		$sResult = "@{$this->sType} {$this->sArgs}{";
+		$sResult = "@{$this->sType} {$this->sArgs}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
 		$sResult .= parent::render($oOutputFormat);
 		$sResult .= '}';
 		return $sResult;
 	}
 
+	public function isRootList() {
+		return false;
+	}
+
 }

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -74,11 +74,33 @@ public function __toString() {
 
 	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 		$sResult = '';
+		$bIsFirst = true;
+		$oNextLevel = $oOutputFormat;
+		if(!$this->isRootList()) {
+			$oNextLevel = $oOutputFormat->nextLevel();
+		}
 		foreach ($this->aContents as $oContent) {
-			$sResult .= $oContent->render($oOutputFormat->nextLevel());
+			if($bIsFirst) {
+				$bIsFirst = false;
+				$sResult .= $oNextLevel->spaceBeforeBlocks();
+			} else {
+				$sResult .= $oNextLevel->spaceBetweenBlocks();
+			}
+			$sResult .= $oContent->render($oNextLevel);
+		}
+
+		if(!$bIsFirst) {
+			// Had some output
+			$sResult .= $oOutputFormat->spaceAfterBlocks();
 		}
+
 		return $sResult;
 	}
+	
+	/**
+	* Return true if the list can not be further outdented. Only important when rendering.
+	*/
+	public abstract function isRootList();
 
 	public function getContents() {
 		return $this->aContents;

lib/Sabberworm/CSS/CSSList/Document.php

@@ -91,4 +91,8 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat = null) {
 		return parent::render($oOutputFormat);
 	}
 
+	public function isRootList() {
+		return true;
+	}
+
 }

lib/Sabberworm/CSS/CSSList/KeyFrame.php

@@ -36,12 +36,16 @@ public function __toString() {
 	}
 
 	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
-		$sResult = "@{$this->vendorKeyFrame} {$this->animationName} {";
+		$sResult = "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
 		$sResult .= parent::render($oOutputFormat->nextLevel());
 		$sResult .= '}';
 		return $sResult;
 	}
 
+	public function isRootList() {
+		return false;
+	}
+
 	public function atRuleName() {
 		return $this->vendorKeyFrame;
 	}