reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Reader/Excel5.php

Switch Indentation +890 added lines, -890 removed lines

@@ -969,55 +969,55 @@ 
 
 				switch ($obj['otObjType']) {
 
-				case 0x19:
-					// Note
-//					echo 'Cell Annotation Object<br />';
-//					echo 'Object ID is ',$obj['idObjID'],'<br />';
-//
-					if (isset($this->_cellNotes[$obj['idObjID']])) {
-						$cellNote = $this->_cellNotes[$obj['idObjID']];
-
-//						echo '_cellNotes[',$obj['idObjID'],']: ';
-//						var_dump($cellNote);
-//						echo '<br />';
-//
-						if (isset($this->_textObjects[$obj['idObjID']])) {
-							$textObject = $this->_textObjects[$obj['idObjID']];
-//							echo '_textObject: ';
-//							var_dump($textObject);
-//							echo '<br />';
-//
-							$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
-							$text = $textObject['text'];
+					case 0x19:
+						// Note
+	//					echo 'Cell Annotation Object<br />';
+	//					echo 'Object ID is ',$obj['idObjID'],'<br />';
+	//
+						if (isset($this->_cellNotes[$obj['idObjID']])) {
+							$cellNote = $this->_cellNotes[$obj['idObjID']];
+
+	//						echo '_cellNotes[',$obj['idObjID'],']: ';
+	//						var_dump($cellNote);
+	//						echo '<br />';
+	//
+							if (isset($this->_textObjects[$obj['idObjID']])) {
+								$textObject = $this->_textObjects[$obj['idObjID']];
+	//							echo '_textObject: ';
+	//							var_dump($textObject);
+	//							echo '<br />';
+	//
+								$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
+								$text = $textObject['text'];
+							}
+	//						echo $text,'<br />';
 						}
-//						echo $text,'<br />';
-					}
-					break;
+						break;
 
-				case 0x08:
-//					echo 'Picture Object<br />';
-					// picture
-
-					// get index to BSE entry (1-based)
-					$BSEindex = $spContainer->getOPT(0x0104);
-					$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-					$BSE = $BSECollection[$BSEindex - 1];
-					$blipType = $BSE->getBlipType();
-
-					// need check because some blip types are not supported by Escher reader such as EMF
-					if ($blip = $BSE->getBlip()) {
-						$ih = imagecreatefromstring($blip->getData());
-						$drawing = new PHPExcel_Worksheet_MemoryDrawing();
-						$drawing->setImageResource($ih);
-
-						// width, height, offsetX, offsetY
-						$drawing->setResizeProportional(false);
-						$drawing->setWidth($width);
-						$drawing->setHeight($height);
-						$drawing->setOffsetX($offsetX);
-						$drawing->setOffsetY($offsetY);
-
-						switch ($blipType) {
+					case 0x08:
+	//					echo 'Picture Object<br />';
+						// picture
+
+						// get index to BSE entry (1-based)
+						$BSEindex = $spContainer->getOPT(0x0104);
+						$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
+						$BSE = $BSECollection[$BSEindex - 1];
+						$blipType = $BSE->getBlipType();
+
+						// need check because some blip types are not supported by Escher reader such as EMF
+						if ($blip = $BSE->getBlip()) {
+							$ih = imagecreatefromstring($blip->getData());
+							$drawing = new PHPExcel_Worksheet_MemoryDrawing();
+							$drawing->setImageResource($ih);
+
+							// width, height, offsetX, offsetY
+							$drawing->setResizeProportional(false);
+							$drawing->setWidth($width);
+							$drawing->setHeight($height);
+							$drawing->setOffsetX($offsetX);
+							$drawing->setOffsetY($offsetY);
+
+							switch ($blipType) {
 							case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
 								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
 								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
@@ -1027,7 +1027,7 @@ 
 								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
 								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
 								break;
-						}
+							}
 
 						$drawing->setWorksheet($this->_phpSheet);
 						$drawing->setCoordinates($spContainer->getStartCoordinates());
@@ -1035,9 +1035,9 @@ 
 
 					break;
 
-				default:
-					// other object type
-					break;
+					default:
+						// other object type
+						break;
 
 				}
 			}
@@ -1071,74 +1071,74 @@ 
 			if ($definedName['isBuiltInName']) {
 				switch ($definedName['name']) {
 
-				case pack('C', 0x06):
-					// print area
-					//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
+					case pack('C', 0x06):
+						// print area
+						//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
 
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+						$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
 
-					$extractedRanges = array();
-					foreach ($ranges as $range) {
-						// $range should look like one of these
-						//		Foo!$C$7:$J$66
-						//		Bar!$A$1:$IV$2
+						$extractedRanges = array();
+						foreach ($ranges as $range) {
+							// $range should look like one of these
+							//		Foo!$C$7:$J$66
+							//		Bar!$A$1:$IV$2
 
-						$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
-						$sheetName = $explodes[0];
+							$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
+							$sheetName = $explodes[0];
 
-						if (count($explodes) == 2) {
-							$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+							if (count($explodes) == 2) {
+								$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+							}
 						}
-					}
-					if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
-						$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
-					}
-					break;
+						if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
+							$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
+						}
+						break;
 
-				case pack('C', 0x07):
-					// print titles (repeating rows)
-					// Assuming BIFF8, there are 3 cases
-					// 1. repeating rows
-					//		formula looks like this: Sheet!$A$1:$IV$2
-					//		rows 1-2 repeat
-					// 2. repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536
-					//		columns A-B repeat
-					// 3. both repeating rows and repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
-
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					foreach ($ranges as $range) {
-						// $range should look like this one of these
-						//		Sheet!$A$1:$B$65536
-						//		Sheet!$A$1:$IV$2
-
-						$explodes = explode('!', $range);
-
-						if (count($explodes) == 2) {
-							if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
-
-								$extractedRange = $explodes[1];
-								$extractedRange = str_replace('$', '', $extractedRange);
-
-								$coordinateStrings = explode(':', $extractedRange);
-								if (count($coordinateStrings) == 2) {
-									list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
-									list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
-
-									if ($firstColumn == 'A' and $lastColumn == 'IV') {
-										// then we have repeating rows
-										$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
-									} elseif ($firstRow == 1 and $lastRow == 65536) {
-										// then we have repeating columns
-										$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
+					case pack('C', 0x07):
+						// print titles (repeating rows)
+						// Assuming BIFF8, there are 3 cases
+						// 1. repeating rows
+						//		formula looks like this: Sheet!$A$1:$IV$2
+						//		rows 1-2 repeat
+						// 2. repeating columns
+						//		formula looks like this: Sheet!$A$1:$B$65536
+						//		columns A-B repeat
+						// 3. both repeating rows and repeating columns
+						//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
+
+						$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+
+						foreach ($ranges as $range) {
+							// $range should look like this one of these
+							//		Sheet!$A$1:$B$65536
+							//		Sheet!$A$1:$IV$2
+
+							$explodes = explode('!', $range);
+
+							if (count($explodes) == 2) {
+								if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
+
+									$extractedRange = $explodes[1];
+									$extractedRange = str_replace('$', '', $extractedRange);
+
+									$coordinateStrings = explode(':', $extractedRange);
+									if (count($coordinateStrings) == 2) {
+										list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
+										list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
+
+										if ($firstColumn == 'A' and $lastColumn == 'IV') {
+											// then we have repeating rows
+											$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
+										} elseif ($firstRow == 1 and $lastRow == 65536) {
+											// then we have repeating columns
+											$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
+										}
 									}
 								}
 							}
 						}
-					}
-					break;
+						break;
 
 				}
 			} else {
@@ -2368,12 +2368,12 @@ 
 				$builtInId = ord($recordData{2});
 
 				switch ($builtInId) {
-				case 0x00:
-					// currently, we are not using this for anything
-					break;
+					case 0x00:
+						// currently, we are not using this for anything
+						break;
 
-				default:
-					break;
+					default:
+						break;
 				}
 
 			} else {
@@ -3181,8 +3181,8 @@ 
 			if (!$isNotInit) {
 				$this->_phpSheet->getPageSetup()->setPaperSize($paperSize);
 				switch ($isPortrait) {
-				case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
-				case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
+					case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
+					case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
 				}
 
 				$this->_phpSheet->getPageSetup()->setScale($scale, false);
@@ -4356,90 +4356,90 @@ 
 			}
 
 			switch ($hyperlinkType) {
-			case 'URL':
-				// section 5.58.2: Hyperlink containing a URL
-				// e.g. http://example.org/index.php
-
-				// offset: var; size: 16; GUID of URL Moniker
-				$offset += 16;
-				// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
-				$us = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
-				$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
-				$url .= $hasText ? '#' : '';
-				$offset += $us;
-				break;
-
-			case 'local':
-				// section 5.58.3: Hyperlink to local file
-				// examples:
-				//   mydoc.txt
-				//   ../../somedoc.xls#Sheet!A1
+				case 'URL':
+					// section 5.58.2: Hyperlink containing a URL
+					// e.g. http://example.org/index.php
+
+					// offset: var; size: 16; GUID of URL Moniker
+					$offset += 16;
+					// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
+					$us = self::_GetInt4d($recordData, $offset);
+					$offset += 4;
+					// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
+					$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
+					$url .= $hasText ? '#' : '';
+					$offset += $us;
+					break;
 
-				// offset: var; size: 16; GUI of File Moniker
-				$offset += 16;
+				case 'local':
+					// section 5.58.3: Hyperlink to local file
+					// examples:
+					//   mydoc.txt
+					//   ../../somedoc.xls#Sheet!A1
 
-				// offset: var; size: 2; directory up-level count.
-				$upLevelCount = self::_GetInt2d($recordData, $offset);
-				$offset += 2;
+					// offset: var; size: 16; GUI of File Moniker
+					$offset += 16;
 
-				// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
-				$sl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
+					// offset: var; size: 2; directory up-level count.
+					$upLevelCount = self::_GetInt2d($recordData, $offset);
+					$offset += 2;
 
-				// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
-				$shortenedFilePath = substr($recordData, $offset, $sl);
-				$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
-				$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
+					// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
+					$sl = self::_GetInt4d($recordData, $offset);
+					$offset += 4;
 
-				$offset += $sl;
+					// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
+					$shortenedFilePath = substr($recordData, $offset, $sl);
+					$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
+					$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
 
-				// offset: var; size: 24; unknown sequence
-				$offset += 24;
+					$offset += $sl;
 
-				// extended file path
-				// offset: var; size: 4; size of the following file link field including string lenth mark
-				$sz = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
+					// offset: var; size: 24; unknown sequence
+					$offset += 24;
 
-				// only present if $sz > 0
-				if ($sz > 0) {
-					// offset: var; size: 4; size of the character array of the extended file path and name
-					$xl = self::_GetInt4d($recordData, $offset);
+					// extended file path
+					// offset: var; size: 4; size of the following file link field including string lenth mark
+					$sz = self::_GetInt4d($recordData, $offset);
 					$offset += 4;
 
-					// offset: var; size 2; unknown
-					$offset += 2;
+					// only present if $sz > 0
+					if ($sz > 0) {
+						// offset: var; size: 4; size of the character array of the extended file path and name
+						$xl = self::_GetInt4d($recordData, $offset);
+						$offset += 4;
 
-					// offset: var; size $xl; character array of the extended file path and name.
-					$extendedFilePath = substr($recordData, $offset, $xl);
-					$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
-					$offset += $xl;
-				}
+						// offset: var; size 2; unknown
+						$offset += 2;
 
-				// construct the path
-				$url = str_repeat('..\\', $upLevelCount);
-				$url .= ($sz > 0) ?
-					$extendedFilePath : $shortenedFilePath; // use extended path if available
-				$url .= $hasText ? '#' : '';
+						// offset: var; size $xl; character array of the extended file path and name.
+						$extendedFilePath = substr($recordData, $offset, $xl);
+						$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
+						$offset += $xl;
+					}
 
-				break;
+					// construct the path
+					$url = str_repeat('..\\', $upLevelCount);
+					$url .= ($sz > 0) ?
+						$extendedFilePath : $shortenedFilePath; // use extended path if available
+					$url .= $hasText ? '#' : '';
 
+					break;
 
-			case 'UNC':
-				// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
-				// todo: implement
-				return;
 
-			case 'workbook':
-				// section 5.58.5: Hyperlink to the Current Workbook
-				// e.g. Sheet2!B1:C2, stored in text mark field
-				$url = 'sheet://';
-				break;
+				case 'UNC':
+					// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
+					// todo: implement
+					return;
 
-			default:
-				return;
+				case 'workbook':
+					// section 5.58.5: Hyperlink to the Current Workbook
+					// e.g. Sheet2!B1:C2, stored in text mark field
+					$url = 'sheet://';
+					break;
+
+				default:
+					return;
 
 			}
 
@@ -4861,54 +4861,54 @@ 
 		$iData = substr($recordData, 8);
 
 		switch ($cf) {
-		case 0x09: // Windows bitmap format
-			// BITMAPCOREINFO
-			// 1. BITMAPCOREHEADER
-			// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
-			$bcSize = self::_GetInt4d($iData, 0);
-//			var_dump($bcSize);
-
-			// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
-			$bcWidth = self::_GetInt2d($iData, 4);
-//			var_dump($bcWidth);
-
-			// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
-			$bcHeight = self::_GetInt2d($iData, 6);
-//			var_dump($bcHeight);
-			$ih = imagecreatetruecolor($bcWidth, $bcHeight);
-
-			// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
-
-			// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
-			$bcBitCount = self::_GetInt2d($iData, 10);
-//			var_dump($bcBitCount);
-
-			$rgbString = substr($iData, 12);
-			$rgbTriples = array();
-			while (strlen($rgbString) > 0) {
-				$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
-				$rgbString = substr($rgbString, 3);
-			}
-			$x = 0;
-			$y = 0;
-			foreach ($rgbTriples as $i => $rgbTriple) {
-				$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
-				imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
-				$x = ($x + 1) % $bcWidth;
-				$y = $y + floor(($x + 1) / $bcWidth);
-			}
-			//imagepng($ih, 'image.png');
+			case 0x09: // Windows bitmap format
+				// BITMAPCOREINFO
+				// 1. BITMAPCOREHEADER
+				// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
+				$bcSize = self::_GetInt4d($iData, 0);
+	//			var_dump($bcSize);
+
+				// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
+				$bcWidth = self::_GetInt2d($iData, 4);
+	//			var_dump($bcWidth);
+
+				// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
+				$bcHeight = self::_GetInt2d($iData, 6);
+	//			var_dump($bcHeight);
+				$ih = imagecreatetruecolor($bcWidth, $bcHeight);
+
+				// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
+
+				// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
+				$bcBitCount = self::_GetInt2d($iData, 10);
+	//			var_dump($bcBitCount);
+
+				$rgbString = substr($iData, 12);
+				$rgbTriples = array();
+				while (strlen($rgbString) > 0) {
+					$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
+					$rgbString = substr($rgbString, 3);
+				}
+				$x = 0;
+				$y = 0;
+				foreach ($rgbTriples as $i => $rgbTriple) {
+					$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
+					imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
+					$x = ($x + 1) % $bcWidth;
+					$y = $y + floor(($x + 1) / $bcWidth);
+				}
+				//imagepng($ih, 'image.png');
 
-			$drawing = new PHPExcel_Worksheet_Drawing();
-			$drawing->setPath($filename);
-			$drawing->setWorksheet($this->_phpSheet);
+				$drawing = new PHPExcel_Worksheet_Drawing();
+				$drawing->setPath($filename);
+				$drawing->setWorksheet($this->_phpSheet);
 
-			break;
+				break;
 
-		case 0x02: // Windows metafile or Macintosh PICT format
-		case 0x0e: // native format
-		default;
-			break;
+			case 0x02: // Windows metafile or Macintosh PICT format
+			case 0x0e: // native format
+			default;
+				break;
 
 		}
 
@@ -5100,132 +5100,132 @@ 
 			$space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis
 
 			switch ($token['name']) {
-			case 'tAdd': // addition
-			case 'tConcat': // addition
-			case 'tDiv': // division
-			case 'tEQ': // equality
-			case 'tGE': // greater than or equal
-			case 'tGT': // greater than
-			case 'tIsect': // intersection
-			case 'tLE': // less than or equal
-			case 'tList': // less than or equal
-			case 'tLT': // less than
-			case 'tMul': // multiplication
-			case 'tNE': // multiplication
-			case 'tPower': // power
-			case 'tRange': // range
-			case 'tSub': // subtraction
-				$op2 = array_pop($formulaStrings);
-				$op1 = array_pop($formulaStrings);
-				$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
-				unset($space0, $space1);
-				break;
-			case 'tUplus': // unary plus
-			case 'tUminus': // unary minus
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$space1$space0{$token['data']}$op";
-				unset($space0, $space1);
-				break;
-			case 'tPercent': // percent sign
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$op$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tAttrVolatile': // indicates volatile function
-			case 'tAttrIf':
-			case 'tAttrSkip':
-			case 'tAttrChoose':
-				// token is only important for Excel formula evaluator
-				// do nothing
-				break;
-			case 'tAttrSpace': // space / carriage return
-				// space will be used when next token arrives, do not alter formulaString stack
-				switch ($token['data']['spacetype']) {
-				case 'type0':
-					$space0 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type1':
-					$space1 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type2':
-					$space2 = str_repeat(' ', $token['data']['spacecount']);
+				case 'tAdd': // addition
+				case 'tConcat': // addition
+				case 'tDiv': // division
+				case 'tEQ': // equality
+				case 'tGE': // greater than or equal
+				case 'tGT': // greater than
+				case 'tIsect': // intersection
+				case 'tLE': // less than or equal
+				case 'tList': // less than or equal
+				case 'tLT': // less than
+				case 'tMul': // multiplication
+				case 'tNE': // multiplication
+				case 'tPower': // power
+				case 'tRange': // range
+				case 'tSub': // subtraction
+					$op2 = array_pop($formulaStrings);
+					$op1 = array_pop($formulaStrings);
+					$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
+					unset($space0, $space1);
 					break;
-				case 'type3':
-					$space3 = str_repeat("\n", $token['data']['spacecount']);
+				case 'tUplus': // unary plus
+				case 'tUminus': // unary minus
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "$space1$space0{$token['data']}$op";
+					unset($space0, $space1);
 					break;
-				case 'type4':
-					$space4 = str_repeat(' ', $token['data']['spacecount']);
+				case 'tPercent': // percent sign
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "$op$space1$space0{$token['data']}";
+					unset($space0, $space1);
 					break;
-				case 'type5':
-					$space5 = str_repeat("\n", $token['data']['spacecount']);
+				case 'tAttrVolatile': // indicates volatile function
+				case 'tAttrIf':
+				case 'tAttrSkip':
+				case 'tAttrChoose':
+					// token is only important for Excel formula evaluator
+					// do nothing
 					break;
-				}
-				break;
-			case 'tAttrSum': // SUM function with one parameter
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "{$space1}{$space0}SUM($op)";
-				unset($space0, $space1);
-				break;
-			case 'tFunc': // function with fixed number of arguments
-			case 'tFuncV': // function with variable number of arguments
-				if ($token['data']['function'] != '') {
-					// normal function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args']; ++$i) {
-						$ops[] = array_pop($formulaStrings);
+				case 'tAttrSpace': // space / carriage return
+					// space will be used when next token arrives, do not alter formulaString stack
+					switch ($token['data']['spacetype']) {
+						case 'type0':
+							$space0 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type1':
+							$space1 = str_repeat("\n", $token['data']['spacecount']);
+							break;
+						case 'type2':
+							$space2 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type3':
+							$space3 = str_repeat("\n", $token['data']['spacecount']);
+							break;
+						case 'type4':
+							$space4 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type5':
+							$space5 = str_repeat("\n", $token['data']['spacecount']);
+							break;
 					}
-					$ops = array_reverse($ops);
-					$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+				break;
+				case 'tAttrSum': // SUM function with one parameter
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "{$space1}{$space0}SUM($op)";
 					unset($space0, $space1);
-				} else {
-					// add-in function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
-						$ops[] = array_pop($formulaStrings);
+					break;
+				case 'tFunc': // function with fixed number of arguments
+				case 'tFuncV': // function with variable number of arguments
+					if ($token['data']['function'] != '') {
+						// normal function
+						$ops = array(); // array of operators
+						for ($i = 0; $i < $token['data']['args']; ++$i) {
+							$ops[] = array_pop($formulaStrings);
+						}
+						$ops = array_reverse($ops);
+						$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+						unset($space0, $space1);
+					} else {
+						// add-in function
+						$ops = array(); // array of operators
+						for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
+							$ops[] = array_pop($formulaStrings);
+						}
+						$ops = array_reverse($ops);
+						$function = array_pop($formulaStrings);
+						$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+						unset($space0, $space1);
 					}
-					$ops = array_reverse($ops);
-					$function = array_pop($formulaStrings);
-					$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+					break;
+				case 'tParen': // parenthesis
+					$expression = array_pop($formulaStrings);
+					$formulaStrings[] = "$space3$space2($expression$space5$space4)";
+					unset($space2, $space3, $space4, $space5);
+					break;
+				case 'tArray': // array constant
+					$constantArray = self::_readBIFF8ConstantArray($additionalData);
+					$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+					$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
 					unset($space0, $space1);
-				}
-				break;
-			case 'tParen': // parenthesis
-				$expression = array_pop($formulaStrings);
-				$formulaStrings[] = "$space3$space2($expression$space5$space4)";
-				unset($space2, $space3, $space4, $space5);
-				break;
-			case 'tArray': // array constant
-				$constantArray = self::_readBIFF8ConstantArray($additionalData);
-				$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
-				$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
-				unset($space0, $space1);
-				break;
-			case 'tMemArea':
-				// bite off chunk of additional data
-				$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
-				$additionalData = substr($additionalData, $cellRangeAddressList['size']);
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tArea': // cell range address
-			case 'tBool': // boolean
-			case 'tErr': // error code
-			case 'tInt': // integer
-			case 'tMemErr':
-			case 'tMemFunc':
-			case 'tMissArg':
-			case 'tName':
-			case 'tNameX':
-			case 'tNum': // number
-			case 'tRef': // single cell reference
-			case 'tRef3d': // 3d cell reference
-			case 'tArea3d': // 3d cell range reference
-			case 'tRefN':
-			case 'tAreaN':
-			case 'tStr': // string
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
+					break;
+				case 'tMemArea':
+					// bite off chunk of additional data
+					$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
+					$additionalData = substr($additionalData, $cellRangeAddressList['size']);
+					$formulaStrings[] = "$space1$space0{$token['data']}";
+					unset($space0, $space1);
+					break;
+				case 'tArea': // cell range address
+				case 'tBool': // boolean
+				case 'tErr': // error code
+				case 'tInt': // integer
+				case 'tMemErr':
+				case 'tMemFunc':
+				case 'tMissArg':
+				case 'tName':
+				case 'tNameX':
+				case 'tNum': // number
+				case 'tRef': // single cell reference
+				case 'tRef3d': // 3d cell reference
+				case 'tArea3d': // 3d cell range reference
+				case 'tRefN':
+				case 'tAreaN':
+				case 'tStr': // string
+					$formulaStrings[] = "$space1$space0{$token['data']}";
+					unset($space0, $space1);
+					break;
 			}
 		}
 		$formulaString = $formulaStrings[0];
@@ -5253,546 +5253,546 @@ 
 		$name = false; // initialize token name
 
 		switch ($id) {
-		case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
-		case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
-		case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
-		case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
-		case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
-		case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
-		case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
-		case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
-		case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
-		case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
-		case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
-		case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
-		case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
-		case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
-		case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
-		case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
-		case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
-		case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
-		case 0x15:	//	parenthesis
-			$name  = 'tParen';
-			$size  = 1;
-			$data = null;
-			break;
-		case 0x16:	//	missing argument
-			$name = 'tMissArg';
-			$size = 1;
-			$data = '';
-			break;
-		case 0x17:	//	string
-			$name = 'tStr';
-			// offset: 1; size: var; Unicode string, 8-bit string length
-			$string = self::_readUnicodeStringShort(substr($formulaData, 1));
-			$size = 1 + $string['size'];
-			$data = self::_UTF8toExcelDoubleQuoted($string['value']);
-			break;
-		case 0x19:	//	Special attribute
-			// offset: 1; size: 1; attribute type flags:
-			switch (ord($formulaData[1])) {
-			case 0x01:
-				$name = 'tAttrVolatile';
-				$size = 4;
+			case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
+			case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
+			case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
+			case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
+			case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
+			case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
+			case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
+			case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
+			case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
+			case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
+			case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
+			case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
+			case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
+			case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
+			case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
+			case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
+			case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
+			case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
+			case 0x15:	//	parenthesis
+				$name  = 'tParen';
+				$size  = 1;
 				$data = null;
 				break;
-			case 0x02:
-				$name = 'tAttrIf';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x04:
-				$name = 'tAttrChoose';
-				// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
-				$nc = self::_GetInt2d($formulaData, 2);
-				// offset: 4; size: 2 * $nc
-				// offset: 4 + 2 * $nc; size: 2
-				$size = 2 * $nc + 6;
-				$data = null;
+			case 0x16:	//	missing argument
+				$name = 'tMissArg';
+				$size = 1;
+				$data = '';
 				break;
-			case 0x08:
-				$name = 'tAttrSkip';
-				$size = 4;
-				$data = null;
+			case 0x17:	//	string
+				$name = 'tStr';
+				// offset: 1; size: var; Unicode string, 8-bit string length
+				$string = self::_readUnicodeStringShort(substr($formulaData, 1));
+				$size = 1 + $string['size'];
+				$data = self::_UTF8toExcelDoubleQuoted($string['value']);
 				break;
-			case 0x10:
-				$name = 'tAttrSum';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x40:
-			case 0x41:
-				$name = 'tAttrSpace';
-				$size = 4;
-				// offset: 2; size: 2; space type and position
-				switch (ord($formulaData[2])) {
-				case 0x00:
-					$spacetype = 'type0';
-					break;
-				case 0x01:
-					$spacetype = 'type1';
-					break;
-				case 0x02:
-					$spacetype = 'type2';
-					break;
-				case 0x03:
-					$spacetype = 'type3';
-					break;
-				case 0x04:
-					$spacetype = 'type4';
-					break;
-				case 0x05:
-					$spacetype = 'type5';
-					break;
-				default:
-					throw new Exception('Unrecognized space type in tAttrSpace token');
-					break;
-				}
-				// offset: 3; size: 1; number of inserted spaces/carriage returns
-				$spacecount = ord($formulaData[3]);
+			case 0x19:	//	Special attribute
+				// offset: 1; size: 1; attribute type flags:
+				switch (ord($formulaData[1])) {
+					case 0x01:
+						$name = 'tAttrVolatile';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x02:
+						$name = 'tAttrIf';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x04:
+						$name = 'tAttrChoose';
+						// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
+						$nc = self::_GetInt2d($formulaData, 2);
+						// offset: 4; size: 2 * $nc
+						// offset: 4 + 2 * $nc; size: 2
+						$size = 2 * $nc + 6;
+						$data = null;
+						break;
+					case 0x08:
+						$name = 'tAttrSkip';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x10:
+						$name = 'tAttrSum';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x40:
+					case 0x41:
+						$name = 'tAttrSpace';
+						$size = 4;
+						// offset: 2; size: 2; space type and position
+						switch (ord($formulaData[2])) {
+							case 0x00:
+								$spacetype = 'type0';
+								break;
+							case 0x01:
+								$spacetype = 'type1';
+								break;
+							case 0x02:
+								$spacetype = 'type2';
+								break;
+							case 0x03:
+								$spacetype = 'type3';
+								break;
+							case 0x04:
+								$spacetype = 'type4';
+								break;
+							case 0x05:
+								$spacetype = 'type5';
+								break;
+							default:
+								throw new Exception('Unrecognized space type in tAttrSpace token');
+								break;
+						}
+					// offset: 3; size: 1; number of inserted spaces/carriage returns
+					$spacecount = ord($formulaData[3]);
 
-				$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
-				break;
+					$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
+					break;
 			default:
 				throw new Exception('Unrecognized attribute flag in tAttr token');
 				break;
 			}
 			break;
-		case 0x1C:	//	error code
-			// offset: 1; size: 1; error code
-			$name = 'tErr';
-			$size = 2;
-			$data = self::_mapErrorCode(ord($formulaData[1]));
-			break;
-		case 0x1D:	//	boolean
-			// offset: 1; size: 1; 0 = false, 1 = true;
-			$name = 'tBool';
-			$size = 2;
-			$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
-			break;
-		case 0x1E:	//	integer
-			// offset: 1; size: 2; unsigned 16-bit integer
-			$name = 'tInt';
-			$size = 3;
-			$data = self::_GetInt2d($formulaData, 1);
-			break;
-		case 0x1F:	//	number
-			// offset: 1; size: 8;
-			$name = 'tNum';
-			$size = 9;
-			$data = self::_extractNumber(substr($formulaData, 1));
-			$data = str_replace(',', '.', (string)$data); // in case non-English locale
-			break;
-		case 0x20:	//	array constant
-		case 0x40:
-		case 0x60:
-			// offset: 1; size: 7; not used
-			$name = 'tArray';
-			$size = 8;
-			$data = null;
-			break;
-		case 0x21:	//	function with fixed number of arguments
-		case 0x41:
-		case 0x61:
-			$name = 'tFunc';
-			$size = 3;
-			// offset: 1; size: 2; index to built-in sheet function
-			switch (self::_GetInt2d($formulaData, 1)) {
-			case   2: $function = 'ISNA'; 			$args = 1; 	break;
-			case   3: $function = 'ISERROR'; 		$args = 1; 	break;
-			case  10: $function = 'NA'; 			$args = 0; 	break;
-			case  15: $function = 'SIN'; 			$args = 1; 	break;
-			case  16: $function = 'COS'; 			$args = 1; 	break;
-			case  17: $function = 'TAN'; 			$args = 1; 	break;
-			case  18: $function = 'ATAN'; 			$args = 1; 	break;
-			case  19: $function = 'PI'; 			$args = 0; 	break;
-			case  20: $function = 'SQRT'; 			$args = 1; 	break;
-			case  21: $function = 'EXP'; 			$args = 1; 	break;
-			case  22: $function = 'LN'; 			$args = 1; 	break;
-			case  23: $function = 'LOG10'; 			$args = 1; 	break;
-			case  24: $function = 'ABS'; 			$args = 1; 	break;
-			case  25: $function = 'INT'; 			$args = 1; 	break;
-			case  26: $function = 'SIGN'; 			$args = 1; 	break;
-			case  27: $function = 'ROUND'; 			$args = 2; 	break;
-			case  30: $function = 'REPT'; 			$args = 2; 	break;
-			case  31: $function = 'MID'; 			$args = 3; 	break;
-			case  32: $function = 'LEN'; 			$args = 1; 	break;
-			case  33: $function = 'VALUE'; 			$args = 1; 	break;
-			case  34: $function = 'TRUE'; 			$args = 0; 	break;
-			case  35: $function = 'FALSE'; 			$args = 0; 	break;
-			case  38: $function = 'NOT'; 			$args = 1; 	break;
-			case  39: $function = 'MOD'; 			$args = 2;	break;
-			case  40: $function = 'DCOUNT'; 		$args = 3;	break;
-			case  41: $function = 'DSUM'; 			$args = 3;	break;
-			case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
-			case  43: $function = 'DMIN'; 			$args = 3;	break;
-			case  44: $function = 'DMAX'; 			$args = 3;	break;
-			case  45: $function = 'DSTDEV'; 		$args = 3;	break;
-			case  48: $function = 'TEXT'; 			$args = 2;	break;
-			case  61: $function = 'MIRR'; 			$args = 3;	break;
-			case  63: $function = 'RAND'; 			$args = 0;	break;
-			case  65: $function = 'DATE'; 			$args = 3;	break;
-			case  66: $function = 'TIME'; 			$args = 3;	break;
-			case  67: $function = 'DAY'; 			$args = 1;	break;
-			case  68: $function = 'MONTH'; 			$args = 1;	break;
-			case  69: $function = 'YEAR'; 			$args = 1;	break;
-			case  71: $function = 'HOUR'; 			$args = 1;	break;
-			case  72: $function = 'MINUTE'; 		$args = 1;	break;
-			case  73: $function = 'SECOND'; 		$args = 1;	break;
-			case  74: $function = 'NOW'; 			$args = 0;	break;
-			case  75: $function = 'AREAS'; 			$args = 1;	break;
-			case  76: $function = 'ROWS'; 			$args = 1;	break;
-			case  77: $function = 'COLUMNS'; 		$args = 1;	break;
-			case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
-			case  86: $function = 'TYPE'; 			$args = 1;	break;
-			case  97: $function = 'ATAN2'; 			$args = 2;	break;
-			case  98: $function = 'ASIN'; 			$args = 1;	break;
-			case  99: $function = 'ACOS'; 			$args = 1;	break;
-			case 105: $function = 'ISREF'; 			$args = 1;	break;
-			case 111: $function = 'CHAR'; 			$args = 1;	break;
-			case 112: $function = 'LOWER'; 			$args = 1;	break;
-			case 113: $function = 'UPPER'; 			$args = 1;	break;
-			case 114: $function = 'PROPER'; 		$args = 1;	break;
-			case 117: $function = 'EXACT'; 			$args = 2;	break;
-			case 118: $function = 'TRIM'; 			$args = 1;	break;
-			case 119: $function = 'REPLACE'; 		$args = 4;	break;
-			case 121: $function = 'CODE'; 			$args = 1;	break;
-			case 126: $function = 'ISERR'; 			$args = 1;	break;
-			case 127: $function = 'ISTEXT'; 		$args = 1;	break;
-			case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
-			case 129: $function = 'ISBLANK'; 		$args = 1;	break;
-			case 130: $function = 'T'; 				$args = 1;	break;
-			case 131: $function = 'N'; 				$args = 1;	break;
-			case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
-			case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
-			case 142: $function = 'SLN'; 			$args = 3;	break;
-			case 143: $function = 'SYD'; 			$args = 4;	break;
-			case 162: $function = 'CLEAN'; 			$args = 1;	break;
-			case 163: $function = 'MDETERM'; 		$args = 1;	break;
-			case 164: $function = 'MINVERSE'; 		$args = 1;	break;
-			case 165: $function = 'MMULT'; 			$args = 2;	break;
-			case 184: $function = 'FACT'; 			$args = 1;	break;
-			case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
-			case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
-			case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
-			case 196: $function = 'DVARP'; 			$args = 3;	break;
-			case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
-			case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
-			case 207: $function = 'REPLACEB'; 		$args = 4;	break;
-			case 210: $function = 'MIDB'; 			$args = 3;	break;
-			case 211: $function = 'LENB'; 			$args = 1;	break;
-			case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
-			case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
-			case 214: $function = 'ASC'; 			$args = 1;	break;
-			case 215: $function = 'DBCS'; 			$args = 1;	break;
-			case 221: $function = 'TODAY'; 			$args = 0;	break;
-			case 229: $function = 'SINH'; 			$args = 1;	break;
-			case 230: $function = 'COSH'; 			$args = 1;	break;
-			case 231: $function = 'TANH'; 			$args = 1;	break;
-			case 232: $function = 'ASINH'; 			$args = 1;	break;
-			case 233: $function = 'ACOSH'; 			$args = 1;	break;
-			case 234: $function = 'ATANH'; 			$args = 1;	break;
-			case 235: $function = 'DGET'; 			$args = 3;	break;
-			case 244: $function = 'INFO'; 			$args = 1;	break;
-			case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
-			case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
-			case 271: $function = 'GAMMALN'; 		$args = 1;	break;
-			case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
-			case 274: $function = 'CHIDIST'; 		$args = 2;	break;
-			case 275: $function = 'CHIINV'; 		$args = 2;	break;
-			case 276: $function = 'COMBIN'; 		$args = 2;	break;
-			case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
-			case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
-			case 279: $function = 'EVEN'; 			$args = 1;	break;
-			case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
-			case 281: $function = 'FDIST'; 			$args = 3;	break;
-			case 282: $function = 'FINV'; 			$args = 3;	break;
-			case 283: $function = 'FISHER'; 		$args = 1;	break;
-			case 284: $function = 'FISHERINV'; 		$args = 1;	break;
-			case 285: $function = 'FLOOR'; 			$args = 2;	break;
-			case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
-			case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
-			case 288: $function = 'CEILING'; 		$args = 2;	break;
-			case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
-			case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
-			case 291: $function = 'LOGINV';			$args = 3;	break;
-			case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
-			case 293: $function = 'NORMDIST';		$args = 4;	break;
-			case 294: $function = 'NORMSDIST';		$args = 1;	break;
-			case 295: $function = 'NORMINV';		$args = 3;	break;
-			case 296: $function = 'NORMSINV';		$args = 1;	break;
-			case 297: $function = 'STANDARDIZE';	$args = 3;	break;
-			case 298: $function = 'ODD';			$args = 1;	break;
-			case 299: $function = 'PERMUT';			$args = 2;	break;
-			case 300: $function = 'POISSON';		$args = 3;	break;
-			case 301: $function = 'TDIST';			$args = 3;	break;
-			case 302: $function = 'WEIBULL';		$args = 4;	break;
-			case 303: $function = 'SUMXMY2';		$args = 2;	break;
-			case 304: $function = 'SUMX2MY2';		$args = 2;	break;
-			case 305: $function = 'SUMX2PY2';		$args = 2;	break;
-			case 306: $function = 'CHITEST';		$args = 2;	break;
-			case 307: $function = 'CORREL';			$args = 2;	break;
-			case 308: $function = 'COVAR';			$args = 2;	break;
-			case 309: $function = 'FORECAST';		$args = 3;	break;
-			case 310: $function = 'FTEST';			$args = 2;	break;
-			case 311: $function = 'INTERCEPT';		$args = 2;	break;
-			case 312: $function = 'PEARSON';		$args = 2;	break;
-			case 313: $function = 'RSQ';			$args = 2;	break;
-			case 314: $function = 'STEYX';			$args = 2;	break;
-			case 315: $function = 'SLOPE';			$args = 2;	break;
-			case 316: $function = 'TTEST';			$args = 4;	break;
-			case 325: $function = 'LARGE';			$args = 2;	break;
-			case 326: $function = 'SMALL';			$args = 2;	break;
-			case 327: $function = 'QUARTILE';		$args = 2;	break;
-			case 328: $function = 'PERCENTILE';		$args = 2;	break;
-			case 331: $function = 'TRIMMEAN';		$args = 2;	break;
-			case 332: $function = 'TINV';			$args = 2;	break;
-			case 337: $function = 'POWER';			$args = 2;	break;
-			case 342: $function = 'RADIANS';		$args = 1;	break;
-			case 343: $function = 'DEGREES';		$args = 1;	break;
-			case 346: $function = 'COUNTIF';		$args = 2;	break;
-			case 347: $function = 'COUNTBLANK';		$args = 1;	break;
-			case 350: $function = 'ISPMT';			$args = 4;	break;
-			case 351: $function = 'DATEDIF';		$args = 3;	break;
-			case 352: $function = 'DATESTRING';		$args = 1;	break;
-			case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
-			case 360: $function = 'PHONETIC';		$args = 1;	break;
-			case 368: $function = 'BAHTTEXT';		$args = 1;	break;
-			default:
-				throw new Exception('Unrecognized function in formula');
+			case 0x1C:	//	error code
+				// offset: 1; size: 1; error code
+				$name = 'tErr';
+				$size = 2;
+				$data = self::_mapErrorCode(ord($formulaData[1]));
 				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x22:	//	function with variable number of arguments
-		case 0x42:
-		case 0x62:
-			$name = 'tFuncV';
-			$size = 4;
-			// offset: 1; size: 1; number of arguments
-			$args = ord($formulaData[1]);
-			// offset: 2: size: 2; index to built-in sheet function
-			$index = self::_GetInt2d($formulaData, 2);
-			switch ($index) {
-			case   0: $function = 'COUNT';			break;
-			case   1: $function = 'IF';				break;
-			case   4: $function = 'SUM';			break;
-			case   5: $function = 'AVERAGE';		break;
-			case   6: $function = 'MIN';			break;
-			case   7: $function = 'MAX';			break;
-			case   8: $function = 'ROW';			break;
-			case   9: $function = 'COLUMN';			break;
-			case  11: $function = 'NPV';			break;
-			case  12: $function = 'STDEV';			break;
-			case  13: $function = 'DOLLAR';			break;
-			case  14: $function = 'FIXED';			break;
-			case  28: $function = 'LOOKUP';			break;
-			case  29: $function = 'INDEX';			break;
-			case  36: $function = 'AND';			break;
-			case  37: $function = 'OR';				break;
-			case  46: $function = 'VAR';			break;
-			case  49: $function = 'LINEST';			break;
-			case  50: $function = 'TREND';			break;
-			case  51: $function = 'LOGEST';			break;
-			case  52: $function = 'GROWTH';			break;
-			case  56: $function = 'PV';				break;
-			case  57: $function = 'FV';				break;
-			case  58: $function = 'NPER';			break;
-			case  59: $function = 'PMT';			break;
-			case  60: $function = 'RATE';			break;
-			case  62: $function = 'IRR';			break;
-			case  64: $function = 'MATCH';			break;
-			case  70: $function = 'WEEKDAY';		break;
-			case  78: $function = 'OFFSET';			break;
-			case  82: $function = 'SEARCH';			break;
-			case 100: $function = 'CHOOSE';			break;
-			case 101: $function = 'HLOOKUP';		break;
-			case 102: $function = 'VLOOKUP';		break;
-			case 109: $function = 'LOG';			break;
-			case 115: $function = 'LEFT';			break;
-			case 116: $function = 'RIGHT';			break;
-			case 120: $function = 'SUBSTITUTE';		break;
-			case 124: $function = 'FIND';			break;
-			case 125: $function = 'CELL';			break;
-			case 144: $function = 'DDB';			break;
-			case 148: $function = 'INDIRECT';		break;
-			case 167: $function = 'IPMT';			break;
-			case 168: $function = 'PPMT';			break;
-			case 169: $function = 'COUNTA';			break;
-			case 183: $function = 'PRODUCT';		break;
-			case 193: $function = 'STDEVP';			break;
-			case 194: $function = 'VARP';			break;
-			case 197: $function = 'TRUNC';			break;
-			case 204: $function = 'USDOLLAR';		break;
-			case 205: $function = 'FINDB';			break;
-			case 206: $function = 'SEARCHB';		break;
-			case 208: $function = 'LEFTB';			break;
-			case 209: $function = 'RIGHTB';			break;
-			case 216: $function = 'RANK';			break;
-			case 219: $function = 'ADDRESS';		break;
-			case 220: $function = 'DAYS360';		break;
-			case 222: $function = 'VDB';			break;
-			case 227: $function = 'MEDIAN';			break;
-			case 228: $function = 'SUMPRODUCT';		break;
-			case 247: $function = 'DB';				break;
-			case 255: $function = '';				break;
-			case 269: $function = 'AVEDEV';			break;
-			case 270: $function = 'BETADIST';		break;
-			case 272: $function = 'BETAINV';		break;
-			case 317: $function = 'PROB';			break;
-			case 318: $function = 'DEVSQ';			break;
-			case 319: $function = 'GEOMEAN';		break;
-			case 320: $function = 'HARMEAN';		break;
-			case 321: $function = 'SUMSQ';			break;
-			case 322: $function = 'KURT';			break;
-			case 323: $function = 'SKEW';			break;
-			case 324: $function = 'ZTEST';			break;
-			case 329: $function = 'PERCENTRANK';	break;
-			case 330: $function = 'MODE';			break;
-			case 336: $function = 'CONCATENATE';	break;
-			case 344: $function = 'SUBTOTAL';		break;
-			case 345: $function = 'SUMIF';			break;
-			case 354: $function = 'ROMAN';			break;
-			case 358: $function = 'GETPIVOTDATA';	break;
-			case 359: $function = 'HYPERLINK';		break;
-			case 361: $function = 'AVERAGEA';		break;
-			case 362: $function = 'MAXA';			break;
-			case 363: $function = 'MINA';			break;
-			case 364: $function = 'STDEVPA';		break;
-			case 365: $function = 'VARPA';			break;
-			case 366: $function = 'STDEVA';			break;
-			case 367: $function = 'VARA';			break;
-			default:
-				throw new Exception('Unrecognized function in formula');
+			case 0x1D:	//	boolean
+				// offset: 1; size: 1; 0 = false, 1 = true;
+				$name = 'tBool';
+				$size = 2;
+				$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
 				break;
-			}
+			case 0x1E:	//	integer
+				// offset: 1; size: 2; unsigned 16-bit integer
+				$name = 'tInt';
+				$size = 3;
+				$data = self::_GetInt2d($formulaData, 1);
+				break;
+			case 0x1F:	//	number
+				// offset: 1; size: 8;
+				$name = 'tNum';
+				$size = 9;
+				$data = self::_extractNumber(substr($formulaData, 1));
+				$data = str_replace(',', '.', (string)$data); // in case non-English locale
+				break;
+			case 0x20:	//	array constant
+			case 0x40:
+			case 0x60:
+				// offset: 1; size: 7; not used
+				$name = 'tArray';
+				$size = 8;
+				$data = null;
+				break;
+			case 0x21:	//	function with fixed number of arguments
+			case 0x41:
+			case 0x61:
+				$name = 'tFunc';
+				$size = 3;
+				// offset: 1; size: 2; index to built-in sheet function
+				switch (self::_GetInt2d($formulaData, 1)) {
+					case   2: $function = 'ISNA'; 			$args = 1; 	break;
+					case   3: $function = 'ISERROR'; 		$args = 1; 	break;
+					case  10: $function = 'NA'; 			$args = 0; 	break;
+					case  15: $function = 'SIN'; 			$args = 1; 	break;
+					case  16: $function = 'COS'; 			$args = 1; 	break;
+					case  17: $function = 'TAN'; 			$args = 1; 	break;
+					case  18: $function = 'ATAN'; 			$args = 1; 	break;
+					case  19: $function = 'PI'; 			$args = 0; 	break;
+					case  20: $function = 'SQRT'; 			$args = 1; 	break;
+					case  21: $function = 'EXP'; 			$args = 1; 	break;
+					case  22: $function = 'LN'; 			$args = 1; 	break;
+					case  23: $function = 'LOG10'; 			$args = 1; 	break;
+					case  24: $function = 'ABS'; 			$args = 1; 	break;
+					case  25: $function = 'INT'; 			$args = 1; 	break;
+					case  26: $function = 'SIGN'; 			$args = 1; 	break;
+					case  27: $function = 'ROUND'; 			$args = 2; 	break;
+					case  30: $function = 'REPT'; 			$args = 2; 	break;
+					case  31: $function = 'MID'; 			$args = 3; 	break;
+					case  32: $function = 'LEN'; 			$args = 1; 	break;
+					case  33: $function = 'VALUE'; 			$args = 1; 	break;
+					case  34: $function = 'TRUE'; 			$args = 0; 	break;
+					case  35: $function = 'FALSE'; 			$args = 0; 	break;
+					case  38: $function = 'NOT'; 			$args = 1; 	break;
+					case  39: $function = 'MOD'; 			$args = 2;	break;
+					case  40: $function = 'DCOUNT'; 		$args = 3;	break;
+					case  41: $function = 'DSUM'; 			$args = 3;	break;
+					case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
+					case  43: $function = 'DMIN'; 			$args = 3;	break;
+					case  44: $function = 'DMAX'; 			$args = 3;	break;
+					case  45: $function = 'DSTDEV'; 		$args = 3;	break;
+					case  48: $function = 'TEXT'; 			$args = 2;	break;
+					case  61: $function = 'MIRR'; 			$args = 3;	break;
+					case  63: $function = 'RAND'; 			$args = 0;	break;
+					case  65: $function = 'DATE'; 			$args = 3;	break;
+					case  66: $function = 'TIME'; 			$args = 3;	break;
+					case  67: $function = 'DAY'; 			$args = 1;	break;
+					case  68: $function = 'MONTH'; 			$args = 1;	break;
+					case  69: $function = 'YEAR'; 			$args = 1;	break;
+					case  71: $function = 'HOUR'; 			$args = 1;	break;
+					case  72: $function = 'MINUTE'; 		$args = 1;	break;
+					case  73: $function = 'SECOND'; 		$args = 1;	break;
+					case  74: $function = 'NOW'; 			$args = 0;	break;
+					case  75: $function = 'AREAS'; 			$args = 1;	break;
+					case  76: $function = 'ROWS'; 			$args = 1;	break;
+					case  77: $function = 'COLUMNS'; 		$args = 1;	break;
+					case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
+					case  86: $function = 'TYPE'; 			$args = 1;	break;
+					case  97: $function = 'ATAN2'; 			$args = 2;	break;
+					case  98: $function = 'ASIN'; 			$args = 1;	break;
+					case  99: $function = 'ACOS'; 			$args = 1;	break;
+					case 105: $function = 'ISREF'; 			$args = 1;	break;
+					case 111: $function = 'CHAR'; 			$args = 1;	break;
+					case 112: $function = 'LOWER'; 			$args = 1;	break;
+					case 113: $function = 'UPPER'; 			$args = 1;	break;
+					case 114: $function = 'PROPER'; 		$args = 1;	break;
+					case 117: $function = 'EXACT'; 			$args = 2;	break;
+					case 118: $function = 'TRIM'; 			$args = 1;	break;
+					case 119: $function = 'REPLACE'; 		$args = 4;	break;
+					case 121: $function = 'CODE'; 			$args = 1;	break;
+					case 126: $function = 'ISERR'; 			$args = 1;	break;
+					case 127: $function = 'ISTEXT'; 		$args = 1;	break;
+					case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
+					case 129: $function = 'ISBLANK'; 		$args = 1;	break;
+					case 130: $function = 'T'; 				$args = 1;	break;
+					case 131: $function = 'N'; 				$args = 1;	break;
+					case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
+					case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
+					case 142: $function = 'SLN'; 			$args = 3;	break;
+					case 143: $function = 'SYD'; 			$args = 4;	break;
+					case 162: $function = 'CLEAN'; 			$args = 1;	break;
+					case 163: $function = 'MDETERM'; 		$args = 1;	break;
+					case 164: $function = 'MINVERSE'; 		$args = 1;	break;
+					case 165: $function = 'MMULT'; 			$args = 2;	break;
+					case 184: $function = 'FACT'; 			$args = 1;	break;
+					case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
+					case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
+					case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
+					case 196: $function = 'DVARP'; 			$args = 3;	break;
+					case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
+					case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
+					case 207: $function = 'REPLACEB'; 		$args = 4;	break;
+					case 210: $function = 'MIDB'; 			$args = 3;	break;
+					case 211: $function = 'LENB'; 			$args = 1;	break;
+					case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
+					case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
+					case 214: $function = 'ASC'; 			$args = 1;	break;
+					case 215: $function = 'DBCS'; 			$args = 1;	break;
+					case 221: $function = 'TODAY'; 			$args = 0;	break;
+					case 229: $function = 'SINH'; 			$args = 1;	break;
+					case 230: $function = 'COSH'; 			$args = 1;	break;
+					case 231: $function = 'TANH'; 			$args = 1;	break;
+					case 232: $function = 'ASINH'; 			$args = 1;	break;
+					case 233: $function = 'ACOSH'; 			$args = 1;	break;
+					case 234: $function = 'ATANH'; 			$args = 1;	break;
+					case 235: $function = 'DGET'; 			$args = 3;	break;
+					case 244: $function = 'INFO'; 			$args = 1;	break;
+					case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
+					case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
+					case 271: $function = 'GAMMALN'; 		$args = 1;	break;
+					case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
+					case 274: $function = 'CHIDIST'; 		$args = 2;	break;
+					case 275: $function = 'CHIINV'; 		$args = 2;	break;
+					case 276: $function = 'COMBIN'; 		$args = 2;	break;
+					case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
+					case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
+					case 279: $function = 'EVEN'; 			$args = 1;	break;
+					case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
+					case 281: $function = 'FDIST'; 			$args = 3;	break;
+					case 282: $function = 'FINV'; 			$args = 3;	break;
+					case 283: $function = 'FISHER'; 		$args = 1;	break;
+					case 284: $function = 'FISHERINV'; 		$args = 1;	break;
+					case 285: $function = 'FLOOR'; 			$args = 2;	break;
+					case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
+					case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
+					case 288: $function = 'CEILING'; 		$args = 2;	break;
+					case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
+					case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
+					case 291: $function = 'LOGINV';			$args = 3;	break;
+					case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
+					case 293: $function = 'NORMDIST';		$args = 4;	break;
+					case 294: $function = 'NORMSDIST';		$args = 1;	break;
+					case 295: $function = 'NORMINV';		$args = 3;	break;
+					case 296: $function = 'NORMSINV';		$args = 1;	break;
+					case 297: $function = 'STANDARDIZE';	$args = 3;	break;
+					case 298: $function = 'ODD';			$args = 1;	break;
+					case 299: $function = 'PERMUT';			$args = 2;	break;
+					case 300: $function = 'POISSON';		$args = 3;	break;
+					case 301: $function = 'TDIST';			$args = 3;	break;
+					case 302: $function = 'WEIBULL';		$args = 4;	break;
+					case 303: $function = 'SUMXMY2';		$args = 2;	break;
+					case 304: $function = 'SUMX2MY2';		$args = 2;	break;
+					case 305: $function = 'SUMX2PY2';		$args = 2;	break;
+					case 306: $function = 'CHITEST';		$args = 2;	break;
+					case 307: $function = 'CORREL';			$args = 2;	break;
+					case 308: $function = 'COVAR';			$args = 2;	break;
+					case 309: $function = 'FORECAST';		$args = 3;	break;
+					case 310: $function = 'FTEST';			$args = 2;	break;
+					case 311: $function = 'INTERCEPT';		$args = 2;	break;
+					case 312: $function = 'PEARSON';		$args = 2;	break;
+					case 313: $function = 'RSQ';			$args = 2;	break;
+					case 314: $function = 'STEYX';			$args = 2;	break;
+					case 315: $function = 'SLOPE';			$args = 2;	break;
+					case 316: $function = 'TTEST';			$args = 4;	break;
+					case 325: $function = 'LARGE';			$args = 2;	break;
+					case 326: $function = 'SMALL';			$args = 2;	break;
+					case 327: $function = 'QUARTILE';		$args = 2;	break;
+					case 328: $function = 'PERCENTILE';		$args = 2;	break;
+					case 331: $function = 'TRIMMEAN';		$args = 2;	break;
+					case 332: $function = 'TINV';			$args = 2;	break;
+					case 337: $function = 'POWER';			$args = 2;	break;
+					case 342: $function = 'RADIANS';		$args = 1;	break;
+					case 343: $function = 'DEGREES';		$args = 1;	break;
+					case 346: $function = 'COUNTIF';		$args = 2;	break;
+					case 347: $function = 'COUNTBLANK';		$args = 1;	break;
+					case 350: $function = 'ISPMT';			$args = 4;	break;
+					case 351: $function = 'DATEDIF';		$args = 3;	break;
+					case 352: $function = 'DATESTRING';		$args = 1;	break;
+					case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
+					case 360: $function = 'PHONETIC';		$args = 1;	break;
+					case 368: $function = 'BAHTTEXT';		$args = 1;	break;
+					default:
+						throw new Exception('Unrecognized function in formula');
+						break;
+				}
 			$data = array('function' => $function, 'args' => $args);
 			break;
-		case 0x23:	//	index to defined name
-		case 0x43:
-		case 0x63:
-			$name = 'tName';
-			$size = 5;
-			// offset: 1; size: 2; one-based index to definedname record
-			$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
-			// offset: 2; size: 2; not used
-			$data = $this->_definedname[$definedNameIndex]['name'];
-			break;
-		case 0x24:	//	single cell reference e.g. A5
-		case 0x44:
-		case 0x64:
-			$name = 'tRef';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
-			break;
-		case 0x25:	//	cell range reference to cells in the same sheet (2d)
-		case 0x45:
-		case 0x65:
-			$name = 'tArea';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
-			break;
-		case 0x26:	//	Constant reference sub-expression
-		case 0x46:
-		case 0x66:
-			$name = 'tMemArea';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x27:	//	Deleted constant reference sub-expression
-		case 0x47:
-		case 0x67:
-			$name = 'tMemErr';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x29:	//	Variable reference sub-expression
-		case 0x49:
-		case 0x69:
-			$name = 'tMemFunc';
-			// offset: 1; size: 2; size of the following sub-expression
-			$subSize = self::_GetInt2d($formulaData, 1);
-			$size = 3 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
+			case 0x22:	//	function with variable number of arguments
+			case 0x42:
+			case 0x62:
+				$name = 'tFuncV';
+				$size = 4;
+				// offset: 1; size: 1; number of arguments
+				$args = ord($formulaData[1]);
+				// offset: 2: size: 2; index to built-in sheet function
+				$index = self::_GetInt2d($formulaData, 2);
+				switch ($index) {
+					case   0: $function = 'COUNT';			break;
+					case   1: $function = 'IF';				break;
+					case   4: $function = 'SUM';			break;
+					case   5: $function = 'AVERAGE';		break;
+					case   6: $function = 'MIN';			break;
+					case   7: $function = 'MAX';			break;
+					case   8: $function = 'ROW';			break;
+					case   9: $function = 'COLUMN';			break;
+					case  11: $function = 'NPV';			break;
+					case  12: $function = 'STDEV';			break;
+					case  13: $function = 'DOLLAR';			break;
+					case  14: $function = 'FIXED';			break;
+					case  28: $function = 'LOOKUP';			break;
+					case  29: $function = 'INDEX';			break;
+					case  36: $function = 'AND';			break;
+					case  37: $function = 'OR';				break;
+					case  46: $function = 'VAR';			break;
+					case  49: $function = 'LINEST';			break;
+					case  50: $function = 'TREND';			break;
+					case  51: $function = 'LOGEST';			break;
+					case  52: $function = 'GROWTH';			break;
+					case  56: $function = 'PV';				break;
+					case  57: $function = 'FV';				break;
+					case  58: $function = 'NPER';			break;
+					case  59: $function = 'PMT';			break;
+					case  60: $function = 'RATE';			break;
+					case  62: $function = 'IRR';			break;
+					case  64: $function = 'MATCH';			break;
+					case  70: $function = 'WEEKDAY';		break;
+					case  78: $function = 'OFFSET';			break;
+					case  82: $function = 'SEARCH';			break;
+					case 100: $function = 'CHOOSE';			break;
+					case 101: $function = 'HLOOKUP';		break;
+					case 102: $function = 'VLOOKUP';		break;
+					case 109: $function = 'LOG';			break;
+					case 115: $function = 'LEFT';			break;
+					case 116: $function = 'RIGHT';			break;
+					case 120: $function = 'SUBSTITUTE';		break;
+					case 124: $function = 'FIND';			break;
+					case 125: $function = 'CELL';			break;
+					case 144: $function = 'DDB';			break;
+					case 148: $function = 'INDIRECT';		break;
+					case 167: $function = 'IPMT';			break;
+					case 168: $function = 'PPMT';			break;
+					case 169: $function = 'COUNTA';			break;
+					case 183: $function = 'PRODUCT';		break;
+					case 193: $function = 'STDEVP';			break;
+					case 194: $function = 'VARP';			break;
+					case 197: $function = 'TRUNC';			break;
+					case 204: $function = 'USDOLLAR';		break;
+					case 205: $function = 'FINDB';			break;
+					case 206: $function = 'SEARCHB';		break;
+					case 208: $function = 'LEFTB';			break;
+					case 209: $function = 'RIGHTB';			break;
+					case 216: $function = 'RANK';			break;
+					case 219: $function = 'ADDRESS';		break;
+					case 220: $function = 'DAYS360';		break;
+					case 222: $function = 'VDB';			break;
+					case 227: $function = 'MEDIAN';			break;
+					case 228: $function = 'SUMPRODUCT';		break;
+					case 247: $function = 'DB';				break;
+					case 255: $function = '';				break;
+					case 269: $function = 'AVEDEV';			break;
+					case 270: $function = 'BETADIST';		break;
+					case 272: $function = 'BETAINV';		break;
+					case 317: $function = 'PROB';			break;
+					case 318: $function = 'DEVSQ';			break;
+					case 319: $function = 'GEOMEAN';		break;
+					case 320: $function = 'HARMEAN';		break;
+					case 321: $function = 'SUMSQ';			break;
+					case 322: $function = 'KURT';			break;
+					case 323: $function = 'SKEW';			break;
+					case 324: $function = 'ZTEST';			break;
+					case 329: $function = 'PERCENTRANK';	break;
+					case 330: $function = 'MODE';			break;
+					case 336: $function = 'CONCATENATE';	break;
+					case 344: $function = 'SUBTOTAL';		break;
+					case 345: $function = 'SUMIF';			break;
+					case 354: $function = 'ROMAN';			break;
+					case 358: $function = 'GETPIVOTDATA';	break;
+					case 359: $function = 'HYPERLINK';		break;
+					case 361: $function = 'AVERAGEA';		break;
+					case 362: $function = 'MAXA';			break;
+					case 363: $function = 'MINA';			break;
+					case 364: $function = 'STDEVPA';		break;
+					case 365: $function = 'VARPA';			break;
+					case 366: $function = 'STDEVA';			break;
+					case 367: $function = 'VARA';			break;
+					default:
+						throw new Exception('Unrecognized function in formula');
+						break;
+				}
+			$data = array('function' => $function, 'args' => $args);
 			break;
+			case 0x23:	//	index to defined name
+			case 0x43:
+			case 0x63:
+				$name = 'tName';
+				$size = 5;
+				// offset: 1; size: 2; one-based index to definedname record
+				$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
+				// offset: 2; size: 2; not used
+				$data = $this->_definedname[$definedNameIndex]['name'];
+				break;
+			case 0x24:	//	single cell reference e.g. A5
+			case 0x44:
+			case 0x64:
+				$name = 'tRef';
+				$size = 5;
+				$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
+				break;
+			case 0x25:	//	cell range reference to cells in the same sheet (2d)
+			case 0x45:
+			case 0x65:
+				$name = 'tArea';
+				$size = 9;
+				$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
+				break;
+			case 0x26:	//	Constant reference sub-expression
+			case 0x46:
+			case 0x66:
+				$name = 'tMemArea';
+				// offset: 1; size: 4; not used
+				// offset: 5; size: 2; size of the following subexpression
+				$subSize = self::_GetInt2d($formulaData, 5);
+				$size = 7 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
+				break;
+			case 0x27:	//	Deleted constant reference sub-expression
+			case 0x47:
+			case 0x67:
+				$name = 'tMemErr';
+				// offset: 1; size: 4; not used
+				// offset: 5; size: 2; size of the following subexpression
+				$subSize = self::_GetInt2d($formulaData, 5);
+				$size = 7 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
+				break;
+			case 0x29:	//	Variable reference sub-expression
+			case 0x49:
+			case 0x69:
+				$name = 'tMemFunc';
+				// offset: 1; size: 2; size of the following sub-expression
+				$subSize = self::_GetInt2d($formulaData, 1);
+				$size = 3 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
+				break;
 
-		case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
-		case 0x4C:
-		case 0x6C:
-			$name = 'tRefN';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
-			break;
+			case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
+			case 0x4C:
+			case 0x6C:
+				$name = 'tRefN';
+				$size = 5;
+				$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
+				break;
 
-		case 0x2D:	//	Relative 2d range reference
-		case 0x4D:
-		case 0x6D:
-			$name = 'tAreaN';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
-			break;
+			case 0x2D:	//	Relative 2d range reference
+			case 0x4D:
+			case 0x6D:
+				$name = 'tAreaN';
+				$size = 9;
+				$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
+				break;
 
-		case 0x39:	//	External name
-		case 0x59:
-		case 0x79:
-			$name = 'tNameX';
-			$size = 7;
-			// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
-			// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
-			$index = self::_GetInt2d($formulaData, 3);
-			// assume index is to EXTERNNAME record
-			$data = $this->_externalNames[$index - 1]['name'];
-			// offset: 5; size: 2; not used
-			break;
+			case 0x39:	//	External name
+			case 0x59:
+			case 0x79:
+				$name = 'tNameX';
+				$size = 7;
+				// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
+				// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
+				$index = self::_GetInt2d($formulaData, 3);
+				// assume index is to EXTERNNAME record
+				$data = $this->_externalNames[$index - 1]['name'];
+				// offset: 5; size: 2; not used
+				break;
 
-		case 0x3A:	//	3d reference to cell
-		case 0x5A:
-		case 0x7A:
-			$name = 'tRef3d';
-			$size = 7;
+			case 0x3A:	//	3d reference to cell
+			case 0x5A:
+			case 0x7A:
+				$name = 'tRef3d';
+				$size = 7;
 
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 4; cell address
-				$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
+				try {
+					// offset: 1; size: 2; index to REF entry
+					$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
+					// offset: 3; size: 4; cell address
+					$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
 
-				$data = "$sheetRange!$cellAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
+					$data = "$sheetRange!$cellAddress";
+				} catch (Exception $e) {
+					// deleted sheet reference
+					$data = '#REF!';
+				}
 
-			break;
-		case 0x3B:	//	3d reference to cell range
-		case 0x5B:
-		case 0x7B:
-			$name = 'tArea3d';
-			$size = 11;
+				break;
+			case 0x3B:	//	3d reference to cell range
+			case 0x5B:
+			case 0x7B:
+				$name = 'tArea3d';
+				$size = 11;
 
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 8; cell address
-				$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
+				try {
+					// offset: 1; size: 2; index to REF entry
+					$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
+					// offset: 3; size: 8; cell address
+					$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
 
-				$data = "$sheetRange!$cellRangeAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
+					$data = "$sheetRange!$cellRangeAddress";
+				} catch (Exception $e) {
+					// deleted sheet reference
+					$data = '#REF!';
+				}
 
-			break;
-		// Unknown cases	// don't know how to deal with
-		default:
-			throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
-			break;
+				break;
+			// Unknown cases	// don't know how to deal with
+			default:
+				throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+				break;
 		}
 
 		return array(
@@ -6259,35 +6259,35 @@ 
 		$identifier = ord($valueData[0]);
 
 		switch ($identifier) {
-		case 0x00: // empty constant (what is this?)
-			$value = '';
-			$size = 9;
-			break;
-		case 0x01: // number
-			// offset: 1; size: 8; IEEE 754 floating-point value
-			$value = self::_extractNumber(substr($valueData, 1, 8));
-			$size = 9;
-			break;
-		case 0x02: // string value
-			// offset: 1; size: var; Unicode string, 16-bit string length
-			$string = self::_readUnicodeStringLong(substr($valueData, 1));
-			$value = '"' . $string['value'] . '"';
-			$size = 1 + $string['size'];
-			break;
-		case 0x04: // boolean
-			// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
-			if (ord($valueData[1])) {
-				$value = 'TRUE';
-			} else {
-				$value = 'FALSE';
-			}
-			$size = 9;
-			break;
-		case 0x10: // error code
-			// offset: 1; size: 1; error code
-			$value = self::_mapErrorCode(ord($valueData[1]));
-			$size = 9;
-			break;
+			case 0x00: // empty constant (what is this?)
+				$value = '';
+				$size = 9;
+				break;
+			case 0x01: // number
+				// offset: 1; size: 8; IEEE 754 floating-point value
+				$value = self::_extractNumber(substr($valueData, 1, 8));
+				$size = 9;
+				break;
+			case 0x02: // string value
+				// offset: 1; size: var; Unicode string, 16-bit string length
+				$string = self::_readUnicodeStringLong(substr($valueData, 1));
+				$value = '"' . $string['value'] . '"';
+				$size = 1 + $string['size'];
+				break;
+			case 0x04: // boolean
+				// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
+				if (ord($valueData[1])) {
+					$value = 'TRUE';
+				} else {
+					$value = 'FALSE';
+				}
+				$size = 9;
+				break;
+			case 0x10: // error code
+				// offset: 1; size: 1; error code
+				$value = self::_mapErrorCode(ord($valueData[1]));
+				$size = 9;
+				break;
 		}
 		return array(
 			'value' => $value,

app/Vendor/PHPExcel/PHPExcel/Shared/OLE.php

Switch Indentation +13 added lines, -13 removed lines

@@ -275,19 +275,19 @@
 			$name = str_replace("\x00", "", $nameUtf16);
 			$type = self::_readInt1($fh);
 			switch ($type) {
-			case self::OLE_PPS_TYPE_ROOT:
-				$pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
-				$this->root = $pps;
-				break;
-			case self::OLE_PPS_TYPE_DIR:
-				$pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
-								   null, null, null, null, array());
-				break;
-			case self::OLE_PPS_TYPE_FILE:
-				$pps = new PHPExcel_Shared_OLE_PPS_File($name);
-				break;
-			default:
-				continue;
+				case self::OLE_PPS_TYPE_ROOT:
+					$pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
+					$this->root = $pps;
+					break;
+				case self::OLE_PPS_TYPE_DIR:
+					$pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
+								   	null, null, null, null, array());
+					break;
+				case self::OLE_PPS_TYPE_FILE:
+					$pps = new PHPExcel_Shared_OLE_PPS_File($name);
+					break;
+				default:
+					continue;
 			}
 			fseek($fh, 1, SEEK_CUR);
 			$pps->Type    = $type;

app/Vendor/PHPExcel/PHPExcel/Style/Border.php

Switch Indentation +30 added lines, -30 removed lines

@@ -211,45 +211,45 @@
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_allBorders':
-			$key = 'allborders';
-			break;
+			case '_allBorders':
+				$key = 'allborders';
+				break;
 
-		case '_bottom':
-			$key = 'bottom';
-			break;
+			case '_bottom':
+				$key = 'bottom';
+				break;
 
-		case '_diagonal':
-			$key = 'diagonal';
-			break;
+			case '_diagonal':
+				$key = 'diagonal';
+				break;
 
-		case '_horizontal':
-			$key = 'horizontal';
-			break;
+			case '_horizontal':
+				$key = 'horizontal';
+				break;
 
-		case '_inside':
-			$key = 'inside';
-			break;
+			case '_inside':
+				$key = 'inside';
+				break;
 
-		case '_left':
-			$key = 'left';
-			break;
+			case '_left':
+				$key = 'left';
+				break;
 
-		case '_outline':
-			$key = 'outline';
-			break;
+			case '_outline':
+				$key = 'outline';
+				break;
 
-		case '_right':
-			$key = 'right';
-			break;
+			case '_right':
+				$key = 'right';
+				break;
 
-		case '_top':
-			$key = 'top';
-			break;
+			case '_top':
+				$key = 'top';
+				break;
 
-		case '_vertical':
-			$key = 'vertical';
-			break;
+			case '_vertical':
+				$key = 'vertical';
+				break;
 		}
 		return $this->_parent->getStyleArray(array($key => $array));
 	}

app/Vendor/PHPExcel/PHPExcel/Style/Color.php

Switch Indentation +18 added lines, -18 removed lines

@@ -131,17 +131,17 @@ 
 	public function getSharedComponent()
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			return $this->_parent->getSharedComponent()->getEndColor();
-			break;
+			case '_endColor':
+				return $this->_parent->getSharedComponent()->getEndColor();
+				break;
 
-		case '_color':
-			return $this->_parent->getSharedComponent()->getColor();
-			break;
+			case '_color':
+				return $this->_parent->getSharedComponent()->getColor();
+				break;
 
-		case '_startColor':
-			return $this->_parent->getSharedComponent()->getStartColor();
-			break;
+			case '_startColor':
+				return $this->_parent->getSharedComponent()->getStartColor();
+				break;
 		}
 	}
 
