html5-starter 0.1.4b → 0.1.8b

data/templates/project/files/build/tools/css-compressor/lib/Combine/Background.php

@@ -1,107 +0,0 @@
-<?php
-/**
- * CSS Compressor [VERSION]
- * [DATE]
- * Corey Hart @ http://www.codenothing.com
- */ 
-
-Class CSSCompression_Combine_Background
-{
-	/**
-	 * Combine Patterns
-	 *
-	 * @class Control: Compression Controller
-	 * @class Combine: Combine Controller
-	 * @param (regex) rbackground: Background matching
-	 * @param (array) groupings: List of background combinations
-	 */
-	private $Control;
-	private $Combine;
-	private $rbackground = "/(^|(?<!\\\);)background-(color|image|repeat|attachment|position):(.*?)((?<!\\\);|$)/";
-	private $groupings = array(
-		// With color
-		array( 'color', 'image', 'repeat', 'attachment', 'position' ),
-		array( 'color', 'image', 'attachment', 'position' ),
-		array( 'color', 'image', 'repeat', 'position' ),
-		array( 'color', 'image', 'repeat', 'attachment' ),
-		array( 'color', 'image', 'repeat' ),
-		array( 'color', 'image', 'attachment' ),
-		array( 'color', 'image', 'position' ),
-		array( 'color', 'image' ),
-		// Without Color
-		array( 'image', 'attachment', 'position' ),
-		array( 'image', 'repeat', 'position' ),
-		array( 'image', 'repeat', 'attachment' ),
-		array( 'image', 'repeat' ),
-		array( 'image', 'attachment' ),
-		array( 'image', 'position' ),
-		// Just Color/Image
-		array( 'image' ),
-		array( 'color' ),
-	);
-
-	/**
-	 * Stash a reference to the controller & combiner
-	 *
-	 * @param (class) control: CSSCompression Controller
-	 * @param (class) combine: CSSCompression Combiner
-	 */
-	public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
-		$this->Control = $control;
-		$this->Combine = $combine;
-	}
-
-	/**
-	 * Combines multiple background props into single definition
-	 *
-	 * @param (string) val: Rule Set
-	 */ 
-	public function combine( $val ) {
-		$storage = array();
-
-		// Find all possible occurences and build the replacement
-		$pos = 0;
-		while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$storage[ $match[ 2 ][ 0 ] ] = $match[ 3 ][ 0 ];
-			$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-		}
-
-		// Run background checks and get replacement str
-		foreach ( $this->groupings as $props ) {
-			if ( $replace = $this->Combine->searchDefinitions( 'background', $storage, $props ) ) {
-				break;
-			}
-		}
-
-		// If replacement string found, run it on all declarations
-		if ( $replace ) {
-			$pos = 0;
-			while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-				$colon = strlen( $match[ 1 ][ 0 ] );
-				$val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
-				$pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
-				$replace = '';
-			}
-		}
-
-		// Return converted val
-		return $val;
-	}
-
-	/**
-	 * Access to private methods for testing
-	 *
-	 * @param (string) method: Method to be called
-	 * @param (array) args: Array of paramters to be passed in
-	 */
-	public function access( $method, $args ) {
-		if ( method_exists( $this, $method ) ) {
-			return call_user_func_array( array( $this, $method ), $args );
-		}
-		else {
-			throw new CSSCompression_Exception( "Unknown method in Background Class - " . $method );
-		}
-	}
-};
-
-?>

