modified Merge branch 'master' of https://github.com/kriss0r/php-diff

Author: JBlond

lib/Diff/Renderer/Html/Array.php

@@ -234,9 +234,15 @@ protected function formatLines($lines)
 	 */
 	function fixSpaces($matches)
 	{
-		$count = strlen($matches['0']);
-		if($count == 0) {
-			return '';
+		$buffer	= '';
+		foreach($matches as $spaces){
+			$count = strlen($spaces);
+			if($count == 0) {
+				continue;
+			}
+			$div = floor($count / 2);
+			$mod = $count % 2;
+			$buffer	.= str_repeat('  ', $div).str_repeat(' ', $mod);
 		}
 
 		$div = floor($count / 2);
@@ -252,7 +258,15 @@ function fixSpaces($matches)
 	 */
 	private function expandTabs($line)
 	{
-		return str_replace("\t", str_repeat(' ', $this->options['tabSize']), $line);
+		$tabSize	= $this->options['tabSize'];
+		while(($pos = strpos($line, "\t")) !== FALSE){
+			$left	= substr($line, 0, $pos);
+			$right	= substr($line, $pos + 1);
+			$length	= $tabSize - ($pos % $tabSize);
+			$spaces	= str_repeat(' ', $length);
+			$line	= $left.$spaces.$right;
+		}
+		return $line;
 	}
 
 	/**