Merge pull request leafo#64 from robocoder/formatter

formatter should format()

Author: leafo

scss.inc.php

@@ -86,9 +86,7 @@ function compile($code, $name=null) {
 
 		$this->compileRoot($tree);
 
-		ob_start();
-		$this->formatter->block($this->scope);
-		$out = ob_get_clean();
+		$out = $this->formatter->format($this->scope);
 
 		setlocale(LC_NUMERIC, $locale);
 		return $out;
@@ -3865,7 +3863,7 @@ public function property($name, $value) {
 		return $name . $this->assignSeparator . $value . ";";
 	}
 
-	public function block($block) {
+	protected function block($block) {
 		if (empty($block->lines) && empty($block->children)) return;
 
 		$inner = $pre = $this->indentStr();
@@ -3896,6 +3894,14 @@ public function block($block) {
 			echo $pre . $this->close . $this->break;
 		}
 	}
+
+	public function format($block) {
+		ob_start();
+		$this->block($block);
+		$out = ob_get_clean();
+
+		return $out;
+	}
 }
 
 /**
@@ -3943,7 +3949,7 @@ public function adjustAllChildren($block) {
 		}
 	}
 
-	public function block($block) {
+	protected function block($block) {
 		if ($block->type == "root") {
 			$this->adjustAllChildren($block);
 		}