Incrementing to version 1.3.2

peteboere · peteboere · commit c68012b64f30 · 2011-10-18T14:07:28.000+01:00
Added some docs
diff --git a/CssCrush/CssCrush.php b/CssCrush/CssCrush.php
@@ -3,7 +3,7 @@
  *
  * CSS Crush
  * 
- * @version    1.3.1
+ * @version    1.3.2
  * @license    http://www.opensource.org/licenses/mit-license.php (MIT)
  * @copyright  Copyright 2010-2011 Pete Boere
  * 
diff --git a/CssCrush/lib/Color.php b/CssCrush/lib/Color.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * 
+ * Colour parsing and conversion
+ * 
+ */
 
 class CssCrush_Color {
 
diff --git a/CssCrush/lib/Core.php b/CssCrush/lib/Core.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * 
+ * Main script. Includes core public API
+ * 
+ */
 
 class CssCrush {
 
@@ -54,7 +59,7 @@ class CssCrush {
 				([^a-z0-9_-])
 				var\(\s*([a-z0-9_-]+)\s*\)
 				|
-				\{?\$([a-z0-9_-]+)\}?  # Dollar syntax, optional curly braces
+				\$\(\s*([a-z0-9_-]+)\s*\)  # Dollar syntax
 			)!ix',
 			'custom'  => '!(^|[^a-z0-9_-])(<functions>)?(___p\d+___)!i',
 			'match'   => '!(^|[^a-z0-9_-])([a-z_-]+)(___p\d+___)!i',
@@ -691,9 +696,9 @@ protected static function validateCache ( $hostfile ) {
 
 	protected static function minify ( $str ) {
 		$replacements = array(
-			'!\n+| (\{)!'                     => '$1',    // Trim whitespace
+			'!\n+| (\{)!'                       => '$1',    // Trim whitespace
 			'!(^|[: \(,])0(\.\d+)!'             => '$1$2',  // Strip leading zeros on floats
-			'!(^|[: \(,])\.?0[a-zA-Z%]{1,5}!i'  => '${1}0', // Strip unnecessary units on zero values
+			'!(^|[: \(,])\.?0[a-zA-Z]{1,5}!i'   => '${1}0', // Strip unnecessary units on zero values
 			'!(^|\:) *(0 0 0|0 0 0 0) *(;|\})!' => '${1}0${3}', // Collapse zero lists
 			'!(padding|margin) ?\: *0 0 *(;|\})!' => '${1}:0${2}', // Collapse zero lists continued
 			'!\s*([>~+=])\s*!'                  => '$1',     // Clean-up around combinators
diff --git a/CssCrush/lib/Function.php b/CssCrush/lib/Function.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * 
+ * Custom CSS functions
+ * 
+ */
 
 class CssCrush_Function {
 
diff --git a/CssCrush/lib/Importer.php b/CssCrush/lib/Importer.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * 
+ * Recursive file importing
+ * 
+ */
 
 class CssCrush_Importer {
 
diff --git a/CssCrush/lib/Rule.php b/CssCrush/lib/Rule.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * 
+ * CSS rule API
+ * 
+ */
 
 class CssCrush_Rule implements IteratorAggregate {
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* CSS Crush`
`5`	`5`	`*`
`6`		`- * @version 1.3.1`
	`6`	`+ * @version 1.3.2`
`7`	`7`	`* @license http://www.opensource.org/licenses/mit-license.php (MIT)`
`8`	`8`	`* @copyright Copyright 2010-2011 Pete Boere`
`9`	`9`	`*`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,9 @@ @@
 <?php
 +/**
 + *
 + * Colour parsing and conversion
 + *
 + */
 class CssCrush_Color {