@@ -186,17 +186,17 @@ 
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			$key = 'endcolor';
-			break;
+			case '_endColor':
+				$key = 'endcolor';
+				break;
 
-		case '_color':
-			$key = 'color';
-			break;
+			case '_color':
+				$key = 'color';
+				break;
 
-		case '_startColor':
-			$key = 'startcolor';
-			break;
+			case '_startColor':
+				$key = 'startcolor';
+				break;
 
 		}
 		return $this->_parent->getStyleArray(array($key => $array));

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5.php

Switch Indentation +38 added lines, -38 removed lines

@@ -440,33 +440,33 @@ 
 
 					switch ($imageFormat) {
 
-					case 1: // GIF, not supported by BIFF8, we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(imagecreatefromgif($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					case 2: // JPEG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 3: // PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 6: // Windows DIB (BMP), we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					default: continue 2;
+						case 1: // GIF, not supported by BIFF8, we convert to PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							ob_start();
+							imagepng(imagecreatefromgif($filename));
+							$blipData = ob_get_contents();
+							ob_end_clean();
+							break;
+
+						case 2: // JPEG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+							$blipData = file_get_contents($filename);
+							break;
+
+						case 3: // PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							$blipData = file_get_contents($filename);
+							break;
+
+						case 6: // Windows DIB (BMP), we convert to PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							ob_start();
+							imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
+							$blipData = ob_get_contents();
+							ob_end_clean();
+							break;
+
+						default: continue 2;
 
 					}
 