data/templates/project/files/build/tools/css-compressor/lib/Combine/Border.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * CSS Compressor [VERSION]
- * [DATE]
- * Corey Hart @ http://www.codenothing.com
- */ 
-
-Class CSSCompression_Combine_Border
-{
-	/**
-	 * Combine Patterns
-	 *
-	 * @class Control: Compression Controller
-	 * @class Combine: Combine Controller
-	 * @param (regex) rborder: Border matching
-	 */
-	private $Control;
-	private $Combine;
-	private $rborder = "/(^|(?<!\\\);)border-(top|right|bottom|left):(.*?)((?<!\\\);|$)/";
-
-	/**
-	 * Stash a reference to the controller & combiner
-	 *
-	 * @param (class) control: CSSCompression Controller
-	 * @param (class) combine: CSSCompression Combiner
-	 */
-	public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
-		$this->Control = $control;
-		$this->Combine = $combine;
-	}
-
-	/**
-	 * Combines multiple border properties into single definition
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	public function combine( $val ) {
-		if ( ( $replace = $this->replace( $val ) ) === false ) {
-			return $val;
-		}
-
-		// Rebuild the rule set with the combinations found
-		$pos = 0;
-		while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$colon = strlen( $match[ 1 ][ 0 ] );
-			$val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
-			$pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
-			$replace = '';
-		}
-
-		// Return converted val
-		return $val;
-	}
-
-	/**
-	 * Builds a replacement string
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	private function replace( $val ) {
-		$storage = array();
-
-		// Find all possible occurences and build the replacement
-		$pos = 0;
-		while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			// Override double written properties
-			$storage[ $match[ 2 ][ 0 ] ] = $match[ 3 ][ 0 ];
-			$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-		}
-
-		// All 4 have to be defined
-		if ( count( $storage ) == 4 &&
-			$storage['top'] == $storage['bottom'] &&
-			$storage['left'] == $storage['right'] &&
-			$storage['top'] == $storage['right'] ) {
-				return "border:" . $storage['top'] . ';';
-		}
-
-		return false;
-	}
-
-	/**
-	 * Access to private methods for testing
-	 *
-	 * @param (string) method: Method to be called
-	 * @param (array) args: Array of paramters to be passed in
-	 */
-	public function access( $method, $args ) {
-		if ( method_exists( $this, $method ) ) {
-			return call_user_func_array( array( $this, $method ), $args );
-		}
-		else {
-			throw new CSSCompression_Exception( "Unknown method in Border Class - " . $method );
-		}
-	}
-};
-
-?>

data/templates/project/files/build/tools/css-compressor/lib/Combine/BorderOutline.php

@@ -1,109 +0,0 @@
-<?php
-/**
- * CSS Compressor [VERSION]
- * [DATE]
- * Corey Hart @ http://www.codenothing.com
- */ 
-
-Class CSSCompression_Combine_BorderOutline
-{
-	/**
-	 * Combine Patterns
-	 *
-	 * @class Control: Compression Controller
-	 * @class Combine: Combine Controller
-	 * @param (regex) rcsw: Border/Outline matching
-	 */
-	private $Control;
-	private $Combine;
-	private $rcsw = "/(^|(?<!\\\);)(border|border-top|border-bottom|border-left|border-right|outline)-(color|style|width):(.*?)((?<!\\\);|$)/";
-
-	/**
-	 * Stash a reference to the controller & combiner
-	 *
-	 * @param (class) control: CSSCompression Controller
-	 * @param (class) combine: CSSCompression Combiner
-	 */
-	public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
-		$this->Control = $control;
-		$this->Combine = $combine;
-	}
-
-	/**
-	 * Combines color/style/width of border/outline properties
-	 *
-	 * @param (string) val: Rule Set
-	 */ 
-	public function combine( $val ) {
-		$storage = $this->storage( $val );
-		$pos = 0;
-
-		// Now rebuild the string replacing all instances
-		while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$prop = $match[ 2 ][ 0 ];
-			if ( isset( $storage[ $prop ] ) ) {
-				$colon = strlen( $match[ 1 ][ 0 ] );
-				$val = substr_replace( $val, $storage[ $prop ], $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
-				$pos = $match[ 0 ][ 1 ] + strlen( $storage[ $prop ] ) - $colon - 1;
-				$storage[ $prop ] = '';
-			}
-			else {
-				$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-			}
-		}
-
-		// Return converted val
-		return $val;
-	}
-
-	/**
-	 * Builds a storage object for iteration
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	private function storage( $val ) {
-		$storage = array();
-		$pos = 0;
-
-		// Find all possible occurences and build the replacement
-		while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			if ( ! isset( $storage[ $match[ 2 ][ 0 ] ] ) ) {
-				$storage[ $match[ 2 ][ 0 ] ] = array( $match[ 3 ][ 0 ] => $match[ 4 ][ 0 ] );
-			}
-
-			// Override double written properties
-			$storage[ $match[ 2 ][ 0 ] ][ $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
-			$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-		}
-
-		// Go through each tag for possible combination
-		foreach ( $storage as $tag => $arr ) {
-			// All three have to be defined
-			if ( count( $arr ) == 3 && ! $this->Combine->checkUncombinables( $arr ) ) {
-				$storage[ $tag ] = "$tag:" . $arr['width'] . ' ' . $arr['style'] . ' ' . $arr['color'] . ';';
-			}
-			else {
-				unset( $storage[ $tag ] );
-			}
-		}
-
-		return $storage;
-	}
-	
-	/**
-	 * Access to private methods for testing
-	 *
-	 * @param (string) method: Method to be called
-	 * @param (array) args: Array of paramters to be passed in
-	 */
-	public function access( $method, $args ) {
-		if ( method_exists( $this, $method ) ) {
-			return call_user_func_array( array( $this, $method ), $args );
-		}
-		else {
-			throw new CSSCompression_Exception( "Unknown method in BorderOutline Class - " . $method );
-		}
-	}
-};
-
-?>