@@ -483,17 +483,17 @@ 
 
 					switch ($drawing->getRenderingFunction()) {
 
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$renderingFunction = 'imagejpeg';
-						break;
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$renderingFunction = 'imagepng';
-						break;
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+							$renderingFunction = 'imagejpeg';
+							break;
+
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							$renderingFunction = 'imagepng';
+							break;
 
 					}
 

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Escher.php

Switch Indentation +302 added lines, -302 removed lines

@@ -73,426 +73,426 @@
 
 		switch (get_class($this->_object)) {
 
-		case 'PHPExcel_Shared_Escher':
-			if ($dggContainer = $this->_object->getDggContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
-				$this->_data = $writer->close();
-			} else if ($dgContainer = $this->_object->getDgContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
-				$this->_data = $writer->close();
-				$this->_spOffsets = $writer->getSpOffsets();
-			}
-			break;
+			case 'PHPExcel_Shared_Escher':
+				if ($dggContainer = $this->_object->getDggContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
+					$this->_data = $writer->close();
+				} else if ($dgContainer = $this->_object->getDgContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
+					$this->_data = $writer->close();
+					$this->_spOffsets = $writer->getSpOffsets();
+				}
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DggContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// write the dgg
-			$recVer			= 0x0;
-			$recInstance	= 0x0000;
-			$recType		= 0xF006;
+				// write the dgg
+				$recVer			= 0x0;
+				$recInstance	= 0x0000;
+				$recType		= 0xF006;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			// dgg data
-			$dggData =
-				pack('VVVV'
-					, $this->_object->getSpIdMax() // maximum shape identifier increased by one
-					, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
-					, $this->_object->getCSpSaved()
-					, $this->_object->getCDgSaved() // count total number of drawings saved
-				);
+				// dgg data
+				$dggData =
+					pack('VVVV'
+						, $this->_object->getSpIdMax() // maximum shape identifier increased by one
+						, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
+						, $this->_object->getCSpSaved()
+						, $this->_object->getCDgSaved() // count total number of drawings saved
+					);
 
-			// add file identifier clusters (one per drawing)
-			$IDCLs = $this->_object->getIDCLs();
+				// add file identifier clusters (one per drawing)
+				$IDCLs = $this->_object->getIDCLs();
 
-			foreach ($IDCLs as $dgId => $maxReducedSpId) {
-				$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
-			}
+				foreach ($IDCLs as $dgId => $maxReducedSpId) {
+					$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
+				}
 
-			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
+				$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
+				$innerData .= $header . $dggData;
 
-			// write the bstoreContainer
-			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
-				$innerData .= $writer->close();
-			}
+				// write the bstoreContainer
+				if ($bstoreContainer = $this->_object->getBstoreContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
+					$innerData .= $writer->close();
+				}
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF000;
-			$length			= strlen($innerData);
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF000;
+				$length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			break;
+				$this->_data = $header . $innerData;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// treat the inner data
-			if ($BSECollection = $this->_object->getBSECollection()) {
-				foreach ($BSECollection as $BSE) {
-					$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
-					$innerData .= $writer->close();
+				// treat the inner data
+				if ($BSECollection = $this->_object->getBSECollection()) {
+					foreach ($BSECollection as $BSE) {
+						$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
+						$innerData .= $writer->close();
+					}
 				}
-			}
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
-			$recType		= 0xF001;
-			$length			= strlen($innerData);
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= count($this->_object->getBSECollection());
+				$recType		= 0xF001;
+				$length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			break;
+				$this->_data = $header . $innerData;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
-			// this is a semi-container record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
+				// this is a semi-container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// here we treat the inner data
-			if ($blip = $this->_object->getBlip()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
-				$innerData .= $writer->close();
-			}
+				// here we treat the inner data
+				if ($blip = $this->_object->getBlip()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($blip);
+					$innerData .= $writer->close();
+				}
 
-			// initialize
-			$data = '';
+				// initialize
+				$data = '';
 
-			$btWin32 = $this->_object->getBlipType();
-			$btMacOS = $this->_object->getBlipType();
-			$data .= pack('CC', $btWin32, $btMacOS);
+				$btWin32 = $this->_object->getBlipType();
+				$btMacOS = $this->_object->getBlipType();
+				$data .= pack('CC', $btWin32, $btMacOS);
 
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
-			$data .= $rgbUid;
+				$rgbUid = pack('VVVV', 0,0,0,0); // todo
+				$data .= $rgbUid;
 
-			$tag = 0;
-			$size = strlen($innerData);
-			$cRef = 1;
-			$foDelay = 0; //todo
-			$unused1 = 0x0;
-			$cbName = 0x0;
-			$unused2 = 0x0;
-			$unused3 = 0x0;
-			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
+				$tag = 0;
+				$size = strlen($innerData);
+				$cRef = 1;
+				$foDelay = 0; //todo
+				$unused1 = 0x0;
+				$cbName = 0x0;
+				$unused2 = 0x0;
+				$unused3 = 0x0;
+				$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
 
-			$data .= $innerData;
+				$data .= $innerData;
 
-			// write the record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
-			$recType		= 0xF007;
-			$length			= strlen($data);
+				// write the record
+				$recVer			= 0x2;
+				$recInstance	= $this->_object->getBlipType();
+				$recType		= 0xF007;
+				$length			= strlen($data);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |=	$recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header;
+				$this->_data = $header;
 
-			$this->_data .= $data;
-			break;
+				$this->_data .= $data;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
-			// this is an atom record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
+				// this is an atom record
 
-			// write the record
-			switch ($this->_object->getParent()->getBlipType()) {
+				// write the record
+				switch ($this->_object->getParent()->getBlipType()) {
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-				// initialize
-				$innerData = '';
+					case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+						// initialize
+						$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+						$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+						$innerData .= $rgbUid1;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
+						$tag = 0xFF; // todo
+						$innerData .= pack('C', $tag);
 
-				$innerData .= $this->_object->getData();
+						$innerData .= $this->_object->getData();
 
-				$recVer			= 0x0;
-				$recInstance	= 0x46A;
-				$recType		= 0xF01D;
-				$length			= strlen($innerData);
+						$recVer			= 0x0;
+						$recInstance	= 0x46A;
+						$recType		= 0xF01D;
+						$length			= strlen($innerData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+						$recVerInstance  = $recVer;
+						$recVerInstance |=	$recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+						$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$this->_data = $header;
+						$this->_data = $header;
 
-				$this->_data .= $innerData;
-				break;
+						$this->_data .= $innerData;
+						break;
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-				// initialize
-				$innerData = '';
+					case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+						// initialize
+						$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+						$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+						$innerData .= $rgbUid1;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
+						$tag = 0xFF; // todo
+						$innerData .= pack('C', $tag);
 
-				$innerData .= $this->_object->getData();
+						$innerData .= $this->_object->getData();
 
-				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
-				$recType		= 0xF01E;
-				$length			= strlen($innerData);
+						$recVer			= 0x0;
+						$recInstance	= 0x6E0;
+						$recType		= 0xF01E;
+						$length			= strlen($innerData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+						$recVerInstance  = $recVer;
+						$recVerInstance |=	$recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+						$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$this->_data = $header;
+						$this->_data = $header;
 
-				$this->_data .= $innerData;
-				break;
+						$this->_data .= $innerData;
+						break;
 
-			}
+				}
 			break;
 
-		case 'PHPExcel_Shared_Escher_DgContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DgContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
+
+				// write the dg
+				$recVer			= 0x0;
+				$recInstance	= $this->_object->getDgId();
+				$recType		= 0xF008;
+				$length			= 8;
 
-			// write the dg
-			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
-			$recType		= 0xF008;
-			$length			= 8;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				// number of shapes in this drawing (including group shape)
+				$countShapes = count($this->_object->getSpgrContainer()->getChildren());
+				$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
+				//$innerData .= $header . pack('VV', 0, 0);
 
-			// number of shapes in this drawing (including group shape)
-			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
-			//$innerData .= $header . pack('VV', 0, 0);
+				// write the spgrContainer
+				if ($spgrContainer = $this->_object->getSpgrContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
+					$innerData .= $writer->close();
 
-			// write the spgrContainer
-			if ($spgrContainer = $this->_object->getSpgrContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
-				$innerData .= $writer->close();
+					// get the shape offsets relative to the spgrContainer record
+					$spOffsets = $writer->getSpOffsets();
 
-				// get the shape offsets relative to the spgrContainer record
-				$spOffsets = $writer->getSpOffsets();
+					// save the shape offsets relative to dgContainer
+					foreach ($spOffsets as & $spOffset) {
+						$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+					}
 
-				// save the shape offsets relative to dgContainer
-				foreach ($spOffsets as & $spOffset) {
-					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+					$this->_spOffsets = $spOffsets;
 				}
 
-				$this->_spOffsets = $spOffsets;
-			}
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF002;
+				$length			= strlen($innerData);
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF002;
-			$length			= strlen($innerData);
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$this->_data = $header . $innerData;
+				break;
 
-			$this->_data = $header . $innerData;
-			break;
+			case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
+				// this is a container record
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
-			// this is a container record
+				// initialize
+				$innerData = '';
 
-			// initialize
-			$innerData = '';
+				// initialize spape offsets
+				$totalSize = 8;
+				$spOffsets = array();
 
-			// initialize spape offsets
-			$totalSize = 8;
-			$spOffsets = array();
+				// treat the inner data
+				foreach ($this->_object->getChildren() as $spContainer) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
+					$spData = $writer->close();
+					$innerData .= $spData;
 
-			// treat the inner data
-			foreach ($this->_object->getChildren() as $spContainer) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
-				$spData = $writer->close();
-				$innerData .= $spData;
+					// save the shape offsets (where new shape records begin)
+					$totalSize += strlen($spData);
+					$spOffsets[] = $totalSize;
+				}
 
-				// save the shape offsets (where new shape records begin)
-				$totalSize += strlen($spData);
-				$spOffsets[] = $totalSize;
-			}
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF003;
+				$length			= strlen($innerData);
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF003;
-			$length			= strlen($innerData);
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$this->_data = $header . $innerData;
+				$this->_spOffsets = $spOffsets;
+				break;
 
-			$this->_data = $header . $innerData;
-			$this->_spOffsets = $spOffsets;
-			break;
+			case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
+				// initialize
+				$data = '';
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
-			// initialize
-			$data = '';
+				// build the data
 
-			// build the data
+				// write group shape record, if necessary?
+				if ($this->_object->getSpgr()) {
+					$recVer			= 0x1;
+					$recInstance	= 0x0000;
+					$recType		= 0xF009;
+					$length			= 0x00000010;
 
-			// write group shape record, if necessary?
-			if ($this->_object->getSpgr()) {
-				$recVer			= 0x1;
-				$recInstance	= 0x0000;
-				$recType		= 0xF009;
-				$length			= 0x00000010;
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
+
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+
+					$data .= $header . pack('VVVV', 0,0,0,0);
+				}
+
+				// write the shape record
+				$recVer			= 0x2;
+				$recInstance	= $this->_object->getSpType(); // shape type
+				$recType		= 0xF00A;
+				$length			= 0x00000008;
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$data .= $header . pack('VVVV', 0,0,0,0);
-			}
-
-			// write the shape record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
-			$recType		= 0xF00A;
-			$length			= 0x00000008;
+				$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				// the options
+				if ($this->_object->getOPTCollection()) {
+					$optData = '';
 
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
+					$recVer			= 0x3;
+					$recInstance	= count($this->_object->getOPTCollection());
+					$recType		= 0xF00B;
+					foreach ($this->_object->getOPTCollection() as $property => $value) {
+						$optData .= pack('vV', $property, $value);
+					}
+					$length			= strlen($optData);
 
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-			// the options
-			if ($this->_object->getOPTCollection()) {
-				$optData = '';
-
-				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
-				$recType		= 0xF00B;
-				foreach ($this->_object->getOPTCollection() as $property => $value) {
-					$optData .= pack('vV', $property, $value);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $optData;
 				}
-				$length			= strlen($optData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				// the client anchor
+				if ($this->_object->getStartCoordinates()) {
+					$clientAnchorData = '';
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
-			}
+					$recVer			= 0x0;
+					$recInstance	= 0x0;
+					$recType		= 0xF010;
 
-			// the client anchor
-			if ($this->_object->getStartCoordinates()) {
-				$clientAnchorData = '';
+					// start coordinates
+					list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
+					$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+					$r1 = $row - 1;
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF010;
+					// start offsetX
+					$startOffsetX = $this->_object->getStartOffsetX();
 
-				// start coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
-				$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r1 = $row - 1;
+					// start offsetY
+					$startOffsetY = $this->_object->getStartOffsetY();
 
-				// start offsetX
-				$startOffsetX = $this->_object->getStartOffsetX();
+					// end coordinates
+					list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
+					$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+					$r2 = $row - 1;
 
-				// start offsetY
-				$startOffsetY = $this->_object->getStartOffsetY();
+					// end offsetX
+					$endOffsetX = $this->_object->getEndOffsetX();
 
-				// end coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
-				$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r2 = $row - 1;
+					// end offsetY
+					$endOffsetY = $this->_object->getEndOffsetY();
 
-				// end offsetX
-				$endOffsetX = $this->_object->getEndOffsetX();
+					$clientAnchorData = pack('vvvvvvvvv', 0x02,
+						$c1, $startOffsetX, $r1, $startOffsetY,
+						$c2, $endOffsetX, $r2, $endOffsetY);
 
-				// end offsetY
-				$endOffsetY = $this->_object->getEndOffsetY();
+					$length			= strlen($clientAnchorData);
 
-				$clientAnchorData = pack('vvvvvvvvv', 0x02,
-					$c1, $startOffsetX, $r1, $startOffsetY,
-					$c2, $endOffsetX, $r2, $endOffsetY);
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-				$length			= strlen($clientAnchorData);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $clientAnchorData;
+				}
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				// the client data, just empty for now
+				if (!$this->_object->getSpgr()) {
+					$clientDataData = '';
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
-			}
+					$recVer			= 0x0;
+					$recInstance	= 0x0;
+					$recType		= 0xF011;
 
-			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
-				$clientDataData = '';
+					$length = strlen($clientDataData);
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF011;
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-				$length = strlen($clientDataData);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $clientDataData;
+				}
+
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF004;
+				$length			= strlen($data);
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF004;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $data;
-			break;
+				$this->_data = $header . $data;
+				break;
 
 		}