data/templates/project/files/build/tools/css-compressor/lib/Combine/BorderRadius.php

@@ -1,262 +0,0 @@
-<?php
-/**
- * CSS Compressor [VERSION]
- * [DATE]
- * Corey Hart @ http://www.codenothing.com
- */ 
-
-Class CSSCompression_Combine_BorderRadius
-{
-	/**
-	 * Combine Patterns
-	 *
-	 * @class Control: Compression Controller
-	 * @class Combine: Combine Controller
-	 * @param (regex) rspace: Checks for space without an escape '\' character before it
-	 * @param (regex) rslash: Checks for unescaped slash character
-	 * @param (array) borderRadius: Various border radii components
-	 */
-	private $Control;
-	private $Combine;
-	private $rspace = "/(?<!\\\)\s/";
-	private $rslash = "/(?<!\\\)\//";
-	private $borderRadius = array(
-		'css3' => array(
-			'mod' => '',
-			'base' => "/(^|(?<!\\\);)border-radius:(.*?)((?<!\\\);|$)/",
-			'full' => "/(^|(?<!\\\);)border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/",
-		),
-		'moz' => array(
-			'mod' => '-moz-',
-			'base' => "/(^|(?<!\\\);)-moz-border-radius:(.*?)((?<!\\\);|$)/",
-			'full' => "/(^|(?<!\\\);)-moz-border-radius-(top|bottom)(left|right):(.*?)((?<!\\\);|$)/"
-		),
-		'webkit' => array(
-			'mod' => '-webkit-',
-			'base' => "/(^|(?<!\\\);)-webkit-border-radius:(.*?)((?<!\\\);|$)/",
-			'full' => "/(^|(?<!\\\);)-webkit-border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/"
-		),
-	);
-
-	/**
-	 * Stash a reference to the controller & combiner
-	 *
-	 * @param (class) control: CSSCompression Controller
-	 * @param (class) combine: CSSCompression Combiner
-	 */
-	public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
-		$this->Control = $control;
-		$this->Combine = $combine;
-	}
-
-
-	/**
-	 * Main handler to combine border-radii into a single rule
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	public function combine( $val ) {
-		foreach ( $this->borderRadius as $regex ) {
-			$val = $this->fix( $val, $regex );
-		}
-
-		return $val;
-	}
-
-	/**
-	 * Does the actual combining
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	private function fix( $val, $regex ) {
-		$val = $this->base( $val, $regex );
-		$replace = $regex['mod'];
-
-		// Storage builder
-		if ( ( $storage = $this->storage( $val, $regex ) ) === false ) {
-			return $val;
-		}
-
-		// Setup horizontal/vertical radii
-		foreach ( $storage as $dir => &$config ) {
-			// Verticals are optional
-			if ( $dir == 'vertical' && ! $config['keep'] ) {
-				break;
-			}
-			// All 4 are the same
-			else if ( $config['top-left'] == $config['top-right'] && 
-				$config['top-right'] == $config['bottom-right'] && 
-				$config['bottom-right'] == $config['bottom-left'] ) {
-					$config['replace'] .= $config['top-left'];
-			}
-			// Opposites are the same
-			else if ( $config['top-left'] == $config['bottom-right'] && $config['top-right'] == $config['bottom-left'] ) {
-				$config['replace'] .= $config['top-left'] . ' ' . $config['top-right'];
-			}
-			// 3-point directional
-			else if ( $config['top-right'] == $config['bottom-left'] ) {
-				$config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' ' . $config['bottom-right'];
-			}
-			// none are the same, but can still use shorthand notation
-			else {
-				$config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' ' 
-					. $config['bottom-right'] . ' ' . $config['bottom-left'];
-			}
-		}
-
-		// Now rebuild the string replacing all instances of margin/padding if shorthand exists
-		$pos = 0;
-		$replace = $regex['mod'] . "border-radius:" . $storage['horizontal']['replace'] . $storage['vertical']['replace'] . ';';
-		while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$colon = strlen( $match[ 1 ][ 0 ] );
-			$val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
-			$pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
-			$replace = '';
-		}
-
-		// Return converted val
-		return $val;
-	}
-
-	/**
-	 * Expands short handed border radius props for combination
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	private function base( $val, $regex ) {
-		$pos = 0;
-		while ( preg_match( $regex['base'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$replace = '';
-			$parts = preg_split( $this->rslash, trim( $match[ 2 ][ 0 ] ), 2 );
-			$positions = array(
-				'top-left' => 0,
-				'top-right' => 0,
-				'bottom-right' => 0,
-				'bottom-left' => 0,
-			);
-			$base = array(
-				'horizontal' => array(
-					'parts' => preg_split( $this->rspace, trim( $parts[ 0 ] ) ),
-					'pos' => $positions,
-				),
-				'vertical' => array(
-					'parts' => isset( $parts[ 1 ] ) ? preg_split( $this->rspace, trim( $parts[ 1 ] ) ) : '',
-					'pos' => $positions,
-				),
-			);
-
-			foreach ( $base as &$config ) {
-				// Skip uncombinables
-				if ( $this->Combine->checkUncombinables( $config['parts'] ) ) {
-					$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-					continue 2;
-				}
-				// Might not have verticals
-				else if ( $config['parts'] === '' ) {
-					continue;
-				}
-
-				// Each position needs a value
-				switch ( count( $config['parts'] ) ) {
-					case 1:
-						$config['pos']['top-left'] = $config['pos']['top-right'] = $config['parts'][ 0 ];
-						$config['pos']['bottom-left'] = $config['pos']['bottom-right'] = $config['parts'][ 0 ];
-						break;
-					case 2:
-						$config['pos']['top-left'] = $config['pos']['bottom-right'] = $config['parts'][ 0 ];
-						$config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][ 1 ];
-						break;
-					case 3:
-						$config['pos']['top-left'] = $config['parts'][ 0 ];
-						$config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][ 1 ];
-						$config['pos']['bottom-right'] = $config['parts'][ 2 ];
-						break;
-					case 4:
-						$config['pos']['top-left'] = $config['parts'][ 0 ];
-						$config['pos']['top-right'] = $config['parts'][ 1 ];
-						$config['pos']['bottom-right'] = $config['parts'][ 2 ];
-						$config['pos']['bottom-left'] = $config['parts'][ 3 ];
-						break;
-					default:
-						continue 2;
-				}
-
-			}
-
-			// Build the replacement
-			foreach ( $positions as $p => $v ) {
-				if ( $regex['mod'] == '-moz-' ) {
-					$replace .= "-moz-border-radius-" . preg_replace( "/-/", '', $p ) . ":"
-						. $base['horizontal']['pos'][ $p ]
-						. ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][ $p ] )
-						. ';';
-				}
-				else {
-					$replace .= $regex['mod'] . "border-$p-radius:"
-						. $base['horizontal']['pos'][ $p ]
-						. ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][ $p ] )
-						. ';';
-				}
-			}
-			$pos += strlen( $replace );
-			$val = substr_replace( $val, $replace, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
-		}
-
-		return $val;
-	}
-
-	/**
-	 * Builds the storage object for border radius props
-	 *
-	 * @param (string) val: Rule Set
-	 * @param (array) regex: Current border radius type checking props
-	 */
-	private function storage( $val, $regex ) {
-		$storage = array(
-			'horizontal' => array( 'replace' => '' ),
-			'vertical' => array( 'replace' => '', 'keep' => false ),
-		);
-
-		// Find all possible occurences of this border-radius type and mark their directional value
-		$pos = 0;
-		while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-			$parts = preg_split( $this->rspace, $match[ 4 ][ 0 ], 2 );
-			$storage['horizontal'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = trim( $parts[ 0 ] );
-			if ( isset( $parts[ 1 ] ) ) {
-				$storage['vertical'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = trim( $parts[ 1 ] );
-				$storage['vertical']['keep'] = true;
-				$storage['vertical']['replace'] = '/';
-			}
-			else {
-				$storage['vertical'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = '0';
-			}
-		}
-
-		// Only combine if all 4 definitions are found (5 including replace)
-		if ( count( $storage['horizontal'] ) != 5 || 
-			$this->Combine->checkUncombinables( $storage['horizontal'] ) || 
-			$this->Combine->checkUncombinables( $storage['vertical'] ) ) {
-				return false;
-		}
-
-		return $storage;
-	}
-
-	/**
-	 * Access to private methods for testing
-	 *
-	 * @param (string) method: Method to be called
-	 * @param (array) args: Array of paramters to be passed in
-	 */
-	public function access( $method, $args ) {
-		if ( method_exists( $this, $method ) ) {
-			return call_user_func_array( array( $this, $method ), $args );
-		}
-		else {
-			throw new CSSCompression_Exception( "Unknown method in BorderRadius Class - " . $method );
-		}
-	}
-};
-
-?>

data/templates/project/files/build/tools/css-compressor/lib/Combine/Font.php

@@ -1,125 +0,0 @@
-<?php
-/**
- * CSS Compressor [VERSION]
- * [DATE]
- * Corey Hart @ http://www.codenothing.com
- */ 
-
-Class CSSCompression_Combine_Font
-{
-	/**
-	 * Combine Patterns
-	 *
-	 * @class Control: Compression Controller
-	 * @class Combine: Combine Controller
-	 * @param (regex) rfont: Font matching
-	 * @param (array) groupings: Set of font combinationals
-	 */
-	private $Control;
-	private $Combine;
-	private $rfont = "/(^|(?<!\\\);)(font|line)-(style|variant|weight|size|height|family):(.*?)((?<!\\\);|$)/";
-	private $groupings = array(
-		array( 'font-style', 'font-variant', 'font-weight', 'size/height', 'font-family' ),
-		array( 'font-style', 'font-variant', 'font-weight', 'font-size', 'font-family' ),
-		array( 'font-style', 'font-variant', 'size/height', 'font-family' ),
-		array( 'font-style', 'font-variant', 'font-size', 'font-family' ),
-		array( 'font-style', 'font-weight', 'size/height', 'font-family' ),
-		array( 'font-style', 'font-weight', 'font-size', 'font-family' ),
-		array( 'font-variant', 'font-weight', 'size/height', 'font-family' ),
-		array( 'font-variant', 'font-weight', 'font-size', 'font-family' ),
-		array( 'font-weight', 'size/height', 'font-family' ),
-		array( 'font-weight', 'font-size', 'font-family' ),
-		array( 'font-variant', 'size/height', 'font-family' ),
-		array( 'font-variant', 'font-size', 'font-family' ),
-		array( 'font-style', 'size/height', 'font-family' ),
-		array( 'font-style', 'font-size', 'font-family' ),
-		array( 'size/height', 'font-family' ),
-		array( 'font-size', 'font-family' ),
-	);
-
-	/**
-	 * Stash a reference to the controller & combiner
-	 *
-	 * @param (class) control: CSSCompression Controller
-	 * @param (class) combine: CSSCompression Combiner
-	 */
-	public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
-		$this->Control = $control;
-		$this->Combine = $combine;
-	}
-
-	/**
-	 * Combines multiple font-definitions into single definition
-	 *
-	 * @param (string) val: Rule Set
-	 */ 
-	public function combine( $val ) {
-		$storage = $this->storage( $val );
-
-		// Loop through each property check and see if they can be replaced
-		foreach ( $this->groupings as $props ) {
-			if ( $replace = $this->Combine->searchDefinitions( 'font', $storage, $props ) ) {
-				break;
-			}
-		}
-
-		// If replacement string found, run it on all declarations
-		if ( $replace ) {
-			$pos = 0;
-			while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-				if ( ! isset( $storage['line-height'] ) && stripos( $match[ 0 ][ 0 ], 'line-height') === 0 ) {
-					$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-					continue;
-				}
-				$colon = strlen( $match[ 1 ][ 0 ] );
-				$val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
-				$pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
-				$replace = '';
-			}
-		}
-
-		// Return converted val
-		return $val;
-	}
-
-	/**
-	 * Builds a storage object for iteration
-	 *
-	 * @param (string) val: Rule Set
-	 */
-	private function storage( $val ) {
-		$storage = array();
-
-		// Find all possible occurences and build the replacement
-		$pos = 0;
-		while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
-			$storage[ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
-			$pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
-		}
-
-		// Combine font-size & line-height if possible
-		if ( isset( $storage['font-size'] ) && isset( $storage['line-height'] ) ) {
-			$storage['size/height'] = $storage['font-size'] . '/' . $storage['line-height'];
-			unset( $storage['font-size'], $storage['line-height'] );
-		}
-
-		return $storage;
-	}
-
-	/**
-	 * Access to private methods for testing
-	 *
-	 * @param (string) method: Method to be called
-	 * @param (array) args: Array of paramters to be passed in
-	 */
-	public function access( $method, $args ) {
-		if ( method_exists( $this, $method ) ) {
-			return call_user_func_array( array( $this, $method ), $args );
-		}
-		else {
-			throw new CSSCompression_Exception( "Unknown method in Font Class - " . $method );
-		}
-	}
-};
-
-?>