mambax7 / bookshop

pdf/barcode/barcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 
 	/**
 	 * Returns the image object.
-	 * @return object image.
+	 * @return resource image.
 	 * @author Nicola Asuni
 	 * @since 1.5.2
 	 */

Indentation +3 added lines, -3 removed lines

@@ -346,9 +346,9 @@
 	 * @param int $xPos Horiziontal position.
 	 * @param int $yPos Vertical position.
 	 * @param int $xSize Horizontal size.
-     * @param int $xSize Vertical size.
-     * @return bool trur in case of success, false otherwise.
-     * @access protected
+	 * @param int $xSize Vertical size.
+	 * @return bool trur in case of success, false otherwise.
+	 * @access protected
 	 */
 	function DrawSingleBar($xPos, $yPos, $xSize, $ySize) {
 		if ($xPos>=0 && $xPos<=$this->mWidth && ($xPos+$xSize)<=$this->mWidth &&

Spacing +10 added lines, -10 removed lines

@@ -273,7 +273,7 @@ 
 	 * @param int $Height Image height in pixels. 
 	 * @param int $Style Barcode style.
 	 */
-	function BarcodeObject($Width=BCD_DEFAULT_WIDTH, $Height=BCD_DEFAULT_HEIGHT, $Style=BCD_DEFAULT_STYLE) {
+	function BarcodeObject($Width = BCD_DEFAULT_WIDTH, $Height = BCD_DEFAULT_HEIGHT, $Style = BCD_DEFAULT_STYLE) {
 		$this->mWidth = $Width;
 		$this->mHeight = $Height;
 		$this->mStyle = $Style;
@@ -304,7 +304,7 @@ 
 	 * Abstract method used to draw the barcode image.
 	 * @param int $xres Horizontal resolution.
 	 */
-	function DrawObject($xres)	{
+	function DrawObject($xres) {
 		/* there is not implementation neded, is simply the asbsract function. */
 		return false;
 	}
@@ -314,7 +314,7 @@ 
 	 * @access protected
 	 */
 	function DrawBorder() {
-		ImageRectangle($this->mImg, 0, 0, $this->mWidth-1, $this->mHeight-1, $this->mBrush);
+		ImageRectangle($this->mImg, 0, 0, $this->mWidth - 1, $this->mHeight - 1, $this->mBrush);
 	}
 	
 	/**
@@ -326,7 +326,7 @@ 
 	 * @access protected
 	 */
 	function DrawChar($Font, $xPos, $yPos, $Char) {
-		ImageString($this->mImg,$Font,$xPos,$yPos,$Char,$this->mBrush);
+		ImageString($this->mImg, $Font, $xPos, $yPos, $Char, $this->mBrush);
 	}
 	
 	/**
@@ -338,7 +338,7 @@ 
 	 * @access protected
 	 */
 	function DrawText($Font, $xPos, $yPos, $Char) {
-		ImageString($this->mImg,$Font,$xPos,$yPos,$Char,$this->mBrush);
+		ImageString($this->mImg, $Font, $xPos, $yPos, $Char, $this->mBrush);
 	}
 
 	/**
@@ -351,10 +351,10 @@ 
      * @access protected
 	 */
 	function DrawSingleBar($xPos, $yPos, $xSize, $ySize) {
-		if ($xPos>=0 && $xPos<=$this->mWidth && ($xPos+$xSize)<=$this->mWidth &&
-		$yPos>=0 && $yPos<=$this->mHeight && ($yPos+$ySize)<=$this->mHeight) {
-			for ($i=0;$i<$xSize;$i++) {
-				ImageLine($this->mImg, $xPos+$i, $yPos, $xPos+$i, $yPos+$ySize, $this->mBrush);
+		if ($xPos >= 0 && $xPos <= $this->mWidth && ($xPos + $xSize) <= $this->mWidth &&
+		$yPos >= 0 && $yPos <= $this->mHeight && ($yPos + $ySize) <= $this->mHeight) {
+			for ($i = 0; $i < $xSize; $i++) {
+				ImageLine($this->mImg, $xPos + $i, $yPos, $xPos + $i, $yPos + $ySize, $this->mBrush);
 			}
 			return true;
 		}
@@ -407,7 +407,7 @@ 
 	 * Set barcode style.
 	 * @param int $Style barcode style.
 	 */
-	function SetStyle ($Style) {
+	function SetStyle($Style) {
 		$this->mStyle = $Style;
 	}
 

pdf/barcode/c128cobject.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 
 	/**
 	 * Returns the character index.
-	 * @param char $char character.
+	 * @param string $char character.
 	 * @return int character index or -1 in case of error.
 	 * @access private
 	 */

Spacing +138 added lines, -138 removed lines

@@ -58,7 +58,7 @@ 
 	function C128CObject($Width, $Height, $Style, $Value) {
 		$this->BarcodeObject($Width, $Height, $Style);
 		$this->mValue = $Value;
-		$this->mChars = array (
+		$this->mChars = array(
 		"00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
 		"10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
 		"20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
@@ -70,107 +70,107 @@ 
 		"80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
 		"90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
 		);
-		$this->mCharSet = array (
-		"212222",   /*   00 */
-		"222122",   /*   01 */
-		"222221",   /*   02 */
-		"121223",   /*   03 */
-		"121322",   /*   04 */
-		"131222",   /*   05 */
-		"122213",   /*   06 */
-		"122312",   /*   07 */
-		"132212",   /*   08 */
-		"221213",   /*   09 */
-		"221312",   /*   10 */
-		"231212",   /*   11 */
-		"112232",   /*   12 */
-		"122132",   /*   13 */
-		"122231",   /*   14 */
-		"113222",   /*   15 */
-		"123122",   /*   16 */
-		"123221",   /*   17 */
-		"223211",   /*   18 */
-		"221132",   /*   19 */
-		"221231",   /*   20 */
-		"213212",   /*   21 */
-		"223112",   /*   22 */
-		"312131",   /*   23 */
-		"311222",   /*   24 */
-		"321122",   /*   25 */
-		"321221",   /*   26 */
-		"312212",   /*   27 */
-		"322112",   /*   28 */
-		"322211",   /*   29 */
-		"212123",   /*   30 */
-		"212321",   /*   31 */
-		"232121",   /*   32 */
-		"111323",   /*   33 */
-		"131123",   /*   34 */
-		"131321",   /*   35 */
-		"112313",   /*   36 */
-		"132113",   /*   37 */
-		"132311",   /*   38 */
-		"211313",   /*   39 */
-		"231113",   /*   40 */
-		"231311",   /*   41 */
-		"112133",   /*   42 */
-		"112331",   /*   43 */
-		"132131",   /*   44 */
-		"113123",   /*   45 */
-		"113321",   /*   46 */
-		"133121",   /*   47 */
-		"313121",   /*   48 */
-		"211331",   /*   49 */
-		"231131",   /*   50 */
-		"213113",   /*   51 */
-		"213311",   /*   52 */
-		"213131",   /*   53 */
-		"311123",   /*   54 */
-		"311321",   /*   55 */
-		"331121",   /*   56 */
-		"312113",   /*   57 */
-		"312311",   /*   58 */
-		"332111",   /*   59 */
-		"314111",   /*   60 */
-		"221411",   /*   61 */
-		"431111",   /*   62 */
-		"111224",   /*   63 */
-		"111422",   /*   64 */
-		"121124",   /*   65 */
-		"121421",   /*   66 */
-		"141122",   /*   67 */
-		"141221",   /*   68 */
-		"112214",   /*   69 */
-		"112412",   /*   70 */
-		"122114",   /*   71 */
-		"122411",   /*   72 */
-		"142112",   /*   73 */
-		"142211",   /*   74 */
-		"241211",   /*   75 */
-		"221114",   /*   76 */
-		"413111",   /*   77 */
-		"241112",   /*   78 */
-		"134111",   /*   79 */
-		"111242",   /*   80 */
-		"121142",   /*   81 */
-		"121241",   /*   82 */
-		"114212",   /*   83 */
-		"124112",   /*   84 */
-		"124211",   /*   85 */
-		"411212",   /*   86 */
-		"421112",   /*   87 */
-		"421211",   /*   88 */
-		"212141",   /*   89 */
-		"214121",   /*   90 */
-		"412121",   /*   91 */
-		"111143",   /*   92 */
-		"111341",   /*   93 */
-		"131141",   /*   94 */
-		"114113",   /*   95 */
-		"114311",   /*   96 */
-		"411113",   /*   97 */
-		"411311",   /*   98 */
-		"113141",   /*   99 */
+		$this->mCharSet = array(
+		"212222", /*   00 */
+		"222122", /*   01 */
+		"222221", /*   02 */
+		"121223", /*   03 */
+		"121322", /*   04 */
+		"131222", /*   05 */
+		"122213", /*   06 */
+		"122312", /*   07 */
+		"132212", /*   08 */
+		"221213", /*   09 */
+		"221312", /*   10 */
+		"231212", /*   11 */
+		"112232", /*   12 */
+		"122132", /*   13 */
+		"122231", /*   14 */
+		"113222", /*   15 */
+		"123122", /*   16 */
+		"123221", /*   17 */
+		"223211", /*   18 */
+		"221132", /*   19 */
+		"221231", /*   20 */
+		"213212", /*   21 */
+		"223112", /*   22 */
+		"312131", /*   23 */
+		"311222", /*   24 */
+		"321122", /*   25 */
+		"321221", /*   26 */
+		"312212", /*   27 */
+		"322112", /*   28 */
+		"322211", /*   29 */
+		"212123", /*   30 */
+		"212321", /*   31 */
+		"232121", /*   32 */
+		"111323", /*   33 */
+		"131123", /*   34 */
+		"131321", /*   35 */
+		"112313", /*   36 */
+		"132113", /*   37 */
+		"132311", /*   38 */
+		"211313", /*   39 */
+		"231113", /*   40 */
+		"231311", /*   41 */
+		"112133", /*   42 */
+		"112331", /*   43 */
+		"132131", /*   44 */
+		"113123", /*   45 */
+		"113321", /*   46 */
+		"133121", /*   47 */
+		"313121", /*   48 */
+		"211331", /*   49 */
+		"231131", /*   50 */
+		"213113", /*   51 */
+		"213311", /*   52 */
+		"213131", /*   53 */
+		"311123", /*   54 */
+		"311321", /*   55 */
+		"331121", /*   56 */
+		"312113", /*   57 */
+		"312311", /*   58 */
+		"332111", /*   59 */
+		"314111", /*   60 */
+		"221411", /*   61 */
+		"431111", /*   62 */
+		"111224", /*   63 */
+		"111422", /*   64 */
+		"121124", /*   65 */
+		"121421", /*   66 */
+		"141122", /*   67 */
+		"141221", /*   68 */
+		"112214", /*   69 */
+		"112412", /*   70 */
+		"122114", /*   71 */
+		"122411", /*   72 */
+		"142112", /*   73 */
+		"142211", /*   74 */
+		"241211", /*   75 */
+		"221114", /*   76 */
+		"413111", /*   77 */
+		"241112", /*   78 */
+		"134111", /*   79 */
+		"111242", /*   80 */
+		"121142", /*   81 */
+		"121241", /*   82 */
+		"114212", /*   83 */
+		"124112", /*   84 */
+		"124211", /*   85 */
+		"411212", /*   86 */
+		"421112", /*   87 */
+		"421211", /*   88 */
+		"212141", /*   89 */
+		"214121", /*   90 */
+		"412121", /*   91 */
+		"111143", /*   92 */
+		"111341", /*   93 */
+		"131141", /*   94 */
+		"114113", /*   95 */
+		"114311", /*   96 */
+		"411113", /*   97 */
+		"411311", /*   98 */
+		"113141", /*   99 */
 		);
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @access private
 	 */
 	function GetCharIndex($char) {
-		for ($i=0;$i<100;$i++) {
+		for ($i = 0; $i < 100; $i++) {
 			if ($this->mChars[$i] == $char) {
 				return $i;
 			}
@@ -230,26 +230,26 @@ 
 	function GetSize($xres) {
 		$len = strlen($this->mValue);
 
-		if ($len == 0)  {
+		if ($len == 0) {
 			$this->mError = "Null value";
 			return false;
 		}
 		$ret = 0;
 
-		for ($i=0;$i<$len;$i++) {
-			if ((ord($this->mValue[$i])<48) || (ord($this->mValue[$i])>57)) {
+		for ($i = 0; $i < $len; $i++) {
+			if ((ord($this->mValue[$i]) < 48) || (ord($this->mValue[$i]) > 57)) {
 				$this->mError = "Code-128C is numeric only";
 				return false;
 			}
 		}
 
-		if (($len%2) != 0) {
+		if (($len % 2) != 0) {
 			$this->mError = "The length of barcode value must be even.  You must pad the number with zeros.";
 			return false;
 		}
 
-		for ($i=0;$i<$len;$i+=2) {
-			$id = $this->GetCharIndex($this->mValue[$i].$this->mValue[$i+1]);
+		for ($i = 0; $i < $len; $i += 2) {
+			$id = $this->GetCharIndex($this->mValue[$i].$this->mValue[$i + 1]);
 			$cset = $this->mCharSet[$id];
 			$ret += $this->GetBarSize($xres, $cset[0]);
 			$ret += $this->GetBarSize($xres, $cset[1]);
@@ -261,12 +261,12 @@ 
 		/* length of Check character */
 		$cset = $this->GetCheckCharValue();
 		$CheckSize = 0;
-		for ($i=0;$i<6;$i++) {
+		for ($i = 0; $i < 6; $i++) {
 			$CheckSize += $this->GetBarSize($cset[$i], $xres);
 		}
 
-		$StartSize = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres;
-		$StopSize  = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + 2*BCD_C128_BAR_3*$xres;
+		$StartSize = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres;
+		$StopSize  = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + 2 * BCD_C128_BAR_3 * $xres;
 		return $StartSize + $ret + $CheckSize + $StopSize;
 	}
 	
@@ -279,11 +279,11 @@ 
 		$len = strlen($this->mValue);
 		$sum = 105; // 'C' type;
 		$m = 0;
-		for ($i=0;$i<$len;$i+=2) {
+		for ($i = 0; $i < $len; $i += 2) {
 			$m++;
-			$sum +=  $this->GetCharIndex($this->mValue[$i].$this->mValue[$i+1]) * $m;
+			$sum += $this->GetCharIndex($this->mValue[$i].$this->mValue[$i + 1]) * $m;
 		}
-		$check  = $sum % 103;
+		$check = $sum % 103;
 		return $this->mCharSet[$check];
 	}
 
@@ -298,13 +298,13 @@ 
 	 */
 	function DrawStart($DrawPos, $yPos, $ySize, $xres) {
 		/* Start code is '211232' */
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('2', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('3', $xres);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		return $DrawPos;
@@ -321,16 +321,16 @@ 
 	 */
 	function DrawStop($DrawPos, $yPos, $ySize, $xres) {
 		/* Stop code is '2331112' */
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		$DrawPos += $this->GetBarSize('3', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('3', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		return $DrawPos;
 	}
@@ -346,13 +346,13 @@ 
 	 */
 	function DrawCheckChar($DrawPos, $yPos, $ySize, $xres) {
 		$cset = $this->GetCheckCharValue();
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[0], $xres);
 		$DrawPos += $this->GetBarSize($cset[1], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[2], $xres);
 		$DrawPos += $this->GetBarSize($cset[3], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[4], $xres);
 		$DrawPos += $this->GetBarSize($cset[5], $xres);
 		return $DrawPos;
@@ -365,11 +365,11 @@ 
 	 */
 	function DrawObject($xres) {
 		$len = strlen($this->mValue);
-		if (($size = $this->GetSize($xres))==0) {
+		if (($size = $this->GetSize($xres)) == 0) {
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
+		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size) / 2);
 		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
 		else $sPos = 0;
 
@@ -380,35 +380,35 @@ 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {
 			if ($this->mStyle & BCS_STRETCH_TEXT) {
-				for ($i=0;$i<$len;$i++) {
-					$this->DrawChar($this->mFont, $sPos+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres)+($size/$len)*$i,
+				for ($i = 0; $i < $len; $i++) {
+					$this->DrawChar($this->mFont, $sPos + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres) + ($size / $len) * $i,
 					$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue[$i]);
 				}
 			} else {/* Center */
 			$text_width = $this->GetFontWidth($this->mFont) * strlen($this->mValue);
-			$this->DrawText($this->mFont, $sPos+(($size-$text_width)/2)+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres),
+			$this->DrawText($this->mFont, $sPos + (($size - $text_width) / 2) + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres),
 			$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue);
 			}
 		}
 
 		$cPos = 0;
-		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		do {
-			$c     = $this->GetCharIndex($this->mValue[$cPos].$this->mValue[$cPos+1]);
+			$c     = $this->GetCharIndex($this->mValue[$cPos].$this->mValue[$cPos + 1]);
 			$cset  = $this->mCharSet[$c];
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[0], $xres);
 			$DrawPos += $this->GetBarSize($cset[1], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[2], $xres);
 			$DrawPos += $this->GetBarSize($cset[3], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[4], $xres);
 			$DrawPos += $this->GetBarSize($cset[5], $xres);
 			$cPos += 2;
-		} while ($cPos<$len);
-		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
-		$DrawPos =  $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		} while ($cPos < $len);
+		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
+		$DrawPos = $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		return true;
 	}
 }

Braces +12 added lines, -5 removed lines

@@ -349,13 +349,20 @@
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
-		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
-		else $sPos = 0;
+		if ($this->mStyle & BCS_ALIGN_CENTER) {
+			$sPos = (integer)(($this->mWidth - $size ) / 2);
+		} else if ($this->mStyle & BCS_ALIGN_RIGHT) {
+			$sPos = $this->mWidth - $size;
+		} else {
+			$sPos = 0;
+		}
 
 		/* Total height of bar code -Bars only- */
-		if ($this->mStyle & BCS_DRAW_TEXT) $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
-		else $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		if ($this->mStyle & BCS_DRAW_TEXT) {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
+		} else {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		}
 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {

pdf/fonts/old/makefont/makefont.php

Doc Comments +10 added lines

@@ -5,6 +5,9 @@ 
 * Date:    2004-12-31                                                          *
 *******************************************************************************/
 
+/**
+ * @param string $enc
+ */
 function ReadMap($enc)
 {
 	//Read a map file
@@ -132,6 +135,9 @@ 
 	return $fm;
 }
 
+/**
+ * @param boolean $symbolic
+ */
 function MakeFontDescriptor($fm,$symbolic)
 {
 	//Ascent
@@ -227,6 +233,10 @@ 
 	return rtrim($s);
 }
 
+/**
+ * @param string $file
+ * @param string $s
+ */
 function SaveToFile($file,$s,$mode='t')
 {
 	$f=fopen($file,'w'.$mode);

pdf/fonts/ttf2ufm/makefontuni.php

Doc Comments +7 added lines

@@ -5,6 +5,9 @@ 
 * Date:    2003-12-30                                                          *
 *******************************************************************************/
 
+/**
+ * @param string $cidtogidmap
+ */
 function ReadUFM($file, &$cidtogidmap)
 {
   //Prepare empty CIDToGIDMap
@@ -143,6 +146,10 @@ 
   return $s;
 }
 
+/**
+ * @param string $file
+ * @param string $s
+ */
 function SaveToFile($file,$s,$mode='t')
 {
   $f=fopen($file,'w'.$mode);

Indentation +124 added lines, -124 removed lines

@@ -13,66 +13,66 @@ 
   //Read a font metric file
   $a=file($file);
   if(empty($a))
-    die('File not found');
+	die('File not found');
   $widths=array();
   $fm=array();
   foreach($a as $l)
   {
-    $e=explode(' ',chop($l));
-    if(count($e)<2)
-      continue;
-    $code=$e[0];
-    $param=$e[1];
-    if($code=='U')
-    {
-      // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-      //Character metrics
-      $cc=(int)$e[1];
-      if ($cc != -1) {
-        $gn = $e[7];
-        $w = $e[4];
-        $glyph = $e[10];
-        $widths[$cc] = $w;
-        if($cc == ord('X'))
-          $fm['CapXHeight'] = $e[13];
+	$e=explode(' ',chop($l));
+	if(count($e)<2)
+	  continue;
+	$code=$e[0];
+	$param=$e[1];
+	if($code=='U')
+	{
+	  // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+	  //Character metrics
+	  $cc=(int)$e[1];
+	  if ($cc != -1) {
+		$gn = $e[7];
+		$w = $e[4];
+		$glyph = $e[10];
+		$widths[$cc] = $w;
+		if($cc == ord('X'))
+		  $fm['CapXHeight'] = $e[13];
           
-        // Set GID
-        if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-          $cidtogidmap{$cc*2} = chr($glyph >> 8);
-          $cidtogidmap{$cc*2 + 1} = chr($glyph & 0xFF);
-        }        
-      }
-      if($gn=='.notdef' && !isset($fm['MissingWidth']))
-        $fm['MissingWidth']=$w;
-    }
-    elseif($code=='FontName')
-      $fm['FontName']=$param;
-    elseif($code=='Weight')
-      $fm['Weight']=$param;
-    elseif($code=='ItalicAngle')
-      $fm['ItalicAngle']=(double)$param;
-    elseif($code=='Ascender')
-      $fm['Ascender']=(int)$param;
-    elseif($code=='Descender')
-      $fm['Descender']=(int)$param;
-    elseif($code=='UnderlineThickness')
-      $fm['UnderlineThickness']=(int)$param;
-    elseif($code=='UnderlinePosition')
-      $fm['UnderlinePosition']=(int)$param;
-    elseif($code=='IsFixedPitch')
-      $fm['IsFixedPitch']=($param=='true');
-    elseif($code=='FontBBox')
-      $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
-    elseif($code=='CapHeight')
-      $fm['CapHeight']=(int)$param;
-    elseif($code=='StdVW')
-      $fm['StdVW']=(int)$param;
+		// Set GID
+		if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
+		  $cidtogidmap{$cc*2} = chr($glyph >> 8);
+		  $cidtogidmap{$cc*2 + 1} = chr($glyph & 0xFF);
+		}        
+	  }
+	  if($gn=='.notdef' && !isset($fm['MissingWidth']))
+		$fm['MissingWidth']=$w;
+	}
+	elseif($code=='FontName')
+	  $fm['FontName']=$param;
+	elseif($code=='Weight')
+	  $fm['Weight']=$param;
+	elseif($code=='ItalicAngle')
+	  $fm['ItalicAngle']=(double)$param;
+	elseif($code=='Ascender')
+	  $fm['Ascender']=(int)$param;
+	elseif($code=='Descender')
+	  $fm['Descender']=(int)$param;
+	elseif($code=='UnderlineThickness')
+	  $fm['UnderlineThickness']=(int)$param;
+	elseif($code=='UnderlinePosition')
+	  $fm['UnderlinePosition']=(int)$param;
+	elseif($code=='IsFixedPitch')
+	  $fm['IsFixedPitch']=($param=='true');
+	elseif($code=='FontBBox')
+	  $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
+	elseif($code=='CapHeight')
+	  $fm['CapHeight']=(int)$param;
+	elseif($code=='StdVW')
+	  $fm['StdVW']=(int)$param;
   }
   if(!isset($fm['MissingWidth']))
-    $fm['MissingWidth']=600;
+	$fm['MissingWidth']=600;
 
   if(!isset($fm['FontName']))
-    die('FontName not found');
+	die('FontName not found');
 
   $fm['Widths']=$widths;
   
@@ -89,40 +89,40 @@ 
   $fd.=",'Descent'=>".$desc;
   //CapHeight
   if(isset($fm['CapHeight']))
-    $ch=$fm['CapHeight'];
+	$ch=$fm['CapHeight'];
   elseif(isset($fm['CapXHeight']))
-    $ch=$fm['CapXHeight'];
+	$ch=$fm['CapXHeight'];
   else
-    $ch=$asc;
+	$ch=$asc;
   $fd.=",'CapHeight'=>".$ch;
   //Flags
   $flags=0;
   if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch'])
-    $flags+=1<<0;
+	$flags+=1<<0;
   $flags+=1<<5;
   if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0)
-    $flags+=1<<6;
+	$flags+=1<<6;
   $fd.=",'Flags'=>".$flags;
   //FontBBox
   if(isset($fm['FontBBox']))
-    $fbb=$fm['FontBBox'];
+	$fbb=$fm['FontBBox'];
   else
-    $fbb=array(0,$des-100,1000,$asc+100);
+	$fbb=array(0,$des-100,1000,$asc+100);
   $fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
   //ItalicAngle
   $ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
   $fd.=",'ItalicAngle'=>".$ia;
   //StemV
   if(isset($fm['StdVW']))
-    $stemv=$fm['StdVW'];
+	$stemv=$fm['StdVW'];
   elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
-    $stemv=120;
+	$stemv=120;
   else
-    $stemv=70;
+	$stemv=70;
   $fd.=",'StemV'=>".$stemv;
   //MissingWidth
   if(isset($fm['MissingWidth']))
-    $fd.=",'MissingWidth'=>".$fm['MissingWidth'];
+	$fd.=",'MissingWidth'=>".$fm['MissingWidth'];
   $fd.=')';
   return $fd;
 }
@@ -136,7 +136,7 @@ 
   $c=0;
   foreach ($cw as $i => $w)
   {
-    $els[] = ((($c++)%16==0)?"\n\t":'').$i.'=>'.$w;
+	$els[] = ((($c++)%16==0)?"\n\t":'').$i.'=>'.$w;
   }
   $s .= implode(', ', $els);
   $s.=')';
@@ -147,7 +147,7 @@ 
 {
   $f=fopen($file,'w'.$mode);
   if(!$f)
-    die('Can\'t write to file '.$file);
+	die('Can\'t write to file '.$file);
   fwrite($f,$s,strlen($s));
   fclose($f);
 }
@@ -169,7 +169,7 @@ 
   //Check if font license allows embedding
   $f=fopen($file,'rb');
   if(!$f)
-    die('<B>Error:</B> Can\'t open '.$file);
+	die('<B>Error:</B> Can\'t open '.$file);
   //Extract number of tables
   fseek($f,4,SEEK_CUR);
   $nb=ReadShort($f);
@@ -178,17 +178,17 @@ 
   $found=false;
   for($i=0;$i<$nb;$i++)
   {
-    if(fread($f,4)=='OS/2')
-    {
-      $found=true;
-      break;
-    }
-    fseek($f,12,SEEK_CUR);
+	if(fread($f,4)=='OS/2')
+	{
+	  $found=true;
+	  break;
+	}
+	fseek($f,12,SEEK_CUR);
   }
   if(!$found)
   {
-    fclose($f);
-    return;
+	fclose($f);
+	return;
   }
   fseek($f,4,SEEK_CUR);
   $offset=ReadLong($f);
@@ -201,7 +201,7 @@ 
   $e=($fsType & 0x08)!=0;
   fclose($f);
   if($rl and !$pp and !$e)
-    echo '<B>Warning:</B> font license does not allow embedding';
+	echo '<B>Warning:</B> font license does not allow embedding';
 }
 
 /*******************************************************************************
@@ -213,23 +213,23 @@ 
   //Generate a font definition file
   set_magic_quotes_runtime(0);
   if(!file_exists($ufmfile))
-    die('<B>Error:</B> UFM file not found: '.$ufmfile);
+	die('<B>Error:</B> UFM file not found: '.$ufmfile);
   $cidtogidmap = '';
   $fm=ReadUFM($ufmfile, $cidtogidmap);
   $fd=MakeFontDescriptor($fm);
   //Find font type
   if($fontfile)
   {
-    $ext=strtolower(substr($fontfile,-3));
-    if($ext=='ttf')
-      $type='TrueTypeUnicode';
-    else
-      die('<B>Error:</B> not a truetype font: '.$ext);
+	$ext=strtolower(substr($fontfile,-3));
+	if($ext=='ttf')
+	  $type='TrueTypeUnicode';
+	else
+	  die('<B>Error:</B> not a truetype font: '.$ext);
   }
   else
   {
-    if($type!='TrueTypeUnicode')
-      die('<B>Error:</B> incorrect font type: '.$type);
+	if($type!='TrueTypeUnicode')
+	  die('<B>Error:</B> incorrect font type: '.$type);
   }
   //Start generation
   $s='<?php'."\n";
@@ -237,9 +237,9 @@ 
   $s.='$name=\''.$fm['FontName']."';\n";
   $s.='$desc='.$fd.";\n";
   if(!isset($fm['UnderlinePosition']))
-    $fm['UnderlinePosition']=-100;
+	$fm['UnderlinePosition']=-100;
   if(!isset($fm['UnderlineThickness']))
-    $fm['UnderlineThickness']=50;
+	$fm['UnderlineThickness']=50;
   $s.='$up='.$fm['UnderlinePosition'].";\n";
   $s.='$ut='.$fm['UnderlineThickness'].";\n";
   $w=MakeWidthArray($fm);
@@ -249,51 +249,51 @@ 
   $basename=substr(basename($ufmfile),0,-4);
   if($fontfile)
   {
-    //Embedded font
-    if(!file_exists($fontfile))
-      die('<B>Error:</B> font file not found: '.$fontfile);
-    CheckTTF($fontfile);
-    $f=fopen($fontfile,'rb');
-    if(!$f)
-      die('<B>Error:</B> Can\'t open '.$fontfile);
-    $file=fread($f,filesize($fontfile));
-    fclose($f);
-    if(function_exists('gzcompress'))
-    {
-      $cmp=$basename.'.z';
-      SaveToFile($cmp,gzcompress($file),'b');
-      $s.='$file=\''.$cmp."';\n";
-      echo 'Font file compressed ('.$cmp.')<BR>';
+	//Embedded font
+	if(!file_exists($fontfile))
+	  die('<B>Error:</B> font file not found: '.$fontfile);
+	CheckTTF($fontfile);
+	$f=fopen($fontfile,'rb');
+	if(!$f)
+	  die('<B>Error:</B> Can\'t open '.$fontfile);
+	$file=fread($f,filesize($fontfile));
+	fclose($f);
+	if(function_exists('gzcompress'))
+	{
+	  $cmp=$basename.'.z';
+	  SaveToFile($cmp,gzcompress($file),'b');
+	  $s.='$file=\''.$cmp."';\n";
+	  echo 'Font file compressed ('.$cmp.')<BR>';
 
-      $cmp=$basename.'.ctg.z';
-      SaveToFile($cmp,gzcompress($cidtogidmap),'b');
-      echo 'CIDToGIDMap created and compressed ('.$cmp.')<BR>';     
-      $s.='$ctg=\''.$cmp."';\n";
-    }
-    else
-    {
-      $s.='$file=\''.basename($fontfile)."';\n";
-      echo '<B>Notice:</B> font file could not be compressed (gzcompress not available)<BR>';
+	  $cmp=$basename.'.ctg.z';
+	  SaveToFile($cmp,gzcompress($cidtogidmap),'b');
+	  echo 'CIDToGIDMap created and compressed ('.$cmp.')<BR>';     
+	  $s.='$ctg=\''.$cmp."';\n";
+	}
+	else
+	{
+	  $s.='$file=\''.basename($fontfile)."';\n";
+	  echo '<B>Notice:</B> font file could not be compressed (gzcompress not available)<BR>';
       
-      $cmp=$basename.'.ctg';
-      $f = fopen($cmp, 'wb');
-      fwrite($f, $cidtogidmap);
-      fclose($f);
-      echo 'CIDToGIDMap created ('.$cmp.')<BR>';
-      $s.='$ctg=\''.$cmp."';\n";
-    }
-    if($type=='Type1')
-    {
-      $s.='$size1='.$size1.";\n";
-      $s.='$size2='.$size2.";\n";
-    }
-    else
-      $s.='$originalsize='.filesize($fontfile).";\n";
+	  $cmp=$basename.'.ctg';
+	  $f = fopen($cmp, 'wb');
+	  fwrite($f, $cidtogidmap);
+	  fclose($f);
+	  echo 'CIDToGIDMap created ('.$cmp.')<BR>';
+	  $s.='$ctg=\''.$cmp."';\n";
+	}
+	if($type=='Type1')
+	{
+	  $s.='$size1='.$size1.";\n";
+	  $s.='$size2='.$size2.";\n";
+	}
+	else
+	  $s.='$originalsize='.filesize($fontfile).";\n";
   }
   else
   {
-    //Not embedded font
-    $s.='$file='."'';\n";
+	//Not embedded font
+	$s.='$file='."'';\n";
   }
   $s.="?>\n";
   SaveToFile($basename.'.php',$s);

Spacing +153 added lines, -153 removed lines

@@ -8,73 +8,73 @@ 
 function ReadUFM($file, &$cidtogidmap)
 {
   //Prepare empty CIDToGIDMap
-  $cidtogidmap = str_pad('', 256*256*2, "\x00");
+  $cidtogidmap = str_pad('', 256 * 256 * 2, "\x00");
   
   //Read a font metric file
-  $a=file($file);
-  if(empty($a))
+  $a = file($file);
+  if (empty($a))
     die('File not found');
-  $widths=array();
-  $fm=array();
-  foreach($a as $l)
+  $widths = array();
+  $fm = array();
+  foreach ($a as $l)
   {
-    $e=explode(' ',chop($l));
-    if(count($e)<2)
+    $e = explode(' ', chop($l));
+    if (count($e) < 2)
       continue;
-    $code=$e[0];
-    $param=$e[1];
-    if($code=='U')
+    $code = $e[0];
+    $param = $e[1];
+    if ($code == 'U')
     {
       // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
       //Character metrics
-      $cc=(int)$e[1];
+      $cc = (int)$e[1];
       if ($cc != -1) {
         $gn = $e[7];
         $w = $e[4];
         $glyph = $e[10];
         $widths[$cc] = $w;
-        if($cc == ord('X'))
+        if ($cc == ord('X'))
           $fm['CapXHeight'] = $e[13];
           
         // Set GID
         if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-          $cidtogidmap{$cc*2} = chr($glyph >> 8);
-          $cidtogidmap{$cc*2 + 1} = chr($glyph & 0xFF);
+          $cidtogidmap{$cc * 2} = chr($glyph >> 8);
+          $cidtogidmap{$cc * 2 + 1} = chr($glyph & 0xFF);
         }        
       }
-      if($gn=='.notdef' && !isset($fm['MissingWidth']))
-        $fm['MissingWidth']=$w;
+      if ($gn == '.notdef' && !isset($fm['MissingWidth']))
+        $fm['MissingWidth'] = $w;
     }
-    elseif($code=='FontName')
-      $fm['FontName']=$param;
-    elseif($code=='Weight')
-      $fm['Weight']=$param;
-    elseif($code=='ItalicAngle')
-      $fm['ItalicAngle']=(double)$param;
-    elseif($code=='Ascender')
-      $fm['Ascender']=(int)$param;
-    elseif($code=='Descender')
-      $fm['Descender']=(int)$param;
-    elseif($code=='UnderlineThickness')
-      $fm['UnderlineThickness']=(int)$param;
-    elseif($code=='UnderlinePosition')
-      $fm['UnderlinePosition']=(int)$param;
-    elseif($code=='IsFixedPitch')
-      $fm['IsFixedPitch']=($param=='true');
-    elseif($code=='FontBBox')
-      $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
-    elseif($code=='CapHeight')
-      $fm['CapHeight']=(int)$param;
-    elseif($code=='StdVW')
-      $fm['StdVW']=(int)$param;
+    elseif ($code == 'FontName')
+      $fm['FontName'] = $param;
+    elseif ($code == 'Weight')
+      $fm['Weight'] = $param;
+    elseif ($code == 'ItalicAngle')
+      $fm['ItalicAngle'] = (double)$param;
+    elseif ($code == 'Ascender')
+      $fm['Ascender'] = (int)$param;
+    elseif ($code == 'Descender')
+      $fm['Descender'] = (int)$param;
+    elseif ($code == 'UnderlineThickness')
+      $fm['UnderlineThickness'] = (int)$param;
+    elseif ($code == 'UnderlinePosition')
+      $fm['UnderlinePosition'] = (int)$param;
+    elseif ($code == 'IsFixedPitch')
+      $fm['IsFixedPitch'] = ($param == 'true');
+    elseif ($code == 'FontBBox')
+      $fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
+    elseif ($code == 'CapHeight')
+      $fm['CapHeight'] = (int)$param;
+    elseif ($code == 'StdVW')
+      $fm['StdVW'] = (int)$param;
   }
-  if(!isset($fm['MissingWidth']))
-    $fm['MissingWidth']=600;
+  if (!isset($fm['MissingWidth']))
+    $fm['MissingWidth'] = 600;
 
-  if(!isset($fm['FontName']))
+  if (!isset($fm['FontName']))
     die('FontName not found');
 
-  $fm['Widths']=$widths;
+  $fm['Widths'] = $widths;
   
   return $fm;
 }
@@ -82,125 +82,125 @@ 
 function MakeFontDescriptor($fm)
 {
   //Ascent
-  $asc=(isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-  $fd="array('Ascent'=>".$asc;
+  $asc = (isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
+  $fd = "array('Ascent'=>".$asc;
   //Descent
-  $desc=(isset($fm['Descender']) ? $fm['Descender'] : -200);
-  $fd.=",'Descent'=>".$desc;
+  $desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
+  $fd .= ",'Descent'=>".$desc;
   //CapHeight
-  if(isset($fm['CapHeight']))
-    $ch=$fm['CapHeight'];
-  elseif(isset($fm['CapXHeight']))
-    $ch=$fm['CapXHeight'];
+  if (isset($fm['CapHeight']))
+    $ch = $fm['CapHeight'];
+  elseif (isset($fm['CapXHeight']))
+    $ch = $fm['CapXHeight'];
   else
-    $ch=$asc;
-  $fd.=",'CapHeight'=>".$ch;
+    $ch = $asc;
+  $fd .= ",'CapHeight'=>".$ch;
   //Flags
-  $flags=0;
-  if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch'])
-    $flags+=1<<0;
-  $flags+=1<<5;
-  if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0)
-    $flags+=1<<6;
-  $fd.=",'Flags'=>".$flags;
+  $flags = 0;
+  if (isset($fm['IsFixedPitch']) and $fm['IsFixedPitch'])
+    $flags += 1 << 0;
+  $flags += 1 << 5;
+  if (isset($fm['ItalicAngle']) and $fm['ItalicAngle'] != 0)
+    $flags += 1 << 6;
+  $fd .= ",'Flags'=>".$flags;
   //FontBBox
-  if(isset($fm['FontBBox']))
-    $fbb=$fm['FontBBox'];
+  if (isset($fm['FontBBox']))
+    $fbb = $fm['FontBBox'];
   else
-    $fbb=array(0,$des-100,1000,$asc+100);
-  $fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
+    $fbb = array(0, $des - 100, 1000, $asc + 100);
+  $fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
   //ItalicAngle
-  $ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-  $fd.=",'ItalicAngle'=>".$ia;
+  $ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
+  $fd .= ",'ItalicAngle'=>".$ia;
   //StemV
-  if(isset($fm['StdVW']))
-    $stemv=$fm['StdVW'];
-  elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
-    $stemv=120;
+  if (isset($fm['StdVW']))
+    $stemv = $fm['StdVW'];
+  elseif (isset($fm['Weight']) and eregi('(bold|black)', $fm['Weight']))
+    $stemv = 120;
   else
-    $stemv=70;
-  $fd.=",'StemV'=>".$stemv;
+    $stemv = 70;
+  $fd .= ",'StemV'=>".$stemv;
   //MissingWidth
-  if(isset($fm['MissingWidth']))
-    $fd.=",'MissingWidth'=>".$fm['MissingWidth'];
-  $fd.=')';
+  if (isset($fm['MissingWidth']))
+    $fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
+  $fd .= ')';
   return $fd;
 }
 
 function MakeWidthArray($fm)
 {
   //Make character width array
-  $s="array(";
-  $cw=$fm['Widths'];
-  $els=array();
-  $c=0;
+  $s = "array(";
+  $cw = $fm['Widths'];
+  $els = array();
+  $c = 0;
   foreach ($cw as $i => $w)
   {
-    $els[] = ((($c++)%16==0)?"\n\t":'').$i.'=>'.$w;
+    $els[] = ((($c++) % 16 == 0) ? "\n\t" : '').$i.'=>'.$w;
   }
   $s .= implode(', ', $els);
-  $s.=')';
+  $s .= ')';
   return $s;
 }
 
-function SaveToFile($file,$s,$mode='t')
+function SaveToFile($file, $s, $mode = 't')
 {
-  $f=fopen($file,'w'.$mode);
-  if(!$f)
+  $f = fopen($file, 'w'.$mode);
+  if (!$f)
     die('Can\'t write to file '.$file);
-  fwrite($f,$s,strlen($s));
+  fwrite($f, $s, strlen($s));
   fclose($f);
 }
 
 function ReadShort($f)
 {
-  $a=unpack('n1n',fread($f,2));
+  $a = unpack('n1n', fread($f, 2));
   return $a['n'];
 }
 
 function ReadLong($f)
 {
-  $a=unpack('N1N',fread($f,4));
+  $a = unpack('N1N', fread($f, 4));
   return $a['N'];
 }
 
 function CheckTTF($file)
 {
   //Check if font license allows embedding
-  $f=fopen($file,'rb');
-  if(!$f)
+  $f = fopen($file, 'rb');
+  if (!$f)
     die('<B>Error:</B> Can\'t open '.$file);
   //Extract number of tables
-  fseek($f,4,SEEK_CUR);
-  $nb=ReadShort($f);
-  fseek($f,6,SEEK_CUR);
+  fseek($f, 4, SEEK_CUR);
+  $nb = ReadShort($f);
+  fseek($f, 6, SEEK_CUR);
   //Seek OS/2 table
-  $found=false;
-  for($i=0;$i<$nb;$i++)
+  $found = false;
+  for ($i = 0; $i < $nb; $i++)
   {
-    if(fread($f,4)=='OS/2')
+    if (fread($f, 4) == 'OS/2')
     {
-      $found=true;
+      $found = true;
       break;
     }
-    fseek($f,12,SEEK_CUR);
+    fseek($f, 12, SEEK_CUR);
   }
-  if(!$found)
+  if (!$found)
   {
     fclose($f);
     return;
   }
-  fseek($f,4,SEEK_CUR);
-  $offset=ReadLong($f);
-  fseek($f,$offset,SEEK_SET);
+  fseek($f, 4, SEEK_CUR);
+  $offset = ReadLong($f);
+  fseek($f, $offset, SEEK_SET);
   //Extract fsType flags
-  fseek($f,8,SEEK_CUR);
-  $fsType=ReadShort($f);
-  $rl=($fsType & 0x02)!=0;
-  $pp=($fsType & 0x04)!=0;
-  $e=($fsType & 0x08)!=0;
+  fseek($f, 8, SEEK_CUR);
+  $fsType = ReadShort($f);
+  $rl = ($fsType & 0x02) != 0;
+  $pp = ($fsType & 0x04) != 0;
+  $e = ($fsType & 0x08) != 0;
   fclose($f);
-  if($rl and !$pp and !$e)
+  if ($rl and !$pp and !$e)
     echo '<B>Warning:</B> font license does not allow embedding';
 }
 
@@ -208,95 +208,95 @@ 
 * $fontfile: path to TTF file (or empty string if not to be embedded)          *
 * $ufmfile:  path to UFM file                                                  *
 *******************************************************************************/
-function MakeFont($fontfile,$ufmfile)
+function MakeFont($fontfile, $ufmfile)
 {
   //Generate a font definition file
   set_magic_quotes_runtime(0);
-  if(!file_exists($ufmfile))
+  if (!file_exists($ufmfile))
     die('<B>Error:</B> UFM file not found: '.$ufmfile);
   $cidtogidmap = '';
-  $fm=ReadUFM($ufmfile, $cidtogidmap);
-  $fd=MakeFontDescriptor($fm);
+  $fm = ReadUFM($ufmfile, $cidtogidmap);
+  $fd = MakeFontDescriptor($fm);
   //Find font type
-  if($fontfile)
+  if ($fontfile)
   {
-    $ext=strtolower(substr($fontfile,-3));
-    if($ext=='ttf')
-      $type='TrueTypeUnicode';
+    $ext = strtolower(substr($fontfile, -3));
+    if ($ext == 'ttf')
+      $type = 'TrueTypeUnicode';
     else
       die('<B>Error:</B> not a truetype font: '.$ext);
   }
   else
   {
-    if($type!='TrueTypeUnicode')
+    if ($type != 'TrueTypeUnicode')
       die('<B>Error:</B> incorrect font type: '.$type);
   }
   //Start generation
-  $s='<?php'."\n";
-  $s.='$type=\''.$type."';\n";
-  $s.='$name=\''.$fm['FontName']."';\n";
-  $s.='$desc='.$fd.";\n";
-  if(!isset($fm['UnderlinePosition']))
-    $fm['UnderlinePosition']=-100;
-  if(!isset($fm['UnderlineThickness']))
-    $fm['UnderlineThickness']=50;
-  $s.='$up='.$fm['UnderlinePosition'].";\n";
-  $s.='$ut='.$fm['UnderlineThickness'].";\n";
-  $w=MakeWidthArray($fm);
-  $s.='$cw='.$w.";\n";
-  $s.="\$enc='';\n";
-  $s.="\$diff='';\n";
-  $basename=substr(basename($ufmfile),0,-4);
-  if($fontfile)
+  $s = '<?php'."\n";
+  $s .= '$type=\''.$type."';\n";
+  $s .= '$name=\''.$fm['FontName']."';\n";
+  $s .= '$desc='.$fd.";\n";
+  if (!isset($fm['UnderlinePosition']))
+    $fm['UnderlinePosition'] = -100;
+  if (!isset($fm['UnderlineThickness']))
+    $fm['UnderlineThickness'] = 50;
+  $s .= '$up='.$fm['UnderlinePosition'].";\n";
+  $s .= '$ut='.$fm['UnderlineThickness'].";\n";
+  $w = MakeWidthArray($fm);
+  $s .= '$cw='.$w.";\n";
+  $s .= "\$enc='';\n";
+  $s .= "\$diff='';\n";
+  $basename = substr(basename($ufmfile), 0, -4);
+  if ($fontfile)
   {
     //Embedded font
-    if(!file_exists($fontfile))
+    if (!file_exists($fontfile))
       die('<B>Error:</B> font file not found: '.$fontfile);
     CheckTTF($fontfile);
-    $f=fopen($fontfile,'rb');
-    if(!$f)
+    $f = fopen($fontfile, 'rb');
+    if (!$f)
       die('<B>Error:</B> Can\'t open '.$fontfile);
-    $file=fread($f,filesize($fontfile));
+    $file = fread($f, filesize($fontfile));
     fclose($f);
-    if(function_exists('gzcompress'))
+    if (function_exists('gzcompress'))
     {
-      $cmp=$basename.'.z';
-      SaveToFile($cmp,gzcompress($file),'b');
-      $s.='$file=\''.$cmp."';\n";
+      $cmp = $basename.'.z';
+      SaveToFile($cmp, gzcompress($file), 'b');
+      $s .= '$file=\''.$cmp."';\n";
       echo 'Font file compressed ('.$cmp.')<BR>';
 
-      $cmp=$basename.'.ctg.z';
-      SaveToFile($cmp,gzcompress($cidtogidmap),'b');
+      $cmp = $basename.'.ctg.z';
+      SaveToFile($cmp, gzcompress($cidtogidmap), 'b');
       echo 'CIDToGIDMap created and compressed ('.$cmp.')<BR>';     
-      $s.='$ctg=\''.$cmp."';\n";
+      $s .= '$ctg=\''.$cmp."';\n";
     }
     else
     {
-      $s.='$file=\''.basename($fontfile)."';\n";
+      $s .= '$file=\''.basename($fontfile)."';\n";
       echo '<B>Notice:</B> font file could not be compressed (gzcompress not available)<BR>';
       
-      $cmp=$basename.'.ctg';
+      $cmp = $basename.'.ctg';
       $f = fopen($cmp, 'wb');
       fwrite($f, $cidtogidmap);
       fclose($f);
       echo 'CIDToGIDMap created ('.$cmp.')<BR>';
-      $s.='$ctg=\''.$cmp."';\n";
+      $s .= '$ctg=\''.$cmp."';\n";
     }
-    if($type=='Type1')
+    if ($type == 'Type1')
     {
-      $s.='$size1='.$size1.";\n";
-      $s.='$size2='.$size2.";\n";
+      $s .= '$size1='.$size1.";\n";
+      $s .= '$size2='.$size2.";\n";
     }
     else
-      $s.='$originalsize='.filesize($fontfile).";\n";
+      $s .= '$originalsize='.filesize($fontfile).";\n";
   }
   else
   {
     //Not embedded font
-    $s.='$file='."'';\n";
+    $s .= '$file='."'';\n";
   }
-  $s.="?>\n";
-  SaveToFile($basename.'.php',$s);
+  $s .= "?>\n";
+  SaveToFile($basename.'.php', $s);
   echo 'Font definition file generated ('.$basename.'.php'.')<BR>';
 }
 

Braces +107 added lines, -89 removed lines

@@ -12,15 +12,17 @@ 
   
   //Read a font metric file
   $a=file($file);
-  if(empty($a))
-    die('File not found');
+  if(empty($a)) {
+      die('File not found');
+  }
   $widths=array();
   $fm=array();
   foreach($a as $l)
   {
     $e=explode(' ',chop($l));
-    if(count($e)<2)
-      continue;
+    if(count($e)<2) {
+          continue;
+    }
     $code=$e[0];
     $param=$e[1];
     if($code=='U')
@@ -33,8 +35,9 @@ 
         $w = $e[4];
         $glyph = $e[10];
         $widths[$cc] = $w;
-        if($cc == ord('X'))
-          $fm['CapXHeight'] = $e[13];
+        if($cc == ord('X')) {
+                  $fm['CapXHeight'] = $e[13];
+        }
           
         // Set GID
         if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
@@ -42,37 +45,40 @@ 
           $cidtogidmap{$cc*2 + 1} = chr($glyph & 0xFF);
         }        
       }
-      if($gn=='.notdef' && !isset($fm['MissingWidth']))
-        $fm['MissingWidth']=$w;
+      if($gn=='.notdef' && !isset($fm['MissingWidth'])) {
+              $fm['MissingWidth']=$w;
+      }
+    } elseif($code=='FontName') {
+          $fm['FontName']=$param;
+    } elseif($code=='Weight') {
+          $fm['Weight']=$param;
+    } elseif($code=='ItalicAngle') {
+          $fm['ItalicAngle']=(double)$param;
+    } elseif($code=='Ascender') {
+          $fm['Ascender']=(int)$param;
+    } elseif($code=='Descender') {
+          $fm['Descender']=(int)$param;
+    } elseif($code=='UnderlineThickness') {
+          $fm['UnderlineThickness']=(int)$param;
+    } elseif($code=='UnderlinePosition') {
+          $fm['UnderlinePosition']=(int)$param;
+    } elseif($code=='IsFixedPitch') {
+          $fm['IsFixedPitch']=($param=='true');
+    } elseif($code=='FontBBox') {
+          $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
+    } elseif($code=='CapHeight') {
+          $fm['CapHeight']=(int)$param;
+    } elseif($code=='StdVW') {
+          $fm['StdVW']=(int)$param;
     }
-    elseif($code=='FontName')
-      $fm['FontName']=$param;
-    elseif($code=='Weight')
-      $fm['Weight']=$param;
-    elseif($code=='ItalicAngle')
-      $fm['ItalicAngle']=(double)$param;
-    elseif($code=='Ascender')
-      $fm['Ascender']=(int)$param;
-    elseif($code=='Descender')
-      $fm['Descender']=(int)$param;
-    elseif($code=='UnderlineThickness')
-      $fm['UnderlineThickness']=(int)$param;
-    elseif($code=='UnderlinePosition')
-      $fm['UnderlinePosition']=(int)$param;
-    elseif($code=='IsFixedPitch')
-      $fm['IsFixedPitch']=($param=='true');
-    elseif($code=='FontBBox')
-      $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
-    elseif($code=='CapHeight')
-      $fm['CapHeight']=(int)$param;
-    elseif($code=='StdVW')
-      $fm['StdVW']=(int)$param;
   }
-  if(!isset($fm['MissingWidth']))
-    $fm['MissingWidth']=600;
+  if(!isset($fm['MissingWidth'])) {
+      $fm['MissingWidth']=600;
+  }
 
-  if(!isset($fm['FontName']))
-    die('FontName not found');
+  if(!isset($fm['FontName'])) {
+      die('FontName not found');
+  }
 
   $fm['Widths']=$widths;
   
@@ -88,41 +94,47 @@ 
   $desc=(isset($fm['Descender']) ? $fm['Descender'] : -200);
   $fd.=",'Descent'=>".$desc;
   //CapHeight
-  if(isset($fm['CapHeight']))
-    $ch=$fm['CapHeight'];
-  elseif(isset($fm['CapXHeight']))
-    $ch=$fm['CapXHeight'];
-  else
-    $ch=$asc;
+  if(isset($fm['CapHeight'])) {
+      $ch=$fm['CapHeight'];
+  } elseif(isset($fm['CapXHeight'])) {
+      $ch=$fm['CapXHeight'];
+  } else {
+      $ch=$asc;
+  }
   $fd.=",'CapHeight'=>".$ch;
   //Flags
   $flags=0;
-  if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch'])
-    $flags+=1<<0;
+  if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch']) {
+      $flags+=1<<0;
+  }
   $flags+=1<<5;
-  if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0)
-    $flags+=1<<6;
+  if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0) {
+      $flags+=1<<6;
+  }
   $fd.=",'Flags'=>".$flags;
   //FontBBox
-  if(isset($fm['FontBBox']))
-    $fbb=$fm['FontBBox'];
-  else
-    $fbb=array(0,$des-100,1000,$asc+100);
+  if(isset($fm['FontBBox'])) {
+      $fbb=$fm['FontBBox'];
+  } else {
+      $fbb=array(0,$des-100,1000,$asc+100);
+  }
   $fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
   //ItalicAngle
   $ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
   $fd.=",'ItalicAngle'=>".$ia;
   //StemV
-  if(isset($fm['StdVW']))
-    $stemv=$fm['StdVW'];
-  elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
-    $stemv=120;
-  else
-    $stemv=70;
+  if(isset($fm['StdVW'])) {
+      $stemv=$fm['StdVW'];
+  } elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight'])) {
+      $stemv=120;
+  } else {
+      $stemv=70;
+  }
   $fd.=",'StemV'=>".$stemv;
   //MissingWidth
-  if(isset($fm['MissingWidth']))
-    $fd.=",'MissingWidth'=>".$fm['MissingWidth'];
+  if(isset($fm['MissingWidth'])) {
+      $fd.=",'MissingWidth'=>".$fm['MissingWidth'];
+  }
   $fd.=')';
   return $fd;
 }
@@ -146,8 +158,9 @@ 
 function SaveToFile($file,$s,$mode='t')
 {
   $f=fopen($file,'w'.$mode);
-  if(!$f)
-    die('Can\'t write to file '.$file);
+  if(!$f) {
+      die('Can\'t write to file '.$file);
+  }
   fwrite($f,$s,strlen($s));
   fclose($f);
 }
@@ -168,8 +181,9 @@ 
 {
   //Check if font license allows embedding
   $f=fopen($file,'rb');
-  if(!$f)
-    die('<B>Error:</B> Can\'t open '.$file);
+  if(!$f) {
+      die('<B>Error:</B> Can\'t open '.$file);
+  }
   //Extract number of tables
   fseek($f,4,SEEK_CUR);
   $nb=ReadShort($f);
@@ -200,9 +214,10 @@ 
   $pp=($fsType & 0x04)!=0;
   $e=($fsType & 0x08)!=0;
   fclose($f);
-  if($rl and !$pp and !$e)
-    echo '<B>Warning:</B> font license does not allow embedding';
-}
+  if($rl and !$pp and !$e) {
+      echo '<B>Warning:</B> font license does not allow embedding';
+  }
+  }
 
 /*******************************************************************************
 * $fontfile: path to TTF file (or empty string if not to be embedded)          *
@@ -212,8 +227,9 @@ 
 {
   //Generate a font definition file
   set_magic_quotes_runtime(0);
-  if(!file_exists($ufmfile))
-    die('<B>Error:</B> UFM file not found: '.$ufmfile);
+  if(!file_exists($ufmfile)) {
+      die('<B>Error:</B> UFM file not found: '.$ufmfile);
+  }
   $cidtogidmap = '';
   $fm=ReadUFM($ufmfile, $cidtogidmap);
   $fd=MakeFontDescriptor($fm);
@@ -221,25 +237,28 @@ 
   if($fontfile)
   {
     $ext=strtolower(substr($fontfile,-3));
-    if($ext=='ttf')
-      $type='TrueTypeUnicode';
-    else
-      die('<B>Error:</B> not a truetype font: '.$ext);
-  }
-  else
+    if($ext=='ttf') {
+          $type='TrueTypeUnicode';
+    } else {
+          die('<B>Error:</B> not a truetype font: '.$ext);
+    }
+  } else
   {
-    if($type!='TrueTypeUnicode')
-      die('<B>Error:</B> incorrect font type: '.$type);
+    if($type!='TrueTypeUnicode') {
+          die('<B>Error:</B> incorrect font type: '.$type);
+    }
   }
   //Start generation
   $s='<?php'."\n";
   $s.='$type=\''.$type."';\n";
   $s.='$name=\''.$fm['FontName']."';\n";
   $s.='$desc='.$fd.";\n";
-  if(!isset($fm['UnderlinePosition']))
-    $fm['UnderlinePosition']=-100;
-  if(!isset($fm['UnderlineThickness']))
-    $fm['UnderlineThickness']=50;
+  if(!isset($fm['UnderlinePosition'])) {
+      $fm['UnderlinePosition']=-100;
+  }
+  if(!isset($fm['UnderlineThickness'])) {
+      $fm['UnderlineThickness']=50;
+  }
   $s.='$up='.$fm['UnderlinePosition'].";\n";
   $s.='$ut='.$fm['UnderlineThickness'].";\n";
   $w=MakeWidthArray($fm);
@@ -250,12 +269,14 @@ 
   if($fontfile)
   {
     //Embedded font
-    if(!file_exists($fontfile))
-      die('<B>Error:</B> font file not found: '.$fontfile);
+    if(!file_exists($fontfile)) {
+          die('<B>Error:</B> font file not found: '.$fontfile);
+    }
     CheckTTF($fontfile);
     $f=fopen($fontfile,'rb');
-    if(!$f)
-      die('<B>Error:</B> Can\'t open '.$fontfile);
+    if(!$f) {
+          die('<B>Error:</B> Can\'t open '.$fontfile);
+    }
     $file=fread($f,filesize($fontfile));
     fclose($f);
     if(function_exists('gzcompress'))
@@ -269,8 +290,7 @@ 
       SaveToFile($cmp,gzcompress($cidtogidmap),'b');
       echo 'CIDToGIDMap created and compressed ('.$cmp.')<BR>';     
       $s.='$ctg=\''.$cmp."';\n";
-    }
-    else
+    } else
     {
       $s.='$file=\''.basename($fontfile)."';\n";
       echo '<B>Notice:</B> font file could not be compressed (gzcompress not available)<BR>';
@@ -286,11 +306,10 @@ 
     {
       $s.='$size1='.$size1.";\n";
       $s.='$size2='.$size2.";\n";
+    } else {
+          $s.='$originalsize='.filesize($fontfile).";\n";
     }
-    else
-      $s.='$originalsize='.filesize($fontfile).";\n";
-  }
-  else
+  } else
   {
     //Not embedded font
     $s.='$file='."'';\n";
@@ -307,8 +326,7 @@ 
   MakeFont($arg[0], $arg[1]);
   $t = ob_get_clean();
   print preg_replace('!<BR( /)?>!i', "\n", $t);
-}
-else {
+} else {
   print "Usage: makefontuni.php <ttf-file> <ufm-file>\n";
 }
 ?>
\ No newline at end of file

pdf/tcpdf.php

Doc Comments +21 added lines, -14 removed lines

@@ -981,7 +981,7 @@ 
 		* Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.
 		* @param float $left Left margin.
 		* @param float $top Top margin.
-		* @param float $right Right margin. Default value is the left one.
+		* @param integer $right Right margin. Default value is the left one.
 		* @since 1.0
 		* @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
 		*/
@@ -1034,7 +1034,7 @@ 
 		/**
 		* Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
 		* @param boolean $auto Boolean indicating if mode should be on or off.
-		* @param float $margin Distance from the bottom of the page.
+		* @param integer $margin Distance from the bottom of the page.
 		* @since 1.0
 		* @see Cell(), MultiCell(), AcceptPageBreak()
 		*/
@@ -1047,7 +1047,7 @@ 
 
 		/**
 		* Defines the way the document is to be displayed by the viewer. The zoom level can be set: pages can be displayed entirely on screen, occupy the full width of the window, use real size, be scaled by a specific zooming factor or use viewer default (configured in the Preferences menu of Acrobat). The page layout can be specified too: single at once, continuous display, two columns or viewer default. By default, documents use the full width mode with continuous display.
-		* @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
+		* @param string $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
 		* @param string $layout The page layout. Possible values are:<ul><li>single: displays one page at once</li><li>continuous: displays pages continuously (default)</li><li>two: displays two pages on two columns</li><li>default: uses viewer default mode</li></ul>
 		* @since 1.2
 		*/
@@ -1289,7 +1289,7 @@ 
 		/**
 	 	 * Set header data.
 		 * @param string $ln header image logo
-		 * @param string $lw header image logo width in mm
+		 * @param integer $lw header image logo width in mm
 		 * @param string $ht string to print as title on document header
 		 * @param string $hs string to print on document header
 		*/
@@ -1328,7 +1328,7 @@ 
 
 		/**
 	 	 * Set a flag to print page footer.
-		 * @param boolean $value set to true to print the page footer (default), false otherwise.
+		 * @param boolean $val set to true to print the page footer (default), false otherwise.
 		*/
 		function setPrintFooter($val=true) {
 			$this->print_footer = $val;
@@ -1713,7 +1713,7 @@ 
 		* If the file corresponding to the requested font is not found, the error "Could not include font metric file" is generated.
 		* @param string $family Family font. It can be either a name defined by AddFont() or one of the standard families (case insensitive):<ul><li>Courier (fixed-width)</li><li>Helvetica or Arial (synonymous; sans serif)</li><li>Times (serif)</li><li>Symbol (symbolic)</li><li>ZapfDingbats (symbolic)</li></ul>It is also possible to pass an empty string. In that case, the current family is retained.
 		* @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li></ul>or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats
-		* @param float $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
+		* @param integer $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
 		* @since 1.0
 		* @see AddFont(), SetFontSize(), Cell(), MultiCell(), Write()
 		*/
@@ -1844,7 +1844,7 @@ 
 		/**
 		* Defines the page and position a link points to
 		* @param int $link The link identifier returned by AddLink()
-		* @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
+		* @param integer $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
 		* @param int $page Number of target page; -1 indicates the current page. This is the default value
 		* @since 1.5
 		* @see AddLink()
@@ -1949,9 +1949,9 @@ 
 		* Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
 		* If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
 		* @param float $w Cell width. If 0, the cell extends up to the right margin.
-		* @param float $h Cell height. Default value: 0.
+		* @param integer $h Cell height. Default value: 0.
 		* @param string $txt String to print. Default value: empty string.
-		* @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+		* @param integer $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
 		* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
 		Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
 		* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li></ul>
@@ -2055,7 +2055,7 @@ 
 		* @param float $w Width of cells. If 0, they extend up to the right margin of the page.
 		* @param float $h Height of cells.
 		* @param string $txt String to print
-		* @param mixed $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+		* @param integer $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
 		* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value)</li></ul>
 		* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
 		* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
@@ -2205,7 +2205,7 @@ 
 		* </pre>
 		* @param float $h Line height
 		* @param string $txt String to print
-		* @param mixed $link URL or identifier returned by AddLink()
+		* @param string $link URL or identifier returned by AddLink()
 		* @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
 		* @since 1.5
 		* @see SetFont(), SetTextColor(), AddLink(), MultiCell(), SetAutoPageBreak()
@@ -2311,8 +2311,8 @@ 
 		* @param string $file Name of the file containing the image.
 		* @param float $x Abscissa of the upper-left corner.
 		* @param float $y Ordinate of the upper-left corner.
-		* @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		* @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+		* @param integer $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+		* @param integer $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
 		* @param string $type Image format. Possible values are (case insensitive): JPG, JPEG, PNG. If not specified, the type is inferred from the file extension.
 		* @param mixed $link URL or identifier returned by AddLink().
 		* @since 1.1
@@ -2983,6 +2983,7 @@ 
 		/**
 		* _beginpage
 		* @access protected
+		* @param string $orientation
 		*/
 		function _beginpage($orientation) {
 			$this->page++;
@@ -3041,6 +3042,8 @@ 
 		/**
 		* Underline text
 		* @access protected
+		* @param double $y
+		* @param string $txt
 		*/
 		function _dounderline($x,$y,$txt) {
 			$up = $this->CurrentFont['up'];
@@ -3052,6 +3055,7 @@ 
 		/**
 		* Extract info from a JPEG file
 		* @access protected
+		* @param string $file
 		*/
 		function _parsejpg($file) {
 			$a=GetImageSize($file);
@@ -3084,6 +3088,7 @@ 
 		/**
 		* Extract info from a PNG file
 		* @access protected
+		* @param string $file
 		*/
 		function _parsepng($file) {
 			$f=fopen($file,'rb');
@@ -3181,6 +3186,7 @@ 
 		/**
 		* Read a 4-byte integer from file
 		* @access protected
+		* @param resource $f
 		*/
 		function _freadint($f) {
 			//Read a 4-byte integer from file
@@ -3203,6 +3209,7 @@ 
 		/**
 		* Format a text string
 		* @access protected
+		* @param string $s
 		*/
 		function _escapetext($s) {
 			if($this->isunicode) {
@@ -3722,7 +3729,7 @@ 
 		 * @param float $x upper-left corner X coordinate
 		 * @param float $y upper-left corner Y coordinate
 		 * @param string $html html text to print. Default value: empty string.
-		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+		 * @param integer $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
 		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
 	Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
 		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.

Indentation +753 added lines, -753 removed lines

@@ -73,400 +73,400 @@ 
 	define('PDF_PRODUCER','Instant Zero (http://www.instant-zero.com)');
 
 	/**
-	* This is a PHP4 class for generating PDF files on-the-fly without requiring external extensions.<br>
-	* This class is an extension and improvement of the FPDF class by Olivier Plathey (http://www.fpdf.org).<br>
-	* This version contains some changes: [porting to PHP4, support for UTF-8 Unicode, code style and formatting, php documentation (www.phpdoc.org), ISO page formats, minor improvements, image scale factor]<br>
-	* TCPDF project (http://tcpdf.sourceforge.net) is based on the public Domain FPDF class by Olivier Plathey (http://www.fpdf.org).<br>
-	* To add your own TTF fonts please read /fonts/README.TXT
-	* @name TCPDF
-	* @package com.tecnick.tcpdf
-	* @version 1.53.0.TC031_PHP4
-	* @author Nicola Asuni
-	* @link http://tcpdf.sourceforge.net
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
+	 * This is a PHP4 class for generating PDF files on-the-fly without requiring external extensions.<br>
+	 * This class is an extension and improvement of the FPDF class by Olivier Plathey (http://www.fpdf.org).<br>
+	 * This version contains some changes: [porting to PHP4, support for UTF-8 Unicode, code style and formatting, php documentation (www.phpdoc.org), ISO page formats, minor improvements, image scale factor]<br>
+	 * TCPDF project (http://tcpdf.sourceforge.net) is based on the public Domain FPDF class by Olivier Plathey (http://www.fpdf.org).<br>
+	 * To add your own TTF fonts please read /fonts/README.TXT
+	 * @name TCPDF
+	 * @package com.tecnick.tcpdf
+	 * @version 1.53.0.TC031_PHP4
+	 * @author Nicola Asuni
+	 * @link http://tcpdf.sourceforge.net
+	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
+	 */
 	class TCPDF {
 		//var properties
 
 		/**
-		* @var current page number
-		* @access protected
-		*/
+		 * @var current page number
+		 * @access protected
+		 */
 		var $page;
 
 		/**
-		* @var current object number
-		* @access protected
-		*/
+		 * @var current object number
+		 * @access protected
+		 */
 		var $n;
 
 		/**
-		* @var array of object offsets
-		* @access protected
-		*/
+		 * @var array of object offsets
+		 * @access protected
+		 */
 		var $offsets;
 
 		/**
-		* @var buffer holding in-memory PDF
-		* @access protected
-		*/
+		 * @var buffer holding in-memory PDF
+		 * @access protected
+		 */
 		var $buffer;
 
 		/**
-		* @var array containing pages
-		* @access protected
-		*/
+		 * @var array containing pages
+		 * @access protected
+		 */
 		var $pages;
 
 		/**
-		* @var current document state
-		* @access protected
-		*/
+		 * @var current document state
+		 * @access protected
+		 */
 		var $state;
 
 		/**
-		* @var compression flag
-		* @access protected
-		*/
+		 * @var compression flag
+		 * @access protected
+		 */
 		var $compress;
 
 		/**
-		* @var default orientation
-		* @access protected
-		*/
+		 * @var default orientation
+		 * @access protected
+		 */
 		var $DefOrientation;
 
 		/**
-		* @var current orientation
-		* @access protected
-		*/
+		 * @var current orientation
+		 * @access protected
+		 */
 		var $CurOrientation;
 
 		/**
-		* @var array indicating orientation changes
-		* @access protected
-		*/
+		 * @var array indicating orientation changes
+		 * @access protected
+		 */
 		var $OrientationChanges;
 
 		/**
-		* @var scale factor (number of points in user unit)
-		* @access protected
-		*/
+		 * @var scale factor (number of points in user unit)
+		 * @access protected
+		 */
 		var $k;
 
 		/**
-		* @var width of page format in points
-		* @access protected
-		*/
+		 * @var width of page format in points
+		 * @access protected
+		 */
 		var $fwPt;
 
 		/**
-		* @var height of page format in points
-		* @access protected
-		*/
+		 * @var height of page format in points
+		 * @access protected
+		 */
 		var $fhPt;
 
 		/**
-		* @var width of page format in user unit
-		* @access protected
-		*/
+		 * @var width of page format in user unit
+		 * @access protected
+		 */
 		var $fw;
 
 		/**
-		* @var height of page format in user unit
-		* @access protected
-		*/
+		 * @var height of page format in user unit
+		 * @access protected
+		 */
 		var $fh;
 
 		/**
-		* @var current width of page in points
-		* @access protected
-		*/
+		 * @var current width of page in points
+		 * @access protected
+		 */
 		var $wPt;
 
 		/**
-		* @var current height of page in points
-		* @access protected
-		*/
+		 * @var current height of page in points
+		 * @access protected
+		 */
 		var $hPt;
 
 		/**
-		* @var current width of page in user unit
-		* @access protected
-		*/
+		 * @var current width of page in user unit
+		 * @access protected
+		 */
 		var $w;
 
 		/**
-		* @var current height of page in user unit
-		* @access protected
-		*/
+		 * @var current height of page in user unit
+		 * @access protected
+		 */
 		var $h;
 
 		/**
-		* @var left margin
-		* @access protected
-		*/
+		 * @var left margin
+		 * @access protected
+		 */
 		var $lMargin;
 
 		/**
-		* @var top margin
-		* @access protected
-		*/
+		 * @var top margin
+		 * @access protected
+		 */
 		var $tMargin;
 
 		/**
-		* @var right margin
-		* @access protected
-		*/
+		 * @var right margin
+		 * @access protected
+		 */
 		var $rMargin;
 
 		/**
-		* @var page break margin
-		* @access protected
-		*/
+		 * @var page break margin
+		 * @access protected
+		 */
 		var $bMargin;
 
 		/**
-		* @var cell margin
-		* @access protected
-		*/
+		 * @var cell margin
+		 * @access protected
+		 */
 		var $cMargin;
 
 		/**
-		* @var current horizontal position in user unit for cell positioning
-		* @access protected
-		*/
+		 * @var current horizontal position in user unit for cell positioning
+		 * @access protected
+		 */
 		var $x;
 
 		/**
-		* @var current vertical position in user unit for cell positioning
-		* @access protected
-		*/
+		 * @var current vertical position in user unit for cell positioning
+		 * @access protected
+		 */
 		var $y;
 
 		/**
-		* @var height of last cell printed
-		* @access protected
-		*/
+		 * @var height of last cell printed
+		 * @access protected
+		 */
 		var $lasth;
 
 		/**
-		* @var line width in user unit
-		* @access protected
-		*/
+		 * @var line width in user unit
+		 * @access protected
+		 */
 		var $LineWidth;
 
 		/**
-		* @var array of standard font names
-		* @access protected
-		*/
+		 * @var array of standard font names
+		 * @access protected
+		 */
 		var $CoreFonts;
 
 		/**
-		* @var array of used fonts
-		* @access protected
-		*/
+		 * @var array of used fonts
+		 * @access protected
+		 */
 		var $fonts;
 
 		/**
-		* @var array of font files
-		* @access protected
-		*/
+		 * @var array of font files
+		 * @access protected
+		 */
 		var $FontFiles;
 
 		/**
-		* @var array of encoding differences
-		* @access protected
-		*/
+		 * @var array of encoding differences
+		 * @access protected
+		 */
 		var $diffs;
 
 		/**
-		* @var array of used images
-		* @access protected
-		*/
+		 * @var array of used images
+		 * @access protected
+		 */
 		var $images;
 
 		/**
-		* @var array of links in pages
-		* @access protected
-		*/
+		 * @var array of links in pages
+		 * @access protected
+		 */
 		var $PageLinks;
 
 		/**
-		* @var array of internal links
-		* @access protected
-		*/
+		 * @var array of internal links
+		 * @access protected
+		 */
 		var $links;
 
 		/**
-		* @var current font family
-		* @access protected
-		*/
+		 * @var current font family
+		 * @access protected
+		 */
 		var $FontFamily;
 
 		/**
-		* @var current font style
-		* @access protected
-		*/
+		 * @var current font style
+		 * @access protected
+		 */
 		var $FontStyle;
 
 		/**
-		* @var underlining flag
-		* @access protected
-		*/
+		 * @var underlining flag
+		 * @access protected
+		 */
 		var $underline;
 
 		/**
-		* @var current font info
-		* @access protected
-		*/
+		 * @var current font info
+		 * @access protected
+		 */
 		var $CurrentFont;
 
 		/**
-		* @var current font size in points
-		* @access protected
-		*/
+		 * @var current font size in points
+		 * @access protected
+		 */
 		var $FontSizePt;
 
 		/**
-		* @var current font size in user unit
-		* @access protected
-		*/
+		 * @var current font size in user unit
+		 * @access protected
+		 */
 		var $FontSize;
 
 		/**
-		* @var commands for drawing color
-		* @access protected
-		*/
+		 * @var commands for drawing color
+		 * @access protected
+		 */
 		var $DrawColor;
 
 		/**
-		* @var commands for filling color
-		* @access protected
-		*/
+		 * @var commands for filling color
+		 * @access protected
+		 */
 		var $FillColor;
 
 		/**
-		* @var commands for text color
-		* @access protected
-		*/
+		 * @var commands for text color
+		 * @access protected
+		 */
 		var $TextColor;
 
 		/**
-		* @var indicates whether fill and text colors are different
-		* @access protected
-		*/
+		 * @var indicates whether fill and text colors are different
+		 * @access protected
+		 */
 		var $ColorFlag;
 
 		/**
-		* @var word spacing
-		* @access protected
-		*/
+		 * @var word spacing
+		 * @access protected
+		 */
 		var $ws;
 
 		/**
-		* @var automatic page breaking
-		* @access protected
-		*/
+		 * @var automatic page breaking
+		 * @access protected
+		 */
 		var $AutoPageBreak;
 
 		/**
-		* @var threshold used to trigger page breaks
-		* @access protected
-		*/
+		 * @var threshold used to trigger page breaks
+		 * @access protected
+		 */
 		var $PageBreakTrigger;
 
 		/**
-		* @var flag set when processing footer
-		* @access protected
-		*/
+		 * @var flag set when processing footer
+		 * @access protected
+		 */
 		var $InFooter;
 
 		/**
-		* @var zoom display mode
-		* @access protected
-		*/
+		 * @var zoom display mode
+		 * @access protected
+		 */
 		var $ZoomMode;
 
 		/**
-		* @var layout display mode
-		* @access protected
-		*/
+		 * @var layout display mode
+		 * @access protected
+		 */
 		var $LayoutMode;
 
 		/**
-		* @var title
-		* @access protected
-		*/
+		 * @var title
+		 * @access protected
+		 */
 		var $title;
 
 		/**
-		* @var subject
-		* @access protected
-		*/
+		 * @var subject
+		 * @access protected
+		 */
 		var $subject;
 
 		/**
-		* @var author
-		* @access protected
-		*/
+		 * @var author
+		 * @access protected
+		 */
 		var $author;
 
 		/**
-		* @var keywords
-		* @access protected
-		*/
+		 * @var keywords
+		 * @access protected
+		 */
 		var $keywords;
 
 		/**
-		* @var creator
-		* @access protected
-		*/
+		 * @var creator
+		 * @access protected
+		 */
 		var $creator;
 
 		/**
-		* @var alias for total number of pages
-		* @access protected
-		*/
+		 * @var alias for total number of pages
+		 * @access protected
+		 */
 		var $AliasNbPages;
 
 		/**
-		* @var right-bottom corner X coordinate of inserted image
-		* @since 2002-07-31
-		* @author Nicola Asuni
-		* @access protected
-		*/
+		 * @var right-bottom corner X coordinate of inserted image
+		 * @since 2002-07-31
+		 * @author Nicola Asuni
+		 * @access protected
+		 */
 		var $img_rb_x;
 
 		/**
-		* @var right-bottom corner Y coordinate of inserted image
-		* @since 2002-07-31
-		* @author Nicola Asuni
-		* @access protected
-		*/
+		 * @var right-bottom corner Y coordinate of inserted image
+		 * @since 2002-07-31
+		 * @author Nicola Asuni
+		 * @access protected
+		 */
 		var $img_rb_y;
 
 		/**
-		* @var image scale factor
-		* @since 2004-06-14
-		* @author Nicola Asuni
-		* @access protected
-		*/
+		 * @var image scale factor
+		 * @since 2004-06-14
+		 * @author Nicola Asuni
+		 * @access protected
+		 */
 		var $imgscale = 1;
 
 		/**
-		* @var boolean set to true when the input text is unicode (require unicode fonts)
-		* @since 2005-01-02
-		* @author Nicola Asuni
-		* @access protected
-		*/
+		 * @var boolean set to true when the input text is unicode (require unicode fonts)
+		 * @since 2005-01-02
+		 * @author Nicola Asuni
+		 * @access protected
+		 */
 		var $isunicode = false;
 
 		/**
-		* @var PDF version
-		* @since 1.5.3
-		* @access protected
-		*/
+		 * @var PDF version
+		 * @since 1.5.3
+		 * @access protected
+		 */
 		var $PDFVersion = "1.3";
 
 
@@ -918,73 +918,73 @@ 
 		}
 
 		/**
-		* Set the image scale.
-		* @param float $scale image scale.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Set the image scale.
+		 * @param float $scale image scale.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function setImageScale($scale) {
 			$this->imgscale=$scale;
 		}
 
 		/**
-		* Returns the image scale.
-		* @return float image scale.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Returns the image scale.
+		 * @return float image scale.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function getImageScale() {
 			return $this->imgscale;
 		}
 
 		/**
-		* Returns the page width in units.
-		* @return int page width.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Returns the page width in units.
+		 * @return int page width.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function getPageWidth() {
 			return $this->w;
 		}
 
 		/**
-		* Returns the page height in units.
-		* @return int page height.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Returns the page height in units.
+		 * @return int page height.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function getPageHeight() {
 			return $this->h;
 		}
 
 		/**
-		* Returns the page break margin.
-		* @return int page break margin.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Returns the page break margin.
+		 * @return int page break margin.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function getBreakMargin() {
 			return $this->bMargin;
 		}
 
 		/**
-		* Returns the scale factor (number of points in user unit).
-		* @return int scale factor.
-		* @author Nicola Asuni
-		* @since 1.5.2
-		*/
+		 * Returns the scale factor (number of points in user unit).
+		 * @return int scale factor.
+		 * @author Nicola Asuni
+		 * @since 1.5.2
+		 */
 		function getScaleFactor() {
 			return $this->k;
 		}
 
 		/**
-		* Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.
-		* @param float $left Left margin.
-		* @param float $top Top margin.
-		* @param float $right Right margin. Default value is the left one.
-		* @since 1.0
-		* @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
-		*/
+		 * Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.
+		 * @param float $left Left margin.
+		 * @param float $top Top margin.
+		 * @param float $right Right margin. Default value is the left one.
+		 * @since 1.0
+		 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
+		 */
 		function SetMargins($left, $top, $right=-1) {
 			//Set left, top and right margins
 			$this->lMargin=$left;
@@ -996,11 +996,11 @@ 
 		}
 
 		/**
-		* Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-		* @param float $margin The margin.
-		* @since 1.4
-		* @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-		*/
+		 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
+		 * @param float $margin The margin.
+		 * @since 1.4
+		 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
+		 */
 		function SetLeftMargin($margin) {
 			//Set left margin
 			$this->lMargin=$margin;
@@ -1010,34 +1010,34 @@ 
 		}
 
 		/**
-		* Defines the top margin. The method can be called before creating the first page.
-		* @param float $margin The margin.
-		* @since 1.5
-		* @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-		*/
+		 * Defines the top margin. The method can be called before creating the first page.
+		 * @param float $margin The margin.
+		 * @since 1.5
+		 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
+		 */
 		function SetTopMargin($margin) {
 			//Set top margin
 			$this->tMargin=$margin;
 		}
 
 		/**
-		* Defines the right margin. The method can be called before creating the first page.
-		* @param float $margin The margin.
-		* @since 1.5
-		* @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
-		*/
+		 * Defines the right margin. The method can be called before creating the first page.
+		 * @param float $margin The margin.
+		 * @since 1.5
+		 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
+		 */
 		function SetRightMargin($margin) {
 			//Set right margin
 			$this->rMargin=$margin;
 		}
 
 		/**
-		* Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
-		* @param boolean $auto Boolean indicating if mode should be on or off.
-		* @param float $margin Distance from the bottom of the page.
-		* @since 1.0
-		* @see Cell(), MultiCell(), AcceptPageBreak()
-		*/
+		 * Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
+		 * @param boolean $auto Boolean indicating if mode should be on or off.
+		 * @param float $margin Distance from the bottom of the page.
+		 * @since 1.0
+		 * @see Cell(), MultiCell(), AcceptPageBreak()
+		 */
 		function SetAutoPageBreak($auto, $margin=0) {
 			//Set auto page break mode and triggering margin
 			$this->AutoPageBreak=$auto;
@@ -1046,11 +1046,11 @@ 
 		}
 
 		/**
-		* Defines the way the document is to be displayed by the viewer. The zoom level can be set: pages can be displayed entirely on screen, occupy the full width of the window, use real size, be scaled by a specific zooming factor or use viewer default (configured in the Preferences menu of Acrobat). The page layout can be specified too: single at once, continuous display, two columns or viewer default. By default, documents use the full width mode with continuous display.
-		* @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-		* @param string $layout The page layout. Possible values are:<ul><li>single: displays one page at once</li><li>continuous: displays pages continuously (default)</li><li>two: displays two pages on two columns</li><li>default: uses viewer default mode</li></ul>
-		* @since 1.2
-		*/
+		 * Defines the way the document is to be displayed by the viewer. The zoom level can be set: pages can be displayed entirely on screen, occupy the full width of the window, use real size, be scaled by a specific zooming factor or use viewer default (configured in the Preferences menu of Acrobat). The page layout can be specified too: single at once, continuous display, two columns or viewer default. By default, documents use the full width mode with continuous display.
+		 * @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
+		 * @param string $layout The page layout. Possible values are:<ul><li>single: displays one page at once</li><li>continuous: displays pages continuously (default)</li><li>two: displays two pages on two columns</li><li>default: uses viewer default mode</li></ul>
+		 * @since 1.2
+		 */
 		function SetDisplayMode($zoom, $layout='continuous') {
 			//Set display mode in viewer
 			if($zoom=='fullpage' or $zoom=='fullwidth' or $zoom=='real' or $zoom=='default' or !is_string($zoom)) {
@@ -1068,11 +1068,11 @@ 
 		}
 
 		/**
-		* Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
-		* Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
-		* @param boolean $compress Boolean indicating if compression must be enabled.
-		* @since 1.4
-		*/
+		 * Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
+		 * Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
+		 * @param boolean $compress Boolean indicating if compression must be enabled.
+		 * @since 1.4
+		 */
 		function SetCompression($compress) {
 			//Set page compression
 			if(function_exists('gzcompress')) {
@@ -1084,113 +1084,113 @@ 
 		}
 
 		/**
-		* Defines the title of the document.
-		* @param string $title The title.
-		* @since 1.2
-		* @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
-		*/
+		 * Defines the title of the document.
+		 * @param string $title The title.
+		 * @since 1.2
+		 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
+		 */
 		function SetTitle($title) {
 			//Title of document
 			$this->title=$title;
 		}
 
 		/**
-		* Defines the subject of the document.
-		* @param string $subject The subject.
-		* @since 1.2
-		* @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
-		*/
+		 * Defines the subject of the document.
+		 * @param string $subject The subject.
+		 * @since 1.2
+		 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
+		 */
 		function SetSubject($subject) {
 			//Subject of document
 			$this->subject=$subject;
 		}
 
 		/**
-		* Defines the author of the document.
-		* @param string $author The name of the author.
-		* @since 1.2
-		* @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
-		*/
+		 * Defines the author of the document.
+		 * @param string $author The name of the author.
+		 * @since 1.2
+		 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
+		 */
 		function SetAuthor($author) {
 			//Author of document
 			$this->author=$author;
 		}
 
 		/**
-		* Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
-		* @param string $keywords The list of keywords.
-		* @since 1.2
-		* @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
-		*/
+		 * Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
+		 * @param string $keywords The list of keywords.
+		 * @since 1.2
+		 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
+		 */
 		function SetKeywords($keywords) {
 			//Keywords of document
 			$this->keywords=$keywords;
 		}
 
 		/**
-		* Defines the creator of the document. This is typically the name of the application that generates the PDF.
-		* @param string $creator The name of the creator.
-		* @since 1.2
-		* @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
-		*/
+		 * Defines the creator of the document. This is typically the name of the application that generates the PDF.
+		 * @param string $creator The name of the creator.
+		 * @since 1.2
+		 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
+		 */
 		function SetCreator($creator) {
 			//Creator of document
 			$this->creator=$creator;
 		}
 
 		/**
-		* Defines an alias for the total number of pages. It will be substituted as the document is closed.<br />
-		* <b>Example:</b><br />
-		* <pre>
-		* class PDF extends TCPDF {
-		* 	function Footer() {
-		* 		//Go to 1.5 cm from bottom
-		* 		$this->SetY(-15);
-		* 		//Select Arial italic 8
-		* 		$this->SetFont('Arial','I',8);
-		* 		//Print current and total page numbers
-		* 		$this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C');
-		* 	}
-		* }
-		* $pdf=new PDF();
-		* $pdf->AliasNbPages();
-		* </pre>
-		* @param string $alias The alias. Default value: {nb}.
-		* @since 1.4
-		* @see PageNo(), Footer()
-		*/
+		 * Defines an alias for the total number of pages. It will be substituted as the document is closed.<br />
+		 * <b>Example:</b><br />
+		 * <pre>
+		 * class PDF extends TCPDF {
+		 * 	function Footer() {
+		 * 		//Go to 1.5 cm from bottom
+		 * 		$this->SetY(-15);
+		 * 		//Select Arial italic 8
+		 * 		$this->SetFont('Arial','I',8);
+		 * 		//Print current and total page numbers
+		 * 		$this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C');
+		 * 	}
+		 * }
+		 * $pdf=new PDF();
+		 * $pdf->AliasNbPages();
+		 * </pre>
+		 * @param string $alias The alias. Default value: {nb}.
+		 * @since 1.4
+		 * @see PageNo(), Footer()
+		 */
 		function AliasNbPages($alias='{nb}') {
 			//Define an alias for total number of pages
 			$this->AliasNbPages = $this->_escapetext($alias);
 		}
 
 		/**
-		* This method is automatically called in case of fatal error; it simply outputs the message and halts the execution. An inherited class may override it to customize the error handling but should always halt the script, or the resulting document would probably be invalid.
-		* 2004-06-11 :: Nicola Asuni : changed bold tag with strong
-		* @param string $msg The error message
-		* @since 1.0
-		*/
+		 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution. An inherited class may override it to customize the error handling but should always halt the script, or the resulting document would probably be invalid.
+		 * 2004-06-11 :: Nicola Asuni : changed bold tag with strong
+		 * @param string $msg The error message
+		 * @since 1.0
+		 */
 		function Error($msg) {
 			//Fatal error
 			die('<strong>TCPDF error: </strong>'.$msg);
 		}
 
 		/**
-		* This method begins the generation of the PDF document. It is not necessary to call it explicitly because AddPage() does it automatically.
-		* Note: no page is created by this method
-		* @since 1.0
-		* @see AddPage(), Close()
-		*/
+		 * This method begins the generation of the PDF document. It is not necessary to call it explicitly because AddPage() does it automatically.
+		 * Note: no page is created by this method
+		 * @since 1.0
+		 * @see AddPage(), Close()
+		 */
 		function Open() {
 			//Begin document
 			$this->state=1;
 		}
 
 		/**
-		* Terminates the PDF document. It is not necessary to call this method explicitly because Output() does it automatically. If the document contains no page, AddPage() is called to prevent from getting an invalid document.
-		* @since 1.0
-		* @see Open(), Output()
-		*/
+		 * Terminates the PDF document. It is not necessary to call this method explicitly because Output() does it automatically. If the document contains no page, AddPage() is called to prevent from getting an invalid document.
+		 * @since 1.0
+		 * @see Open(), Output()
+		 */
 		function Close() {
 			//Terminate document
 			if($this->state==3) {
@@ -1210,13 +1210,13 @@ 
 		}
 
 		/**
-		* Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer. Then the page is added, the current position set to the top-left corner according to the left and top margins, and Header() is called to display the header.
-		* The font which was set before calling is automatically restored. There is no need to call SetFont() again if you want to continue with the same font. The same is true for colors and line width.
-		* The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
-		* @param string $orientation Page orientation. Possible values are (case insensitive):<ul><li>P or Portrait</li><li>L or Landscape</li></ul> The default value is the one passed to the constructor.
-		* @since 1.0
-		* @see TCPDF(), Header(), Footer(), SetMargins()
-		*/
+		 * Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer. Then the page is added, the current position set to the top-left corner according to the left and top margins, and Header() is called to display the header.
+		 * The font which was set before calling is automatically restored. There is no need to call SetFont() again if you want to continue with the same font. The same is true for colors and line width.
+		 * The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
+		 * @param string $orientation Page orientation. Possible values are (case insensitive):<ul><li>P or Portrait</li><li>L or Landscape</li></ul> The default value is the one passed to the constructor.
+		 * @since 1.0
+		 * @see TCPDF(), Header(), Footer(), SetMargins()
+		 */
 		function AddPage($orientation='') {
 			//Start a new page
 			if($this->state==0) {
@@ -1287,12 +1287,12 @@ 
 
 
 		/**
-	 	 * Set header data.
+		 * Set header data.
 		 * @param string $ln header image logo
 		 * @param string $lw header image logo width in mm
 		 * @param string $ht string to print as title on document header
 		 * @param string $hs string to print on document header
-		*/
+		 */
 		function setHeaderData($ln="", $lw=0, $ht="", $hs="") {
 			$this->header_logo = $ln;
 			$this->header_logo_width = $lw;
@@ -1301,42 +1301,42 @@ 
 		}
 
 		/**
-	 	 * Set header margin.
+		 * Set header margin.
 		 * (minimum distance between header and top page margin)
 		 * @param int $hm distance in millimeters
-		*/
+		 */
 		function setHeaderMargin($hm=10) {
 			$this->header_margin = $hm;
 		}
 
 		/**
-	 	 * Set footer margin.
+		 * Set footer margin.
 		 * (minimum distance between footer and bottom page margin)
 		 * @param int $fm distance in millimeters
-		*/
+		 */
 		function setFooterMargin($fm=10) {
 			$this->footer_margin = $fm;
 		}
 
 		/**
-	 	 * Set a flag to print page header.
+		 * Set a flag to print page header.
 		 * @param boolean $val set to true to print the page header (default), false otherwise.
-		*/
+		 */
 		function setPrintHeader($val=true) {
 			$this->print_header = $val;
 		}
 
 		/**
-	 	 * Set a flag to print page footer.
+		 * Set a flag to print page footer.
 		 * @param boolean $value set to true to print the page footer (default), false otherwise.
-		*/
+		 */
 		function setPrintFooter($val=true) {
 			$this->print_footer = $val;
 		}
 
 		/**
-	 	 * This method is used to render the page header.
-	 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
+		 * This method is used to render the page header.
+		 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
 		 */
 		function Header() {
 			if ($this->print_header) {
@@ -1388,8 +1388,8 @@ 
 		}
 
 		/**
-	 	 * This method is used to render the page footer.
-	 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
+		 * This method is used to render the page footer.
+		 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
 		 */
 		function Footer() {
 			if ($this->print_footer) {
@@ -1429,24 +1429,24 @@ 
 		}
 
 		/**
-		* Returns the current page number.
-		* @return int page number
-		* @since 1.0
-		* @see AliasNbPages()
-		*/
+		 * Returns the current page number.
+		 * @return int page number
+		 * @since 1.0
+		 * @see AliasNbPages()
+		 */
 		function PageNo() {
 			//Get current page number
 			return $this->page;
 		}
 
 		/**
-		* Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		* @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
-		* @param int $g Green component (between 0 and 255)
-		* @param int $b Blue component (between 0 and 255)
-		* @since 1.3
-		* @see SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
-		*/
+		 * Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
+		 * @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
+		 * @param int $g Green component (between 0 and 255)
+		 * @param int $b Blue component (between 0 and 255)
+		 * @since 1.3
+		 * @see SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
+		 */
 		function SetDrawColor($r, $g=-1, $b=-1) {
 			//Set color for all stroking operations
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
@@ -1461,14 +1461,14 @@ 
 		}
 
 		/**
-		* Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		* @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
-		* @param int $g Green component (between 0 and 255)
-		* @param int $b Blue component (between 0 and 255)
-		* @param boolean $storeprev if true stores the RGB array on $prevFillColor variable.
-		* @since 1.3
-		* @see SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
-		*/
+		 * Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
+		 * @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
+		 * @param int $g Green component (between 0 and 255)
+		 * @param int $b Blue component (between 0 and 255)
+		 * @param boolean $storeprev if true stores the RGB array on $prevFillColor variable.
+		 * @since 1.3
+		 * @see SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
+		 */
 		function SetFillColor($r, $g=-1, $b=-1, $storeprev=false) {
 			//Set color for all filling operations
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
@@ -1488,14 +1488,14 @@ 
 		}
 
 		/**
-		* Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		* @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
-		* @param int $g Green component (between 0 and 255)
-		* @param int $b Blue component (between 0 and 255)
-		* @param boolean $storeprev if true stores the RGB array on $prevTextColor variable.
-		* @since 1.3
-		* @see SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
-		*/
+		 * Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
+		 * @param int $r If g et b are given, red component; if not, indicates the gray level. Value between 0 and 255
+		 * @param int $g Green component (between 0 and 255)
+		 * @param int $b Blue component (between 0 and 255)
+		 * @param boolean $storeprev if true stores the RGB array on $prevTextColor variable.
+		 * @since 1.3
+		 * @see SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
+		 */
 		function SetTextColor($r, $g=-1, $b=-1, $storeprev=false) {
 			//Set color for text
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
@@ -1512,12 +1512,12 @@ 
 		}
 
 		/**
-		* Returns the length of a string in user unit. A font must be selected.<br>
-		* Support UTF-8 Unicode [Nicola Asuni, 2005-01-02]
-		* @param string $s The string whose length is to be computed
-		* @return int
-		* @since 1.2
-		*/
+		 * Returns the length of a string in user unit. A font must be selected.<br>
+		 * Support UTF-8 Unicode [Nicola Asuni, 2005-01-02]
+		 * @param string $s The string whose length is to be computed
+		 * @return int
+		 * @since 1.2
+		 */
 		function GetStringWidth($s) {
 			//Get width of a string in the current font
 			$s = (string)$s;
@@ -1552,11 +1552,11 @@ 
 		}
 
 		/**
-		* Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
-		* @param float $width The width.
-		* @since 1.0
-		* @see Line(), Rect(), Cell(), MultiCell()
-		*/
+		 * Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
+		 * @param float $width The width.
+		 * @since 1.0
+		 * @see Line(), Rect(), Cell(), MultiCell()
+		 */
 		function SetLineWidth($width) {
 			//Set line width
 			$this->LineWidth=$width;
@@ -1566,29 +1566,29 @@ 
 		}
 
 		/**
-		* Draws a line between two points.
-		* @param float $x1 Abscissa of first point
-		* @param float $y1 Ordinate of first point
-		* @param float $x2 Abscissa of second point
-		* @param float $y2 Ordinate of second point
-		* @since 1.0
-		* @see SetLineWidth(), SetDrawColor()
-		*/
+		 * Draws a line between two points.
+		 * @param float $x1 Abscissa of first point
+		 * @param float $y1 Ordinate of first point
+		 * @param float $x2 Abscissa of second point
+		 * @param float $y2 Ordinate of second point
+		 * @since 1.0
+		 * @see SetLineWidth(), SetDrawColor()
+		 */
 		function Line($x1, $y1, $x2, $y2) {
 			//Draw a line
 			$this->_out(sprintf('%.2f %.2f m %.2f %.2f l S', $x1*$this->k, ($this->h-$y1)*$this->k, $x2*$this->k, ($this->h-$y2)*$this->k));
 		}
 
 		/**
-		* Outputs a rectangle. It can be drawn (border only), filled (with no border) or both.
-		* @param float $x Abscissa of upper-left corner
-		* @param float $y Ordinate of upper-left corner
-		* @param float $w Width
-		* @param float $h Height
-		* @param string $style Style of rendering. Possible values are:<ul><li>D or empty string: draw (default)</li><li>F: fill</li><li>DF or FD: draw and fill</li></ul>
-		* @since 1.0
-		* @see SetLineWidth(), SetDrawColor(), SetFillColor()
-		*/
+		 * Outputs a rectangle. It can be drawn (border only), filled (with no border) or both.
+		 * @param float $x Abscissa of upper-left corner
+		 * @param float $y Ordinate of upper-left corner
+		 * @param float $w Width
+		 * @param float $h Height
+		 * @param string $style Style of rendering. Possible values are:<ul><li>D or empty string: draw (default)</li><li>F: fill</li><li>DF or FD: draw and fill</li></ul>
+		 * @since 1.0
+		 * @see SetLineWidth(), SetDrawColor(), SetFillColor()
+		 */
 		function Rect($x, $y, $w, $h, $style='') {
 			//Draw a rectangle
 			if($style=='F') {
@@ -1604,20 +1604,20 @@ 
 		}
 
 		/**
-		* Imports a TrueType or Type1 font and makes it available. It is necessary to generate a font definition file first with the makefont.php utility. The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by FPDF_FONTPATH if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-		* Support UTF-8 Unicode [Nicola Asuni, 2005-01-02].
-		* <b>Example</b>:<br />
-		* <pre>
-		* $pdf->AddFont('Comic','I');
-		* // is equivalent to:
-		* $pdf->AddFont('Comic','I','comici.php');
-		* </pre>
-		* @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-		* @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-		* @param string $file The font definition file. By default, the name is built from the family and style, in lower case with no space.
-		* @since 1.5
-		* @see SetFont()
-		*/
+		 * Imports a TrueType or Type1 font and makes it available. It is necessary to generate a font definition file first with the makefont.php utility. The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by FPDF_FONTPATH if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
+		 * Support UTF-8 Unicode [Nicola Asuni, 2005-01-02].
+		 * <b>Example</b>:<br />
+		 * <pre>
+		 * $pdf->AddFont('Comic','I');
+		 * // is equivalent to:
+		 * $pdf->AddFont('Comic','I','comici.php');
+		 * </pre>
+		 * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
+		 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
+		 * @param string $file The font definition file. By default, the name is built from the family and style, in lower case with no space.
+		 * @since 1.5
+		 * @see SetFont()
+		 */
 		function AddFont($family, $style='', $file='') {
 			if(empty($family)) {
 				return;
@@ -1691,32 +1691,32 @@ 
 		}
 
 		/**
-		* Sets the font used to print character strings. It is mandatory to call this method at least once before printing text or the resulting document would not be valid.
-		* The font can be either a standard one or a font added via the AddFont() method. Standard fonts use Windows encoding cp1252 (Western Europe).
-		* The method can be called before the first page is created and the font is retained from page to page.
+		 * Sets the font used to print character strings. It is mandatory to call this method at least once before printing text or the resulting document would not be valid.
+		 * The font can be either a standard one or a font added via the AddFont() method. Standard fonts use Windows encoding cp1252 (Western Europe).
+		 * The method can be called before the first page is created and the font is retained from page to page.
 		If you just wish to change the current font size, it is simpler to call SetFontSize().
-		* Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the FPDF_FONTPATH constant</li></ul><br />
-		* Example for the last case (note the trailing slash):<br />
-		* <pre>
-		* define('FPDF_FONTPATH','/home/www/font/');
-		* require('tcpdf.php');
-		*
-		* //Times regular 12
-		* $pdf->SetFont('Times');
-		* //Arial bold 14
-		* $pdf->SetFont('Arial','B',14);
-		* //Removes bold
-		* $pdf->SetFont('');
-		* //Times bold, italic and underlined 14
-		* $pdf->SetFont('Times','BIU');
-		* </pre><br />
-		* If the file corresponding to the requested font is not found, the error "Could not include font metric file" is generated.
-		* @param string $family Family font. It can be either a name defined by AddFont() or one of the standard families (case insensitive):<ul><li>Courier (fixed-width)</li><li>Helvetica or Arial (synonymous; sans serif)</li><li>Times (serif)</li><li>Symbol (symbolic)</li><li>ZapfDingbats (symbolic)</li></ul>It is also possible to pass an empty string. In that case, the current family is retained.
-		* @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li></ul>or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats
-		* @param float $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
-		* @since 1.0
-		* @see AddFont(), SetFontSize(), Cell(), MultiCell(), Write()
-		*/
+		 * Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the FPDF_FONTPATH constant</li></ul><br />
+		 * Example for the last case (note the trailing slash):<br />
+		 * <pre>
+		 * define('FPDF_FONTPATH','/home/www/font/');
+		 * require('tcpdf.php');
+		 *
+		 * //Times regular 12
+		 * $pdf->SetFont('Times');
+		 * //Arial bold 14
+		 * $pdf->SetFont('Arial','B',14);
+		 * //Removes bold
+		 * $pdf->SetFont('');
+		 * //Times bold, italic and underlined 14
+		 * $pdf->SetFont('Times','BIU');
+		 * </pre><br />
+		 * If the file corresponding to the requested font is not found, the error "Could not include font metric file" is generated.
+		 * @param string $family Family font. It can be either a name defined by AddFont() or one of the standard families (case insensitive):<ul><li>Courier (fixed-width)</li><li>Helvetica or Arial (synonymous; sans serif)</li><li>Times (serif)</li><li>Symbol (symbolic)</li><li>ZapfDingbats (symbolic)</li></ul>It is also possible to pass an empty string. In that case, the current family is retained.
+		 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li></ul>or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats
+		 * @param float $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
+		 * @since 1.0
+		 * @see AddFont(), SetFontSize(), Cell(), MultiCell(), Write()
+		 */
 		function SetFont($family, $style='', $size=0) {
 			// save previous values
 			$this->prevFontFamily = $this->FontFamily;
@@ -1811,11 +1811,11 @@ 
 		}
 
 		/**
-		* Defines the size of the current font.
-		* @param float $size The size (in points)
-		* @since 1.0
-		* @see SetFont()
-		*/
+		 * Defines the size of the current font.
+		 * @param float $size The size (in points)
+		 * @since 1.0
+		 * @see SetFont()
+		 */
 		function SetFontSize($size) {
 			//Set font size in points
 			if($this->FontSizePt==$size) {
@@ -1829,11 +1829,11 @@ 
 		}
 
 		/**
-		* Creates a new internal link and returns its identifier. An internal link is a clickable area which directs to another place within the document.<br />
-		* The identifier can then be passed to Cell(), Write(), Image() or Link(). The destination is defined with SetLink().
-		* @since 1.5
-		* @see Cell(), Write(), Image(), Link(), SetLink()
-		*/
+		 * Creates a new internal link and returns its identifier. An internal link is a clickable area which directs to another place within the document.<br />
+		 * The identifier can then be passed to Cell(), Write(), Image() or Link(). The destination is defined with SetLink().
+		 * @since 1.5
+		 * @see Cell(), Write(), Image(), Link(), SetLink()
+		 */
 		function AddLink() {
 			//Create a new internal link
 			$n=count($this->links)+1;
@@ -1842,13 +1842,13 @@ 
 		}
 
 		/**
-		* Defines the page and position a link points to
-		* @param int $link The link identifier returned by AddLink()
-		* @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
-		* @param int $page Number of target page; -1 indicates the current page. This is the default value
-		* @since 1.5
-		* @see AddLink()
-		*/
+		 * Defines the page and position a link points to
+		 * @param int $link The link identifier returned by AddLink()
+		 * @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
+		 * @param int $page Number of target page; -1 indicates the current page. This is the default value
+		 * @since 1.5
+		 * @see AddLink()
+		 */
 		function SetLink($link, $y=0, $page=-1) {
 			//Set destination of internal link
 			if($y==-1) {
@@ -1861,28 +1861,28 @@ 
 		}
 
 		/**
-		* Puts a link on a rectangular area of the page. Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
-		* @param float $x Abscissa of the upper-left corner of the rectangle
-		* @param float $y Ordinate of the upper-left corner of the rectangle
-		* @param float $w Width of the rectangle
-		* @param float $h Height of the rectangle
-		* @param mixed $link URL or identifier returned by AddLink()
-		* @since 1.5
-		* @see AddLink(), Cell(), Write(), Image()
-		*/
+		 * Puts a link on a rectangular area of the page. Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
+		 * @param float $x Abscissa of the upper-left corner of the rectangle
+		 * @param float $y Ordinate of the upper-left corner of the rectangle
+		 * @param float $w Width of the rectangle
+		 * @param float $h Height of the rectangle
+		 * @param mixed $link URL or identifier returned by AddLink()
+		 * @since 1.5
+		 * @see AddLink(), Cell(), Write(), Image()
+		 */
 		function Link($x, $y, $w, $h, $link) {
 			//Put a link on the page
 			$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h*$this->k, $link);
 		}
 
 		/**
-		* Prints a character string. The origin is on the left of the first charcter, on the baseline. This method allows to place a string precisely on the page, but it is usually easier to use Cell(), MultiCell() or Write() which are the standard methods to print text.
-		* @param float $x Abscissa of the origin
-		* @param float $y Ordinate of the origin
-		* @param string $txt String to print
-		* @since 1.0
-		* @see SetFont(), SetTextColor(), Cell(), MultiCell(), Write()
-		*/
+		 * Prints a character string. The origin is on the left of the first charcter, on the baseline. This method allows to place a string precisely on the page, but it is usually easier to use Cell(), MultiCell() or Write() which are the standard methods to print text.
+		 * @param float $x Abscissa of the origin
+		 * @param float $y Ordinate of the origin
+		 * @param string $txt String to print
+		 * @since 1.0
+		 * @see SetFont(), SetTextColor(), Cell(), MultiCell(), Write()
+		 */
 		function Text($x, $y, $txt) {
 			//Output a string
 			$s=sprintf('BT %.2f %.2f Td (%s) Tj ET', $x * $this->k, ($this->h-$y) * $this->k, $this->_escapetext($txt));
@@ -1896,70 +1896,70 @@ 
 		}
 
 		/**
-		* Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value. The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
-		* This method is called automatically and should not be called directly by the application.<br />
-		* <b>Example:</b><br />
-		* The method is overriden in an inherited class in order to obtain a 3 column layout:<br />
-		* <pre>
-		* class PDF extends TCPDF {
-		* 	var $col=0;
-		*
-		* 	function SetCol($col) {
-		* 		//Move position to a column
-		* 		$this->col=$col;
-		* 		$x=10+$col*65;
-		* 		$this->SetLeftMargin($x);
-		* 		$this->SetX($x);
-		* 	}
-		*
-		* 	function AcceptPageBreak() {
-		* 		if($this->col<2) {
-		* 			//Go to next column
-		* 			$this->SetCol($this->col+1);
-		* 			$this->SetY(10);
-		* 			return false;
-		* 		}
-		* 		else {
-		* 			//Go back to first column and issue page break
-		* 			$this->SetCol(0);
-		* 			return true;
-		* 		}
-		* 	}
-		* }
-		*
-		* $pdf=new PDF();
-		* $pdf->Open();
-		* $pdf->AddPage();
-		* $pdf->SetFont('Arial','',12);
-		* for($i=1;$i<=300;$i++) {
-		*     $pdf->Cell(0,5,"Line $i",0,1);
-		* }
-		* $pdf->Output();
-		* </pre>
-		* @return boolean
-		* @since 1.4
-		* @see SetAutoPageBreak()
-		*/
+		 * Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value. The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
+		 * This method is called automatically and should not be called directly by the application.<br />
+		 * <b>Example:</b><br />
+		 * The method is overriden in an inherited class in order to obtain a 3 column layout:<br />
+		 * <pre>
+		 * class PDF extends TCPDF {
+		 * 	var $col=0;
+		 *
+		 * 	function SetCol($col) {
+		 * 		//Move position to a column
+		 * 		$this->col=$col;
+		 * 		$x=10+$col*65;
+		 * 		$this->SetLeftMargin($x);
+		 * 		$this->SetX($x);
+		 * 	}
+		 *
+		 * 	function AcceptPageBreak() {
+		 * 		if($this->col<2) {
+		 * 			//Go to next column
+		 * 			$this->SetCol($this->col+1);
+		 * 			$this->SetY(10);
+		 * 			return false;
+		 * 		}
+		 * 		else {
+		 * 			//Go back to first column and issue page break
+		 * 			$this->SetCol(0);
+		 * 			return true;
+		 * 		}
+		 * 	}
+		 * }
+		 *
+		 * $pdf=new PDF();
+		 * $pdf->Open();
+		 * $pdf->AddPage();
+		 * $pdf->SetFont('Arial','',12);
+		 * for($i=1;$i<=300;$i++) {
+		 *     $pdf->Cell(0,5,"Line $i",0,1);
+		 * }
+		 * $pdf->Output();
+		 * </pre>
+		 * @return boolean
+		 * @since 1.4
+		 * @see SetAutoPageBreak()
+		 */
 		function AcceptPageBreak() {
 			//Accept automatic page break or not
 			return $this->AutoPageBreak;
 		}
 
 		/**
-		* Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-		* If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-		* @param float $w Cell width. If 0, the cell extends up to the right margin.
-		* @param float $h Cell height. Default value: 0.
-		* @param string $txt String to print. Default value: empty string.
-		* @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
+		 * Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
+		 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
+		 * @param float $w Cell width. If 0, the cell extends up to the right margin.
+		 * @param float $h Cell height. Default value: 0.
+		 * @param string $txt String to print. Default value: empty string.
+		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
 		Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-		* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li></ul>
-		* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		* @param mixed $link URL or identifier returned by AddLink().
-		* @since 1.0
-		* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
-		*/
+		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li></ul>
+		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
+		 * @param mixed $link URL or identifier returned by AddLink().
+		 * @since 1.0
+		 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
+		 */
 		function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='') {
 			//Output a cell
 			$k=$this->k;
@@ -2050,18 +2050,18 @@ 
 		}
 
 		/**
-		* This method allows printing text with line breaks. They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
-		* Text can be aligned, centered or justified. The cell block can be framed and the background painted.
-		* @param float $w Width of cells. If 0, they extend up to the right margin of the page.
-		* @param float $h Height of cells.
-		* @param string $txt String to print
-		* @param mixed $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value)</li></ul>
-		* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
-		* @since 1.3
-		* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
-		*/
+		 * This method allows printing text with line breaks. They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
+		 * Text can be aligned, centered or justified. The cell block can be framed and the background painted.
+		 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
+		 * @param float $h Height of cells.
+		 * @param string $txt String to print
+		 * @param mixed $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value)</li></ul>
+		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
+		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
+		 * @since 1.3
+		 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
+		 */
 		function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1) {
 
 			// save current position
@@ -2192,24 +2192,24 @@ 
 		}
 
 		/**
-		* This method prints text from the current position. When the right margin is reached (or the \n character is met) a line break occurs and text continues from the left margin. Upon method exit, the current position is left just at the end of the text. It is possible to put a link on the text.<br />
-		* <b>Example:</b><br />
-		* <pre>
-		* //Begin with regular font
-		* $pdf->SetFont('Arial','',14);
-		* $pdf->Write(5,'Visit ');
-		* //Then put a blue underlined link
-		* $pdf->SetTextColor(0,0,255);
-		* $pdf->SetFont('','U');
-		* $pdf->Write(5,'www.tecnick.com','http://www.tecnick.com');
-		* </pre>
-		* @param float $h Line height
-		* @param string $txt String to print
-		* @param mixed $link URL or identifier returned by AddLink()
-		* @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
-		* @since 1.5
-		* @see SetFont(), SetTextColor(), AddLink(), MultiCell(), SetAutoPageBreak()
-		*/
+		 * This method prints text from the current position. When the right margin is reached (or the \n character is met) a line break occurs and text continues from the left margin. Upon method exit, the current position is left just at the end of the text. It is possible to put a link on the text.<br />
+		 * <b>Example:</b><br />
+		 * <pre>
+		 * //Begin with regular font
+		 * $pdf->SetFont('Arial','',14);
+		 * $pdf->Write(5,'Visit ');
+		 * //Then put a blue underlined link
+		 * $pdf->SetTextColor(0,0,255);
+		 * $pdf->SetFont('','U');
+		 * $pdf->Write(5,'www.tecnick.com','http://www.tecnick.com');
+		 * </pre>
+		 * @param float $h Line height
+		 * @param string $txt String to print
+		 * @param mixed $link URL or identifier returned by AddLink()
+		 * @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
+		 * @since 1.5
+		 * @see SetFont(), SetTextColor(), AddLink(), MultiCell(), SetAutoPageBreak()
+		 */
 		function Write($h, $txt, $link='', $fill=0) {
 
 			//Output text in flowing mode
@@ -2299,25 +2299,25 @@ 
 		}
 
 		/**
-		* Puts an image in the page. The upper-left corner must be given. The dimensions can be specified in different ways:<ul><li>explicit width and height (expressed in user unit)</li><li>one explicit dimension, the other being calculated automatically in order to keep the original proportions</li><li>no explicit dimension, in which case the image is put at 72 dpi</li></ul>
-		* Supported formats are JPEG and PNG.
-		* For JPEG, all flavors are allowed:<ul><li>gray scales</li><li>true colors (24 bits)</li><li>CMYK (32 bits)</li></ul>
-		* For PNG, are allowed:<ul><li>gray scales on at most 8 bits (256 levels)</li><li>indexed colors</li><li>true colors (24 bits)</li></ul>
-		* but are not supported:<ul><li>Interlacing</li><li>Alpha channel</li></ul>
-		* If a transparent color is defined, it will be taken into account (but will be only interpreted by Acrobat 4 and above).<br />
-		* The format can be specified explicitly or inferred from the file extension.<br />
-		* It is possible to put a link on the image.<br />
-		* Remark: if an image is used several times, only one copy will be embedded in the file.<br />
-		* @param string $file Name of the file containing the image.
-		* @param float $x Abscissa of the upper-left corner.
-		* @param float $y Ordinate of the upper-left corner.
-		* @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		* @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		* @param string $type Image format. Possible values are (case insensitive): JPG, JPEG, PNG. If not specified, the type is inferred from the file extension.
-		* @param mixed $link URL or identifier returned by AddLink().
-		* @since 1.1
-		* @see AddLink()
-		*/
+		 * Puts an image in the page. The upper-left corner must be given. The dimensions can be specified in different ways:<ul><li>explicit width and height (expressed in user unit)</li><li>one explicit dimension, the other being calculated automatically in order to keep the original proportions</li><li>no explicit dimension, in which case the image is put at 72 dpi</li></ul>
+		 * Supported formats are JPEG and PNG.
+		 * For JPEG, all flavors are allowed:<ul><li>gray scales</li><li>true colors (24 bits)</li><li>CMYK (32 bits)</li></ul>
+		 * For PNG, are allowed:<ul><li>gray scales on at most 8 bits (256 levels)</li><li>indexed colors</li><li>true colors (24 bits)</li></ul>
+		 * but are not supported:<ul><li>Interlacing</li><li>Alpha channel</li></ul>
+		 * If a transparent color is defined, it will be taken into account (but will be only interpreted by Acrobat 4 and above).<br />
+		 * The format can be specified explicitly or inferred from the file extension.<br />
+		 * It is possible to put a link on the image.<br />
+		 * Remark: if an image is used several times, only one copy will be embedded in the file.<br />
+		 * @param string $file Name of the file containing the image.
+		 * @param float $x Abscissa of the upper-left corner.
+		 * @param float $y Ordinate of the upper-left corner.
+		 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+		 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+		 * @param string $type Image format. Possible values are (case insensitive): JPG, JPEG, PNG. If not specified, the type is inferred from the file extension.
+		 * @param mixed $link URL or identifier returned by AddLink().
+		 * @since 1.1
+		 * @see AddLink()
+		 */
 		function Image($file, $x, $y, $w=0, $h=0, $type='', $link='') {
 			//Put an image on the page
 			if(!isset($this->images[$file])) {
@@ -2378,11 +2378,11 @@ 
 		}
 
 		/**
-		* Performs a line break. The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
-		* @param float $h The height of the break. By default, the value equals the height of the last printed cell.
-		* @since 1.0
-		* @see Cell()
-		*/
+		 * Performs a line break. The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
+		 * @param float $h The height of the break. By default, the value equals the height of the last printed cell.
+		 * @since 1.0
+		 * @see Cell()
+		 */
 		function Ln($h='') {
 			//Line feed; default value is last cell height
 			$this->x=$this->lMargin;
@@ -2395,22 +2395,22 @@ 
 		}
 
 		/**
-		* Returns the abscissa of the current position.
-		* @return float
-		* @since 1.2
-		* @see SetX(), GetY(), SetY()
-		*/
+		 * Returns the abscissa of the current position.
+		 * @return float
+		 * @since 1.2
+		 * @see SetX(), GetY(), SetY()
+		 */
 		function GetX() {
 			//Get x position
 			return $this->x;
 		}
 
 		/**
-		* Defines the abscissa of the current position. If the passed value is negative, it is relative to the right of the page.
-		* @param float $x The value of the abscissa.
-		* @since 1.2
-		* @see GetX(), GetY(), SetY(), SetXY()
-		*/
+		 * Defines the abscissa of the current position. If the passed value is negative, it is relative to the right of the page.
+		 * @param float $x The value of the abscissa.
+		 * @since 1.2
+		 * @see GetX(), GetY(), SetY(), SetXY()
+		 */
 		function SetX($x) {
 			//Set x position
 			if($x>=0) {
@@ -2422,22 +2422,22 @@ 
 		}
 
 		/**
-		* Returns the ordinate of the current position.
-		* @return float
-		* @since 1.0
-		* @see SetY(), GetX(), SetX()
-		*/
+		 * Returns the ordinate of the current position.
+		 * @return float
+		 * @since 1.0
+		 * @see SetY(), GetX(), SetX()
+		 */
 		function GetY() {
 			//Get y position
 			return $this->y;
 		}
 
 		/**
-		* Moves the current abscissa back to the left margin and sets the ordinate. If the passed value is negative, it is relative to the bottom of the page.
-		* @param float $y The value of the ordinate.
-		* @since 1.0
-		* @see GetX(), GetY(), SetY(), SetXY()
-		*/
+		 * Moves the current abscissa back to the left margin and sets the ordinate. If the passed value is negative, it is relative to the bottom of the page.
+		 * @param float $y The value of the ordinate.
+		 * @since 1.0
+		 * @see GetX(), GetY(), SetY(), SetXY()
+		 */
 		function SetY($y) {
 			//Set y position and reset x
 			$this->x=$this->lMargin;
@@ -2450,12 +2450,12 @@ 
 		}
 
 		/**
-		* Defines the abscissa and ordinate of the current position. If the passed values are negative, they are relative respectively to the right and bottom of the page.
-		* @param float $x The value of the abscissa
-		* @param float $y The value of the ordinate
-		* @since 1.2
-		* @see SetX(), SetY()
-		*/
+		 * Defines the abscissa and ordinate of the current position. If the passed values are negative, they are relative respectively to the right and bottom of the page.
+		 * @param float $x The value of the abscissa
+		 * @param float $y The value of the ordinate
+		 * @since 1.2
+		 * @see SetX(), SetY()
+		 */
 		function SetXY($x, $y) {
 			//Set x and y positions
 			$this->SetY($y);
@@ -2463,13 +2463,13 @@ 
 		}
 
 		/**
-		* Send the document to a given destination: string, local file or browser. In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
-		* The method first calls Close() if necessary to terminate the document.
-		* @param string $name The name of the file. If not given, the document will be sent to the browser (destination I) with the name doc.pdf.
-		* @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser. The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local file with the name given by name.</li><li>S: return the document as a string. name is ignored.</li></ul>If the parameter is not specified but a name is given, destination is F. If no parameter is specified at all, destination is I.<br />Note: for compatibility with previous versions, a boolean value is also accepted (false for F and true for D).
-		* @since 1.0
-		* @see Close()
-		*/
+		 * Send the document to a given destination: string, local file or browser. In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
+		 * The method first calls Close() if necessary to terminate the document.
+		 * @param string $name The name of the file. If not given, the document will be sent to the browser (destination I) with the name doc.pdf.
+		 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser. The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local file with the name given by name.</li><li>S: return the document as a string. name is ignored.</li></ul>If the parameter is not specified but a name is given, destination is F. If no parameter is specified at all, destination is I.<br />Note: for compatibility with previous versions, a boolean value is also accepted (false for F and true for D).
+		 * @since 1.0
+		 * @see Close()
+		 */
 		function Output($name='',$dest='') {
 			//Output PDF to some destination
 			//Finish document if necessary
@@ -2549,9 +2549,9 @@ 
 		// var methods
 
 		/**
-		* Check for locale-related bug
-		* @access protected
-		*/
+		 * Check for locale-related bug
+		 * @access protected
+		 */
 		function _dochecks() {
 			//Check for locale-related bug
 			if(1.1==1) {
@@ -2564,9 +2564,9 @@ 
 		}
 
 		/**
-		* Return fonts path
-		* @access protected
-		*/
+		 * Return fonts path
+		 * @access protected
+		 */
 		function _getfontpath() {
 			if(!defined('FPDF_FONTPATH') AND is_dir(dirname(__FILE__).'/font')) {
 				define('FPDF_FONTPATH', dirname(__FILE__).'/font/');
@@ -2575,9 +2575,9 @@ 
 		}
 
 		/**
-		* Start document
-		* @access protected
-		*/
+		 * Start document
+		 * @access protected
+		 */
 		function _begindoc() {
 			//Start document
 			$this->state=1;
@@ -2585,9 +2585,9 @@ 
 		}
 
 		/**
-		* _putpages
-		* @access protected
-		*/
+		 * _putpages
+		 * @access protected
+		 */
 		function _putpages() {
 			$nb = $this->page;
 			if(!empty($this->AliasNbPages)) {
@@ -2657,10 +2657,10 @@ 
 		}
 
 		/**
-		* Adds fonts
-		* _putfonts
-		* @access protected
-		*/
+		 * Adds fonts
+		 * _putfonts
+		 * @access protected
+		 */
 		function _putfonts() {
 			$nf=$this->n;
 			foreach($this->diffs as $diff) {
@@ -2776,9 +2776,9 @@ 
 		}
 
 		/**
-		* _putimages
-		* @access protected
-		*/
+		 * _putimages
+		 * @access protected
+		 */
 		function _putimages() {
 			$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
 			reset($this->images);
@@ -2828,9 +2828,9 @@ 
 		}
 
 		/**
-		* _putxobjectdict
-		* @access protected
-		*/
+		 * _putxobjectdict
+		 * @access protected
+		 */
 		function _putxobjectdict() {
 			foreach($this->images as $image) {
 				$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
@@ -2838,9 +2838,9 @@ 
 		}
 
 		/**
-		* _putresourcedict
-		* @access protected
-		*/
+		 * _putresourcedict
+		 * @access protected
+		 */
 		function _putresourcedict(){
 			$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 			$this->_out('/Font <<');
@@ -2854,9 +2854,9 @@ 
 		}
 
 		/**
-		* _putresources
-		* @access protected
-		*/
+		 * _putresources
+		 * @access protected
+		 */
 		function _putresources() {
 			$this->_putfonts();
 			$this->_putimages();
@@ -2870,9 +2870,9 @@ 
 		}
 
 		/**
-		* _putinfo
-		* @access protected
-		*/
+		 * _putinfo
+		 * @access protected
+		 */
 		function _putinfo() {
 			$this->_out('/Producer '.$this->_textstring(PDF_PRODUCER));
 			if(!empty($this->title)) {
@@ -2894,9 +2894,9 @@ 
 		}
 
 		/**
-		* _putcatalog
-		* @access protected
-		*/
+		 * _putcatalog
+		 * @access protected
+		 */
 		function _putcatalog() {
 			$this->_out('/Type /Catalog');
 			$this->_out('/Pages 1 0 R');
@@ -2924,9 +2924,9 @@ 
 		}
 
 		/**
-		* _puttrailer
-		* @access protected
-		*/
+		 * _puttrailer
+		 * @access protected
+		 */
 		function _puttrailer() {
 			$this->_out('/Size '.($this->n+1));
 			$this->_out('/Root '.$this->n.' 0 R');
@@ -2934,17 +2934,17 @@ 
 		}
 
 		/**
-		* _putheader
-		* @access protected
-		*/
+		 * _putheader
+		 * @access protected
+		 */
 		function _putheader() {
 			$this->_out('%PDF-'.$this->PDFVersion);
 		}
 
 		/**
-		* _enddoc
-		* @access protected
-		*/
+		 * _enddoc
+		 * @access protected
+		 */
 		function _enddoc() {
 			$this->_putheader();
 			$this->_putpages();
@@ -2981,9 +2981,9 @@ 
 		}
 
 		/**
-		* _beginpage
-		* @access protected
-		*/
+		 * _beginpage
+		 * @access protected
+		 */
 		function _beginpage($orientation) {
 			$this->page++;
 			$this->pages[$this->page]='';
@@ -3021,17 +3021,17 @@ 
 		}
 
 		/**
-		* End of page contents
-		* @access protected
-		*/
+		 * End of page contents
+		 * @access protected
+		 */
 		function _endpage() {
 			$this->state=1;
 		}
 
 		/**
-		* Begin a new object
-		* @access protected
-		*/
+		 * Begin a new object
+		 * @access protected
+		 */
 		function _newobj() {
 			$this->n++;
 			$this->offsets[$this->n]=strlen($this->buffer);
@@ -3039,9 +3039,9 @@ 
 		}
 
 		/**
-		* Underline text
-		* @access protected
-		*/
+		 * Underline text
+		 * @access protected
+		 */
 		function _dounderline($x,$y,$txt) {
 			$up = $this->CurrentFont['up'];
 			$ut = $this->CurrentFont['ut'];
@@ -3050,9 +3050,9 @@ 
 		}
 
 		/**
-		* Extract info from a JPEG file
-		* @access protected
-		*/
+		 * Extract info from a JPEG file
+		 * @access protected
+		 */
 		function _parsejpg($file) {
 			$a=GetImageSize($file);
 			if(empty($a)) {
@@ -3082,9 +3082,9 @@ 
 		}
 
 		/**
-		* Extract info from a PNG file
-		* @access protected
-		*/
+		 * Extract info from a PNG file
+		 * @access protected
+		 */
 		function _parsepng($file) {
 			$f=fopen($file,'rb');
 			if(empty($f)) {
@@ -3179,9 +3179,9 @@ 
 		}
 
 		/**
-		* Read a 4-byte integer from file
-		* @access protected
-		*/
+		 * Read a 4-byte integer from file
+		 * @access protected
+		 */
 		function _freadint($f) {
 			//Read a 4-byte integer from file
 			$a=unpack('Ni',fread($f,4));
@@ -3189,9 +3189,9 @@ 
 		}
 
 		/**
-		* Format a text string
-		* @access protected
-		*/
+		 * Format a text string
+		 * @access protected
+		 */
 		function _textstring($s) {
 			if($this->isunicode) {
 				//Convert string to UTF-16BE
@@ -3201,9 +3201,9 @@ 
 		}
 
 		/**
-		* Format a text string
-		* @access protected
-		*/
+		 * Format a text string
+		 * @access protected
+		 */
 		function _escapetext($s) {
 			if($this->isunicode) {
 				//Convert string to UTF-16BE
@@ -3213,18 +3213,18 @@ 
 		}
 
 		/**
-		* Add \ before \, ( and )
-		* @access protected
-		*/
+		 * Add \ before \, ( and )
+		 * @access protected
+		 */
 		function _escape($s) {
 			// the chr(13) substitution fixes the Bugs item #1421290.
 			return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
 		}
 
 		/**
-		*
-		* @access protected
-		*/
+		 *
+		 * @access protected
+		 */
 		function _putstream($s) {
 			$this->_out('stream');
 			$this->_out($s);
@@ -3232,9 +3232,9 @@ 
 		}
 
 		/**
-		* Add a line to the document
-		* @access protected
-		*/
+		 * Add a line to the document
+		 * @access protected
+		 */
 		function _out($s) {
 			if($this->state==2) {
 				$this->pages[$this->page] .= $s."\n";
@@ -3245,12 +3245,12 @@ 
 		}
 
 		/**
-		* Adds unicode fonts.<br>
-		* Based on PDF Reference 1.3 (section 5)
-		* @access protected
-		* @author Nicola Asuni
-		* @since 1.52.0.TC005 (2005-01-05)
-		*/
+		 * Adds unicode fonts.<br>
+		 * Based on PDF Reference 1.3 (section 5)
+		 * @access protected
+		 * @author Nicola Asuni
+		 * @since 1.52.0.TC005 (2005-01-05)
+		 */
 		function _puttruetypeunicode($font) {
 			// Type0 Font
 			// A composite font—a font composed of other fonts, organized hierarchically
@@ -3358,39 +3358,39 @@ 
 		}
 
 		 /**
-		 * Converts UTF-8 strings to codepoints array.<br>
-		 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-		 * Based on: http://www.faqs.org/rfcs/rfc3629.html
-		 * <pre>
-		 * 	  Char. number range  |        UTF-8 octet sequence
-		 *       (hexadecimal)    |              (binary)
-		 *    --------------------+-----------------------------------------------
-		 *    0000 0000-0000 007F | 0xxxxxxx
-		 *    0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-		 *    0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-		 *    0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-		 *    ---------------------------------------------------------------------
-		 *
-		 *   ABFN notation:
-		 *   ---------------------------------------------------------------------
-		 *   UTF8-octets = *( UTF8-char )
-		 *   UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-		 *   UTF8-1      = %x00-7F
-		 *   UTF8-2      = %xC2-DF UTF8-tail
-		 *
-		 *   UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-		 *                 %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-		 *   UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-		 *                 %xF4 %x80-8F 2( UTF8-tail )
-		 *   UTF8-tail   = %x80-BF
-		 *   ---------------------------------------------------------------------
-		 * </pre>
-		 * @param string $str string to process.
-		 * @return array containing codepoints (UTF-8 characters values)
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 1.53.0.TC005 (2005-01-05)
-		 */
+		  * Converts UTF-8 strings to codepoints array.<br>
+		  * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
+		  * Based on: http://www.faqs.org/rfcs/rfc3629.html
+		  * <pre>
+		  * 	  Char. number range  |        UTF-8 octet sequence
+		  *       (hexadecimal)    |              (binary)
+		  *    --------------------+-----------------------------------------------
+		  *    0000 0000-0000 007F | 0xxxxxxx
+		  *    0000 0080-0000 07FF | 110xxxxx 10xxxxxx
+		  *    0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
+		  *    0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+		  *    ---------------------------------------------------------------------
+		  *
+		  *   ABFN notation:
+		  *   ---------------------------------------------------------------------
+		  *   UTF8-octets = *( UTF8-char )
+		  *   UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
+		  *   UTF8-1      = %x00-7F
+		  *   UTF8-2      = %xC2-DF UTF8-tail
+		  *
+		  *   UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+		  *                 %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+		  *   UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+		  *                 %xF4 %x80-8F 2( UTF8-tail )
+		  *   UTF8-tail   = %x80-BF
+		  *   ---------------------------------------------------------------------
+		  * </pre>
+		  * @param string $str string to process.
+		  * @return array containing codepoints (UTF-8 characters values)
+		  * @access protected
+		  * @author Nicola Asuni
+		  * @since 1.53.0.TC005 (2005-01-05)
+		  */
 		function UTF8StringToArray($str) {
 			if(!$this->isunicode) {
 				return $str; // string is not in unicode
@@ -3458,10 +3458,10 @@ 
 		/**
 		 * Converts UTF-8 strings to UTF16-BE.<br>
 		 * Based on: http://www.faqs.org/rfcs/rfc2781.html
-	 	 * <pre>
+		 * <pre>
 		 *   Encoding UTF-16:
 		 *
- 		 *   Encoding of a single character from an ISO 10646 character value to
+		 *   Encoding of a single character from an ISO 10646 character value to
 		 *    UTF-16 proceeds as follows. Let U be the character number, no greater
 		 *    than 0x10FFFF.
 		 *
@@ -3526,7 +3526,7 @@ 
 		// ====================================================
 
 		/**
-	 	 * Set header font.
+		 * Set header font.
 		 * @param array $font font
 		 * @since 1.1
 		 */
@@ -3535,7 +3535,7 @@ 
 		}
 
 		/**
-	 	 * Set footer font.
+		 * Set footer font.
 		 * @param array $font font
 		 * @since 1.1
 		 */
@@ -3544,7 +3544,7 @@ 
 		}
 
 		/**
-	 	 * Set language array.
+		 * Set language array.
 		 * @param array $language
 		 * @since 1.1
 		 */
@@ -3553,7 +3553,7 @@ 
 		}
 
 		/**
-	 	 * Set document barcode.
+		 * Set document barcode.
 		 * @param string $bc barcode
 		 */
 		function setBarcode($bc="") {
@@ -3561,7 +3561,7 @@ 
 		}
 
 		/**
-	 	 * Print Barcode.
+		 * Print Barcode.
 		 * @param int $x x position in user units
 		 * @param int $y y position in user units
 		 * @param int $w width in user units
@@ -3637,7 +3637,7 @@ 
 		}
 
 		/**
-	 	 * Returns the PDF data.
+		 * Returns the PDF data.
 		 */
 		function getPDFData() {
 			if($this->state < 3) {

Spacing +722 added lines, -722 removed lines

@@ -65,12 +65,12 @@ 
  @version 1.53.0.TC031_PHP4
  */
 
-if(!class_exists('TCPDF')) {
+if (!class_exists('TCPDF')) {
 	/**
 	 * define default PDF document producer
 	 */
 	//define('PDF_PRODUCER','TCPDF 1.53.0.TC031_PHP4 (http://tcpdf.sourceforge.net)');
-	define('PDF_PRODUCER','Instant Zero (http://www.instant-zero.com)');
+	define('PDF_PRODUCER', 'Instant Zero (http://www.instant-zero.com)');
 
 	/**
 	* This is a PHP4 class for generating PDF files on-the-fly without requiring external extensions.<br>
@@ -694,14 +694,14 @@ 
 		 * @access private
 		 * @since 1.53.0.TC017
 		 */
-		var $prevFillColor = array(255,255,255);
+		var $prevFillColor = array(255, 255, 255);
 
 		/**
 		 * @var store previous text color as RGB array
 		 * @access private
 		 * @since 1.53.0.TC017
 		 */
-		var $prevTextColor = array(0,0,0);
+		var $prevTextColor = array(0, 0, 0);
 
 		/**
 		 * @var store previous font family
@@ -732,7 +732,7 @@ 
 		 * @param boolean $unicode TRUE means that the input text is unicode (default = true)
 		 * @param String $encoding charset encoding; default is UTF-8
 		 */
-		function TCPDF($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding="UTF-8") {
+		function TCPDF($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = "UTF-8") {
 
 			/* Set internal character encoding to ASCII */
 			if (function_exists("mb_internal_encoding") AND mb_internal_encoding()) {
@@ -743,31 +743,31 @@ 
 			//Some checks
 			$this->_dochecks();
 			//Initialization of properties
-			$this->isunicode=$unicode;
-			$this->page=0;
-			$this->n=2;
-			$this->buffer='';
-			$this->pages=array();
-			$this->OrientationChanges=array();
-			$this->state=0;
-			$this->fonts=array();
-			$this->FontFiles=array();
-			$this->diffs=array();
-			$this->images=array();
-			$this->links=array();
-			$this->InFooter=false;
-			$this->lasth=0;
-			$this->FontFamily='';
-			$this->FontStyle='';
-			$this->FontSizePt=12;
-			$this->underline=false;
-			$this->DrawColor='0 G';
-			$this->FillColor='0 g';
-			$this->TextColor='0 g';
-			$this->ColorFlag=false;
-			$this->ws=0;
+			$this->isunicode = $unicode;
+			$this->page = 0;
+			$this->n = 2;
+			$this->buffer = '';
+			$this->pages = array();
+			$this->OrientationChanges = array();
+			$this->state = 0;
+			$this->fonts = array();
+			$this->FontFiles = array();
+			$this->diffs = array();
+			$this->images = array();
+			$this->links = array();
+			$this->InFooter = false;
+			$this->lasth = 0;
+			$this->FontFamily = '';
+			$this->FontStyle = '';
+			$this->FontSizePt = 12;
+			$this->underline = false;
+			$this->DrawColor = '0 G';
+			$this->FillColor = '0 g';
+			$this->TextColor = '0 g';
+			$this->ColorFlag = false;
+			$this->ws = 0;
 			//Standard Unicode fonts
-			$this->CoreFonts=array(
+			$this->CoreFonts = array(
 			'courier'=>'Courier',
 			'courierB'=>'Courier-Bold',
 			'courierI'=>'Courier-Oblique',
@@ -786,111 +786,111 @@ 
 
 			//Scale factor
 			// 2003-06-11 - Nicola Asuni : changed if/else with switch statement
-			switch (strtolower($unit)){
-				case 'pt': {$this->k=1; break;}
-				case 'mm': {$this->k=72/25.4; break;}
-				case 'cm': {$this->k=72/2.54; break;}
-				case 'in': {$this->k=72; break;}
-				default : {$this->Error('Incorrect unit: '.$unit); break;}
+			switch (strtolower($unit)) {
+				case 'pt': {$this->k = 1; break; }
+				case 'mm': {$this->k = 72 / 25.4; break; }
+				case 'cm': {$this->k = 72 / 2.54; break; }
+				case 'in': {$this->k = 72; break; }
+				default : {$this->Error('Incorrect unit: '.$unit); break; }
 			}
 
 			//Page format
-			if(is_string($format)) {
+			if (is_string($format)) {
 				// 2002-07-24 - Nicola Asuni (info@tecnick.com)
 				// Added new page formats (45 standard ISO paper formats and 4 american common formats).
 				// Paper cordinates are calculated in this way: (inches * 72) where (1 inch = 2.54 cm)
-				switch (strtoupper($format)){
-					case '4A0': {$format = array(4767.87,6740.79); break;}
-					case '2A0': {$format = array(3370.39,4767.87); break;}
-					case 'A0': {$format = array(2383.94,3370.39); break;}
-					case 'A1': {$format = array(1683.78,2383.94); break;}
-					case 'A2': {$format = array(1190.55,1683.78); break;}
-					case 'A3': {$format = array(841.89,1190.55); break;}
-					case 'A4': default: {$format = array(595.28,841.89); break;}
-					case 'A5': {$format = array(419.53,595.28); break;}
-					case 'A6': {$format = array(297.64,419.53); break;}
-					case 'A7': {$format = array(209.76,297.64); break;}
-					case 'A8': {$format = array(147.40,209.76); break;}
-					case 'A9': {$format = array(104.88,147.40); break;}
-					case 'A10': {$format = array(73.70,104.88); break;}
-					case 'B0': {$format = array(2834.65,4008.19); break;}
-					case 'B1': {$format = array(2004.09,2834.65); break;}
-					case 'B2': {$format = array(1417.32,2004.09); break;}
-					case 'B3': {$format = array(1000.63,1417.32); break;}
-					case 'B4': {$format = array(708.66,1000.63); break;}
-					case 'B5': {$format = array(498.90,708.66); break;}
-					case 'B6': {$format = array(354.33,498.90); break;}
-					case 'B7': {$format = array(249.45,354.33); break;}
-					case 'B8': {$format = array(175.75,249.45); break;}
-					case 'B9': {$format = array(124.72,175.75); break;}
-					case 'B10': {$format = array(87.87,124.72); break;}
-					case 'C0': {$format = array(2599.37,3676.54); break;}
-					case 'C1': {$format = array(1836.85,2599.37); break;}
-					case 'C2': {$format = array(1298.27,1836.85); break;}
-					case 'C3': {$format = array(918.43,1298.27); break;}
-					case 'C4': {$format = array(649.13,918.43); break;}
-					case 'C5': {$format = array(459.21,649.13); break;}
-					case 'C6': {$format = array(323.15,459.21); break;}
-					case 'C7': {$format = array(229.61,323.15); break;}
-					case 'C8': {$format = array(161.57,229.61); break;}
-					case 'C9': {$format = array(113.39,161.57); break;}
-					case 'C10': {$format = array(79.37,113.39); break;}
-					case 'RA0': {$format = array(2437.80,3458.27); break;}
-					case 'RA1': {$format = array(1729.13,2437.80); break;}
-					case 'RA2': {$format = array(1218.90,1729.13); break;}
-					case 'RA3': {$format = array(864.57,1218.90); break;}
-					case 'RA4': {$format = array(609.45,864.57); break;}
-					case 'SRA0': {$format = array(2551.18,3628.35); break;}
-					case 'SRA1': {$format = array(1814.17,2551.18); break;}
-					case 'SRA2': {$format = array(1275.59,1814.17); break;}
-					case 'SRA3': {$format = array(907.09,1275.59); break;}
-					case 'SRA4': {$format = array(637.80,907.09); break;}
-					case 'LETTER': {$format = array(612.00,792.00); break;}
-					case 'LEGAL': {$format = array(612.00,1008.00); break;}
-					case 'EXECUTIVE': {$format = array(521.86,756.00); break;}
-					case 'FOLIO': {$format = array(612.00,936.00); break;}
+				switch (strtoupper($format)) {
+					case '4A0': {$format = array(4767.87, 6740.79); break; }
+					case '2A0': {$format = array(3370.39, 4767.87); break; }
+					case 'A0': {$format = array(2383.94, 3370.39); break; }
+					case 'A1': {$format = array(1683.78, 2383.94); break; }
+					case 'A2': {$format = array(1190.55, 1683.78); break; }
+					case 'A3': {$format = array(841.89, 1190.55); break; }
+					case 'A4': default: {$format = array(595.28, 841.89); break; }
+					case 'A5': {$format = array(419.53, 595.28); break; }
+					case 'A6': {$format = array(297.64, 419.53); break; }
+					case 'A7': {$format = array(209.76, 297.64); break; }
+					case 'A8': {$format = array(147.40, 209.76); break; }
+					case 'A9': {$format = array(104.88, 147.40); break; }
+					case 'A10': {$format = array(73.70, 104.88); break; }
+					case 'B0': {$format = array(2834.65, 4008.19); break; }
+					case 'B1': {$format = array(2004.09, 2834.65); break; }
+					case 'B2': {$format = array(1417.32, 2004.09); break; }
+					case 'B3': {$format = array(1000.63, 1417.32); break; }
+					case 'B4': {$format = array(708.66, 1000.63); break; }
+					case 'B5': {$format = array(498.90, 708.66); break; }
+					case 'B6': {$format = array(354.33, 498.90); break; }
+					case 'B7': {$format = array(249.45, 354.33); break; }
+					case 'B8': {$format = array(175.75, 249.45); break; }
+					case 'B9': {$format = array(124.72, 175.75); break; }
+					case 'B10': {$format = array(87.87, 124.72); break; }
+					case 'C0': {$format = array(2599.37, 3676.54); break; }
+					case 'C1': {$format = array(1836.85, 2599.37); break; }
+					case 'C2': {$format = array(1298.27, 1836.85); break; }
+					case 'C3': {$format = array(918.43, 1298.27); break; }
+					case 'C4': {$format = array(649.13, 918.43); break; }
+					case 'C5': {$format = array(459.21, 649.13); break; }
+					case 'C6': {$format = array(323.15, 459.21); break; }
+					case 'C7': {$format = array(229.61, 323.15); break; }
+					case 'C8': {$format = array(161.57, 229.61); break; }
+					case 'C9': {$format = array(113.39, 161.57); break; }
+					case 'C10': {$format = array(79.37, 113.39); break; }
+					case 'RA0': {$format = array(2437.80, 3458.27); break; }
+					case 'RA1': {$format = array(1729.13, 2437.80); break; }
+					case 'RA2': {$format = array(1218.90, 1729.13); break; }
+					case 'RA3': {$format = array(864.57, 1218.90); break; }
+					case 'RA4': {$format = array(609.45, 864.57); break; }
+					case 'SRA0': {$format = array(2551.18, 3628.35); break; }
+					case 'SRA1': {$format = array(1814.17, 2551.18); break; }
+					case 'SRA2': {$format = array(1275.59, 1814.17); break; }
+					case 'SRA3': {$format = array(907.09, 1275.59); break; }
+					case 'SRA4': {$format = array(637.80, 907.09); break; }
+					case 'LETTER': {$format = array(612.00, 792.00); break; }
+					case 'LEGAL': {$format = array(612.00, 1008.00); break; }
+					case 'EXECUTIVE': {$format = array(521.86, 756.00); break; }
+					case 'FOLIO': {$format = array(612.00, 936.00); break; }
 					// default: {$this->Error('Unknown page format: '.$format); break;}
 					// END CHANGES Nicola Asuni
 				}
-				$this->fwPt=$format[0];
-				$this->fhPt=$format[1];
+				$this->fwPt = $format[0];
+				$this->fhPt = $format[1];
 			}
 			else {
-				$this->fwPt=$format[0]*$this->k;
-				$this->fhPt=$format[1]*$this->k;
+				$this->fwPt = $format[0] * $this->k;
+				$this->fhPt = $format[1] * $this->k;
 			}
 
-			$this->fw=$this->fwPt/$this->k;
-			$this->fh=$this->fhPt/$this->k;
+			$this->fw = $this->fwPt / $this->k;
+			$this->fh = $this->fhPt / $this->k;
 
 			//Page orientation
-			$orientation=strtolower($orientation);
-			if($orientation=='p' or $orientation=='portrait') {
-				$this->DefOrientation='P';
-				$this->wPt=$this->fwPt;
-				$this->hPt=$this->fhPt;
+			$orientation = strtolower($orientation);
+			if ($orientation == 'p' or $orientation == 'portrait') {
+				$this->DefOrientation = 'P';
+				$this->wPt = $this->fwPt;
+				$this->hPt = $this->fhPt;
 			}
-			elseif($orientation=='l' or $orientation=='landscape') {
-				$this->DefOrientation='L';
-				$this->wPt=$this->fhPt;
-				$this->hPt=$this->fwPt;
+			elseif ($orientation == 'l' or $orientation == 'landscape') {
+				$this->DefOrientation = 'L';
+				$this->wPt = $this->fhPt;
+				$this->hPt = $this->fwPt;
 			}
 			else {
 				$this->Error('Incorrect orientation: '.$orientation);
 			}
 
-			$this->CurOrientation=$this->DefOrientation;
-			$this->w=$this->wPt/$this->k;
-			$this->h=$this->hPt/$this->k;
+			$this->CurOrientation = $this->DefOrientation;
+			$this->w = $this->wPt / $this->k;
+			$this->h = $this->hPt / $this->k;
 			//Page margins (1 cm)
-			$margin=28.35/$this->k;
-			$this->SetMargins($margin,$margin);
+			$margin = 28.35 / $this->k;
+			$this->SetMargins($margin, $margin);
 			//Interior cell margin (1 mm)
-			$this->cMargin=$margin/10;
+			$this->cMargin = $margin / 10;
 			//Line width (0.2 mm)
-			$this->LineWidth=.567/$this->k;
+			$this->LineWidth = .567 / $this->k;
 			//Automatic page break
-			$this->SetAutoPageBreak(true,2*$margin);
+			$this->SetAutoPageBreak(true, 2 * $margin);
 			//Full width display mode
 			$this->SetDisplayMode('fullwidth');
 			//Compression
@@ -908,7 +908,7 @@ 
 			$this->issetcolor = false;
 			$this->tableborder = 0;
 			$this->tdbegin = false;
-			$this->tdwidth=  0;
+			$this->tdwidth = 0;
 			$this->tdheight = 0;
 			$this->tdalign = "L";
 			$this->tdbgcolor = false;
@@ -924,7 +924,7 @@ 
 		* @since 1.5.2
 		*/
 		function setImageScale($scale) {
-			$this->imgscale=$scale;
+			$this->imgscale = $scale;
 		}
 
 		/**
@@ -985,14 +985,14 @@ 
 		* @since 1.0
 		* @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
 		*/
-		function SetMargins($left, $top, $right=-1) {
+		function SetMargins($left, $top, $right = -1) {
 			//Set left, top and right margins
-			$this->lMargin=$left;
-			$this->tMargin=$top;
-			if($right==-1) {
-				$right=$left;
+			$this->lMargin = $left;
+			$this->tMargin = $top;
+			if ($right == -1) {
+				$right = $left;
 			}
-			$this->rMargin=$right;
+			$this->rMargin = $right;
 		}
 
 		/**
@@ -1003,9 +1003,9 @@ 
 		*/
 		function SetLeftMargin($margin) {
 			//Set left margin
-			$this->lMargin=$margin;
-			if(($this->page>0) and ($this->x<$margin)) {
-				$this->x=$margin;
+			$this->lMargin = $margin;
+			if (($this->page > 0) and ($this->x < $margin)) {
+				$this->x = $margin;
 			}
 		}
 
@@ -1017,7 +1017,7 @@ 
 		*/
 		function SetTopMargin($margin) {
 			//Set top margin
-			$this->tMargin=$margin;
+			$this->tMargin = $margin;
 		}
 
 		/**
@@ -1028,7 +1028,7 @@ 
 		*/
 		function SetRightMargin($margin) {
 			//Set right margin
-			$this->rMargin=$margin;
+			$this->rMargin = $margin;
 		}
 
 		/**
@@ -1038,11 +1038,11 @@ 
 		* @since 1.0
 		* @see Cell(), MultiCell(), AcceptPageBreak()
 		*/
-		function SetAutoPageBreak($auto, $margin=0) {
+		function SetAutoPageBreak($auto, $margin = 0) {
 			//Set auto page break mode and triggering margin
-			$this->AutoPageBreak=$auto;
-			$this->bMargin=$margin;
-			$this->PageBreakTrigger=$this->h-$margin;
+			$this->AutoPageBreak = $auto;
+			$this->bMargin = $margin;
+			$this->PageBreakTrigger = $this->h - $margin;
 		}
 
 		/**
@@ -1051,16 +1051,16 @@ 
 		* @param string $layout The page layout. Possible values are:<ul><li>single: displays one page at once</li><li>continuous: displays pages continuously (default)</li><li>two: displays two pages on two columns</li><li>default: uses viewer default mode</li></ul>
 		* @since 1.2
 		*/
-		function SetDisplayMode($zoom, $layout='continuous') {
+		function SetDisplayMode($zoom, $layout = 'continuous') {
 			//Set display mode in viewer
-			if($zoom=='fullpage' or $zoom=='fullwidth' or $zoom=='real' or $zoom=='default' or !is_string($zoom)) {
-				$this->ZoomMode=$zoom;
+			if ($zoom == 'fullpage' or $zoom == 'fullwidth' or $zoom == 'real' or $zoom == 'default' or !is_string($zoom)) {
+				$this->ZoomMode = $zoom;
 			}
 			else {
 				$this->Error('Incorrect zoom display mode: '.$zoom);
 			}
-			if($layout=='single' or $layout=='continuous' or $layout=='two' or $layout=='default') {
-				$this->LayoutMode=$layout;
+			if ($layout == 'single' or $layout == 'continuous' or $layout == 'two' or $layout == 'default') {
+				$this->LayoutMode = $layout;
 			}
 			else {
 				$this->Error('Incorrect layout display mode: '.$layout);
@@ -1075,11 +1075,11 @@ 
 		*/
 		function SetCompression($compress) {
 			//Set page compression
-			if(function_exists('gzcompress')) {
-				$this->compress=$compress;
+			if (function_exists('gzcompress')) {
+				$this->compress = $compress;
 			}
 			else {
-				$this->compress=false;
+				$this->compress = false;
 			}
 		}
 
@@ -1091,7 +1091,7 @@ 
 		*/
 		function SetTitle($title) {
 			//Title of document
-			$this->title=$title;
+			$this->title = $title;
 		}
 
 		/**
@@ -1102,7 +1102,7 @@ 
 		*/
 		function SetSubject($subject) {
 			//Subject of document
-			$this->subject=$subject;
+			$this->subject = $subject;
 		}
 
 		/**
@@ -1113,7 +1113,7 @@ 
 		*/
 		function SetAuthor($author) {
 			//Author of document
-			$this->author=$author;
+			$this->author = $author;
 		}
 
 		/**
@@ -1124,7 +1124,7 @@ 
 		*/
 		function SetKeywords($keywords) {
 			//Keywords of document
-			$this->keywords=$keywords;
+			$this->keywords = $keywords;
 		}
 
 		/**
@@ -1135,7 +1135,7 @@ 
 		*/
 		function SetCreator($creator) {
 			//Creator of document
-			$this->creator=$creator;
+			$this->creator = $creator;
 		}
 
 		/**
@@ -1159,7 +1159,7 @@ 
 		* @since 1.4
 		* @see PageNo(), Footer()
 		*/
-		function AliasNbPages($alias='{nb}') {
+		function AliasNbPages($alias = '{nb}') {
 			//Define an alias for total number of pages
 			$this->AliasNbPages = $this->_escapetext($alias);
 		}
@@ -1183,7 +1183,7 @@ 
 		*/
 		function Open() {
 			//Begin document
-			$this->state=1;
+			$this->state = 1;
 		}
 
 		/**
@@ -1193,16 +1193,16 @@ 
 		*/
 		function Close() {
 			//Terminate document
-			if($this->state==3) {
+			if ($this->state == 3) {
 				return;
 			}
-			if($this->page==0) {
+			if ($this->page == 0) {
 				$this->AddPage();
 			}
 			//Page footer
-			$this->InFooter=true;
+			$this->InFooter = true;
 			$this->Footer();
-			$this->InFooter=false;
+			$this->InFooter = false;
 			//Close page
 			$this->_endpage();
 			//Close document
@@ -1217,24 +1217,24 @@ 
 		* @since 1.0
 		* @see TCPDF(), Header(), Footer(), SetMargins()
 		*/
-		function AddPage($orientation='') {
+		function AddPage($orientation = '') {
 			//Start a new page
-			if($this->state==0) {
+			if ($this->state == 0) {
 				$this->Open();
 			}
-			$family=$this->FontFamily;
-			$style=$this->FontStyle.($this->underline ? 'U' : '');
-			$size=$this->FontSizePt;
-			$lw=$this->LineWidth;
-			$dc=$this->DrawColor;
-			$fc=$this->FillColor;
-			$tc=$this->TextColor;
-			$cf=$this->ColorFlag;
-			if($this->page>0) {
+			$family = $this->FontFamily;
+			$style = $this->FontStyle.($this->underline ? 'U' : '');
+			$size = $this->FontSizePt;
+			$lw = $this->LineWidth;
+			$dc = $this->DrawColor;
+			$fc = $this->FillColor;
+			$tc = $this->TextColor;
+			$cf = $this->ColorFlag;
+			if ($this->page > 0) {
 				//Page footer
-				$this->InFooter=true;
+				$this->InFooter = true;
 				$this->Footer();
-				$this->InFooter=false;
+				$this->InFooter = false;
 				//Close page
 				$this->_endpage();
 			}
@@ -1243,45 +1243,45 @@ 
 			//Set line cap style to square
 			$this->_out('2 J');
 			//Set line width
-			$this->LineWidth=$lw;
-			$this->_out(sprintf('%.2f w',$lw*$this->k));
+			$this->LineWidth = $lw;
+			$this->_out(sprintf('%.2f w', $lw * $this->k));
 			//Set font
-			if($family) {
-				$this->SetFont($family,$style,$size);
+			if ($family) {
+				$this->SetFont($family, $style, $size);
 			}
 			//Set colors
-			$this->DrawColor=$dc;
-			if($dc!='0 G') {
+			$this->DrawColor = $dc;
+			if ($dc != '0 G') {
 				$this->_out($dc);
 			}
-			$this->FillColor=$fc;
-			if($fc!='0 g') {
+			$this->FillColor = $fc;
+			if ($fc != '0 g') {
 				$this->_out($fc);
 			}
-			$this->TextColor=$tc;
-			$this->ColorFlag=$cf;
+			$this->TextColor = $tc;
+			$this->ColorFlag = $cf;
 			//Page header
 			$this->Header();
 			//Restore line width
-			if($this->LineWidth!=$lw) {
-				$this->LineWidth=$lw;
-				$this->_out(sprintf('%.2f w',$lw*$this->k));
+			if ($this->LineWidth != $lw) {
+				$this->LineWidth = $lw;
+				$this->_out(sprintf('%.2f w', $lw * $this->k));
 			}
 			//Restore font
-			if($family) {
-				$this->SetFont($family,$style,$size);
+			if ($family) {
+				$this->SetFont($family, $style, $size);
 			}
 			//Restore colors
-			if($this->DrawColor!=$dc) {
-				$this->DrawColor=$dc;
+			if ($this->DrawColor != $dc) {
+				$this->DrawColor = $dc;
 				$this->_out($dc);
 			}
-			if($this->FillColor!=$fc) {
-				$this->FillColor=$fc;
+			if ($this->FillColor != $fc) {
+				$this->FillColor = $fc;
 				$this->_out($fc);
 			}
-			$this->TextColor=$tc;
-			$this->ColorFlag=$cf;
+			$this->TextColor = $tc;
+			$this->ColorFlag = $cf;
 		}
 
 
@@ -1293,7 +1293,7 @@ 
 		 * @param string $ht string to print as title on document header
 		 * @param string $hs string to print on document header
 		*/
-		function setHeaderData($ln="", $lw=0, $ht="", $hs="") {
+		function setHeaderData($ln = "", $lw = 0, $ht = "", $hs = "") {
 			$this->header_logo = $ln;
 			$this->header_logo_width = $lw;
 			$this->header_title = $ht;
@@ -1305,7 +1305,7 @@ 
 		 * (minimum distance between header and top page margin)
 		 * @param int $hm distance in millimeters
 		*/
-		function setHeaderMargin($hm=10) {
+		function setHeaderMargin($hm = 10) {
 			$this->header_margin = $hm;
 		}
 
@@ -1314,7 +1314,7 @@ 
 		 * (minimum distance between footer and bottom page margin)
 		 * @param int $fm distance in millimeters
 		*/
-		function setFooterMargin($fm=10) {
+		function setFooterMargin($fm = 10) {
 			$this->footer_margin = $fm;
 		}
 
@@ -1322,7 +1322,7 @@ 
 	 	 * Set a flag to print page header.
 		 * @param boolean $val set to true to print the page header (default), false otherwise.
 		*/
-		function setPrintHeader($val=true) {
+		function setPrintHeader($val = true) {
 			$this->print_header = $val;
 		}
 
@@ -1330,7 +1330,7 @@ 
 	 	 * Set a flag to print page footer.
 		 * @param boolean $value set to true to print the page footer (default), false otherwise.
 		*/
-		function setPrintFooter($val=true) {
+		function setPrintFooter($val = true) {
 			$this->print_footer = $val;
 		}
 
@@ -1402,7 +1402,7 @@ 
 				}
 
 				//set font
-				$this->SetFont($this->footer_font[0], $this->footer_font[1] , $this->footer_font[2]);
+				$this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
 				//set style for cell border
 				$line_width = 0.3;
 				$this->SetLineWidth($line_width);
@@ -1447,15 +1447,15 @@ 
 		* @since 1.3
 		* @see SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
 		*/
-		function SetDrawColor($r, $g=-1, $b=-1) {
+		function SetDrawColor($r, $g = -1, $b = -1) {
 			//Set color for all stroking operations
-			if(($r==0 and $g==0 and $b==0) or $g==-1) {
-				$this->DrawColor=sprintf('%.3f G',$r/255);
+			if (($r == 0 and $g == 0 and $b == 0) or $g == -1) {
+				$this->DrawColor = sprintf('%.3f G', $r / 255);
 			}
 			else {
-				$this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
+				$this->DrawColor = sprintf('%.3f %.3f %.3f RG', $r / 255, $g / 255, $b / 255);
 			}
-			if($this->page>0) {
+			if ($this->page > 0) {
 				$this->_out($this->DrawColor);
 			}
 		}
@@ -1469,16 +1469,16 @@ 
 		* @since 1.3
 		* @see SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
 		*/
-		function SetFillColor($r, $g=-1, $b=-1, $storeprev=false) {
+		function SetFillColor($r, $g = -1, $b = -1, $storeprev = false) {
 			//Set color for all filling operations
-			if(($r==0 and $g==0 and $b==0) or $g==-1) {
-				$this->FillColor=sprintf('%.3f g',$r/255);
+			if (($r == 0 and $g == 0 and $b == 0) or $g == -1) {
+				$this->FillColor = sprintf('%.3f g', $r / 255);
 			}
 			else {
-				$this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+				$this->FillColor = sprintf('%.3f %.3f %.3f rg', $r / 255, $g / 255, $b / 255);
 			}
-			$this->ColorFlag=($this->FillColor!=$this->TextColor);
-			if($this->page>0) {
+			$this->ColorFlag = ($this->FillColor != $this->TextColor);
+			if ($this->page > 0) {
 				$this->_out($this->FillColor);
 			}
 			if ($storeprev) {
@@ -1496,15 +1496,15 @@ 
 		* @since 1.3
 		* @see SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
 		*/
-		function SetTextColor($r, $g=-1, $b=-1, $storeprev=false) {
+		function SetTextColor($r, $g = -1, $b = -1, $storeprev = false) {
 			//Set color for text
-			if(($r==0 and $g==0 and $b==0) or $g==-1) {
-				$this->TextColor=sprintf('%.3f g',$r/255);
+			if (($r == 0 and $g == 0 and $b == 0) or $g == -1) {
+				$this->TextColor = sprintf('%.3f g', $r / 255);
 			}
 			else {
-				$this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+				$this->TextColor = sprintf('%.3f %.3f %.3f rg', $r / 255, $g / 255, $b / 255);
 			}
-			$this->ColorFlag=($this->FillColor!=$this->TextColor);
+			$this->ColorFlag = ($this->FillColor != $this->TextColor);
 			if ($storeprev) {
 				// store color as previous value
 				$this->prevTextColor = array($r, $g, $b);
@@ -1523,16 +1523,16 @@ 
 			$s = (string)$s;
 			$cw = &$this->CurrentFont['cw'];
 			$w = 0;
-			if($this->isunicode) {
+			if ($this->isunicode) {
 				$unicode = $this->UTF8StringToArray($s);
-				foreach($unicode as $char) {
+				foreach ($unicode as $char) {
 					if (isset($cw[$char])) {
-						$w+=$cw[$char];
-					} elseif(isset($cw[ord($char)])) {
-						$w+=$cw[ord($char)];
-					} elseif(isset($cw[chr($char)])) {
-						$w+=$cw[chr($char)];
-					} elseif(isset($this->CurrentFont['desc']['MissingWidth'])) {
+						$w += $cw[$char];
+					} elseif (isset($cw[ord($char)])) {
+						$w += $cw[ord($char)];
+					} elseif (isset($cw[chr($char)])) {
+						$w += $cw[chr($char)];
+					} elseif (isset($this->CurrentFont['desc']['MissingWidth'])) {
 						$w += $this->CurrentFont['desc']['MissingWidth']; // set default size
 					} else {
 						$w += 500;
@@ -1540,7 +1540,7 @@ 
 				}
 			} else {
 				$l = strlen($s);
-				for($i=0; $i<$l; $i++) {
+				for ($i = 0; $i < $l; $i++) {
 					if (isset($cw[$s{$i}])) {
 						$w += $cw[$s{$i}];
 					} else if (isset($cw[ord($s{$i})])) {
@@ -1559,9 +1559,9 @@ 
 		*/
 		function SetLineWidth($width) {
 			//Set line width
-			$this->LineWidth=$width;
-			if($this->page>0) {
-				$this->_out(sprintf('%.2f w',$width*$this->k));
+			$this->LineWidth = $width;
+			if ($this->page > 0) {
+				$this->_out(sprintf('%.2f w', $width * $this->k));
 			}
 		}
 
@@ -1576,7 +1576,7 @@ 
 		*/
 		function Line($x1, $y1, $x2, $y2) {
 			//Draw a line
-			$this->_out(sprintf('%.2f %.2f m %.2f %.2f l S', $x1*$this->k, ($this->h-$y1)*$this->k, $x2*$this->k, ($this->h-$y2)*$this->k));
+			$this->_out(sprintf('%.2f %.2f m %.2f %.2f l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));
 		}
 
 		/**
@@ -1589,18 +1589,18 @@ 
 		* @since 1.0
 		* @see SetLineWidth(), SetDrawColor(), SetFillColor()
 		*/
-		function Rect($x, $y, $w, $h, $style='') {
+		function Rect($x, $y, $w, $h, $style = '') {
 			//Draw a rectangle
-			if($style=='F') {
-				$op='f';
+			if ($style == 'F') {
+				$op = 'f';
 			}
-			elseif($style=='FD' or $style=='DF') {
-				$op='B';
+			elseif ($style == 'FD' or $style == 'DF') {
+				$op = 'B';
 			}
 			else {
-				$op='S';
+				$op = 'S';
 			}
-			$this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+			$this->_out(sprintf('%.2f %.2f %.2f %.2f re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
 		}
 
 		/**
@@ -1618,74 +1618,74 @@ 
 		* @since 1.5
 		* @see SetFont()
 		*/
-		function AddFont($family, $style='', $file='') {
-			if(empty($family)) {
+		function AddFont($family, $style = '', $file = '') {
+			if (empty($family)) {
 				return;
 			}
 
 			//Add a TrueType or Type1 font
 			$family = strtolower($family);
-			if((!$this->isunicode) AND ($family == 'arial')) {
+			if ((!$this->isunicode) AND ($family == 'arial')) {
 				$family = 'helvetica';
 			}
 
-			$style=strtoupper($style);
-			$style=str_replace('U','',$style);
-			if($style == 'IB') {
+			$style = strtoupper($style);
+			$style = str_replace('U', '', $style);
+			if ($style == 'IB') {
 				$style = 'BI';
 			}
 
 			$fontkey = $family.$style;
 			// check if the font has been already added
-			if(isset($this->fonts[$fontkey])) {
+			if (isset($this->fonts[$fontkey])) {
 				return;
 			}
 
-			if($file=='') {
+			if ($file == '') {
 				$file = str_replace(' ', '', $family).strtolower($style).'.php';
 			}
-			if(!file_exists($this->_getfontpath().$file)) {
+			if (!file_exists($this->_getfontpath().$file)) {
 				// try to load the basic file without styles
 				$file = str_replace(' ', '', $family).'.php';
 			}
 
 			include($this->_getfontpath().$file);
 
-			if(!isset($name) AND !isset($fpdf_charwidths)) {
+			if (!isset($name) AND !isset($fpdf_charwidths)) {
 				$this->Error('Could not include font definition file');
 			}
 
-			$i = count($this->fonts)+1;
+			$i = count($this->fonts) + 1;
 
-			if($this->isunicode) {
+			if ($this->isunicode) {
 				$this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file, 'ctg'=>$ctg);
 				$fpdf_charwidths[$fontkey] = $cw;
 			} else {
-				$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$this->CoreFonts[$fontkey], 'up'=>-100, 'ut'=>50, 'cw'=>$fpdf_charwidths[$fontkey]);
+				$this->fonts[$fontkey] = array('i'=>$i, 'type'=>'core', 'name'=>$this->CoreFonts[$fontkey], 'up'=>-100, 'ut'=>50, 'cw'=>$fpdf_charwidths[$fontkey]);
 			}
 
-			if(isset($diff) AND (!empty($diff))) {
+			if (isset($diff) AND (!empty($diff))) {
 				//Search existing encodings
-				$d=0;
-				$nb=count($this->diffs);
-				for($i=1;$i<=$nb;$i++) {
-					if($this->diffs[$i]==$diff) {
-						$d=$i;
+				$d = 0;
+				$nb = count($this->diffs);
+				for ($i = 1; $i <= $nb; $i++) {
+					if ($this->diffs[$i] == $diff) {
+						$d = $i;
 						break;
 					}
 				}
-				if($d==0) {
-					$d=$nb+1;
-					$this->diffs[$d]=$diff;
+				if ($d == 0) {
+					$d = $nb + 1;
+					$this->diffs[$d] = $diff;
 				}
-				$this->fonts[$fontkey]['diff']=$d;
+				$this->fonts[$fontkey]['diff'] = $d;
 			}
-			if(!empty($file)) {
-				if((strcasecmp($type,"TrueType") == 0) OR (strcasecmp($type,"TrueTypeUnicode") == 0)) {
-					$this->FontFiles[$file]=array('length1'=>$originalsize);
+			if (!empty($file)) {
+				if ((strcasecmp($type, "TrueType") == 0) OR (strcasecmp($type, "TrueTypeUnicode") == 0)) {
+					$this->FontFiles[$file] = array('length1'=>$originalsize);
 				}
 				else {
-					$this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
+					$this->FontFiles[$file] = array('length1'=>$size1, 'length2'=>$size2);
 				}
 			}
 		}
@@ -1717,7 +1717,7 @@ 
 		* @since 1.0
 		* @see AddFont(), SetFontSize(), Cell(), MultiCell(), Write()
 		*/
-		function SetFont($family, $style='', $size=0) {
+		function SetFont($family, $style = '', $size = 0) {
 			// save previous values
 			$this->prevFontFamily = $this->FontFamily;
 			$this->prevFontStyle = $this->FontStyle;
@@ -1725,39 +1725,39 @@ 
 			//Select a font; size given in points
 			global $fpdf_charwidths;
 
-			$family=strtolower($family);
-			if($family=='') {
-				$family=$this->FontFamily;
+			$family = strtolower($family);
+			if ($family == '') {
+				$family = $this->FontFamily;
 			}
-			if((!$this->isunicode) AND ($family == 'arial')) {
+			if ((!$this->isunicode) AND ($family == 'arial')) {
 				$family = 'helvetica';
 			}
-			elseif(($family=="symbol") OR ($family=="zapfdingbats")) {
-				$style='';
+			elseif (($family == "symbol") OR ($family == "zapfdingbats")) {
+				$style = '';
 			}
-			$style=strtoupper($style);
+			$style = strtoupper($style);
 
-			if(strpos($style,'U')!==false) {
-				$this->underline=true;
-				$style=str_replace('U','',$style);
+			if (strpos($style, 'U') !== false) {
+				$this->underline = true;
+				$style = str_replace('U', '', $style);
 			}
 			else {
-				$this->underline=false;
+				$this->underline = false;
 			}
-			if($style=='IB') {
-				$style='BI';
+			if ($style == 'IB') {
+				$style = 'BI';
 			}
-			if($size==0) {
-				$size=$this->FontSizePt;
+			if ($size == 0) {
+				$size = $this->FontSizePt;
 			}
 
 			// try to add font (if not already added)
-			if($this->isunicode) {
+			if ($this->isunicode) {
 				$this->AddFont($family, $style);
 			}
 
 			//Test if font is already selected
-			if(($this->FontFamily == $family) AND ($this->FontStyle == $style) AND ($this->FontSizePt == $size)) {
+			if (($this->FontFamily == $family) AND ($this->FontStyle == $style) AND ($this->FontSizePt == $size)) {
 				return;
 			}
 
@@ -1767,32 +1767,32 @@ 
 			//}
 
 			//Test if used for the first time
-			if(!isset($this->fonts[$fontkey])) {
+			if (!isset($this->fonts[$fontkey])) {
 				//Check if one of the standard fonts
-				if(isset($this->CoreFonts[$fontkey])) {
-					if(!isset($fpdf_charwidths[$fontkey])) {
+				if (isset($this->CoreFonts[$fontkey])) {
+					if (!isset($fpdf_charwidths[$fontkey])) {
 						//Load metric file
 						$file = $family;
-						if(($family!='symbol') AND ($family!='zapfdingbats')) {
+						if (($family != 'symbol') AND ($family != 'zapfdingbats')) {
 							$file .= strtolower($style);
 						}
-						if(!file_exists($this->_getfontpath().$file.'.php')) {
+						if (!file_exists($this->_getfontpath().$file.'.php')) {
 							// try to load the basic file without styles
 							$file = $family;
 							$fontkey = $family;
 						}
 						include($this->_getfontpath().$file.'.php');
-						if (($this->isunicode AND !isset($ctg)) OR ((!$this->isunicode) AND (!isset($fpdf_charwidths[$fontkey]))) ) {
+						if (($this->isunicode AND !isset($ctg)) OR ((!$this->isunicode) AND (!isset($fpdf_charwidths[$fontkey])))) {
 							$this->Error("Could not include font metric file [".$fontkey."]: ".$this->_getfontpath().$file.".php");
 						}
 					}
 					$i = count($this->fonts) + 1;
 
-					if($this->isunicode) {
+					if ($this->isunicode) {
 						$this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file, 'ctg'=>$ctg);
 						$fpdf_charwidths[$fontkey] = $cw;
 					} else {
-						$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$this->CoreFonts[$fontkey], 'up'=>-100, 'ut'=>50, 'cw'=>$fpdf_charwidths[$fontkey]);
+						$this->fonts[$fontkey] = array('i'=>$i, 'type'=>'core', 'name'=>$this->CoreFonts[$fontkey], 'up'=>-100, 'ut'=>50, 'cw'=>$fpdf_charwidths[$fontkey]);
 					}
 				}
 				else {
@@ -1805,7 +1805,7 @@ 
 			$this->FontSizePt = $size;
 			$this->FontSize = $size / $this->k;
 			$this->CurrentFont = &$this->fonts[$fontkey];
-			if($this->page>0) {
+			if ($this->page > 0) {
 				$this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 			}
 		}
@@ -1818,12 +1818,12 @@ 
 		*/
 		function SetFontSize($size) {
 			//Set font size in points
-			if($this->FontSizePt==$size) {
+			if ($this->FontSizePt == $size) {
 				return;
 			}
 			$this->FontSizePt = $size;
 			$this->FontSize = $size / $this->k;
-			if($this->page > 0) {
+			if ($this->page > 0) {
 				$this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 			}
 		}
@@ -1836,8 +1836,8 @@ 
 		*/
 		function AddLink() {
 			//Create a new internal link
-			$n=count($this->links)+1;
-			$this->links[$n]=array(0,0);
+			$n = count($this->links) + 1;
+			$this->links[$n] = array(0, 0);
 			return $n;
 		}
 
@@ -1849,15 +1849,15 @@ 
 		* @since 1.5
 		* @see AddLink()
 		*/
-		function SetLink($link, $y=0, $page=-1) {
+		function SetLink($link, $y = 0, $page = -1) {
 			//Set destination of internal link
-			if($y==-1) {
-				$y=$this->y;
+			if ($y == -1) {
+				$y = $this->y;
 			}
-			if($page==-1) {
-				$page=$this->page;
+			if ($page == -1) {
+				$page = $this->page;
 			}
-			$this->links[$link]=array($page,$y);
+			$this->links[$link] = array($page, $y);
 		}
 
 		/**
@@ -1872,7 +1872,7 @@ 
 		*/
 		function Link($x, $y, $w, $h, $link) {
 			//Put a link on the page
-			$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h*$this->k, $link);
+			$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);
 		}
 
 		/**
@@ -1885,12 +1885,12 @@ 
 		*/
 		function Text($x, $y, $txt) {
 			//Output a string
-			$s=sprintf('BT %.2f %.2f Td (%s) Tj ET', $x * $this->k, ($this->h-$y) * $this->k, $this->_escapetext($txt));
-			if($this->underline AND ($txt!='')) {
-				$s .= ' '.$this->_dounderline($x,$y,$txt);
+			$s = sprintf('BT %.2f %.2f Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->_escapetext($txt));
+			if ($this->underline AND ($txt != '')) {
+				$s .= ' '.$this->_dounderline($x, $y, $txt);
 			}
-			if($this->ColorFlag) {
-				$s='q '.$this->TextColor.' '.$s.' Q';
+			if ($this->ColorFlag) {
+				$s = 'q '.$this->TextColor.' '.$s.' Q';
 			}
 			$this->_out($s);
 		}
@@ -1960,30 +1960,30 @@ 
 		* @since 1.0
 		* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
 		*/
-		function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='') {
+		function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = 0, $link = '') {
 			//Output a cell
-			$k=$this->k;
-			if(($this->y + $h) > $this->PageBreakTrigger AND empty($this->InFooter) AND $this->AcceptPageBreak()) {
+			$k = $this->k;
+			if (($this->y + $h) > $this->PageBreakTrigger AND empty($this->InFooter) AND $this->AcceptPageBreak()) {
 				//Automatic page break
 				$x = $this->x;
 				$ws = $this->ws;
-				if($ws > 0) {
+				if ($ws > 0) {
 					$this->ws = 0;
 					$this->_out('0 Tw');
 				}
 				$this->AddPage($this->CurOrientation);
 				$this->x = $x;
-				if($ws > 0) {
+				if ($ws > 0) {
 					$this->ws = $ws;
-					$this->_out(sprintf('%.3f Tw',$ws * $k));
+					$this->_out(sprintf('%.3f Tw', $ws * $k));
 				}
 			}
-			if($w == 0) {
+			if ($w == 0) {
 				$w = $this->w - $this->rMargin - $this->x;
 			}
 			$s = '';
-			if(($fill == 1) OR ($border == 1)) {
-				if($fill == 1) {
+			if (($fill == 1) OR ($border == 1)) {
+				if ($fill == 1) {
 					$op = ($border == 1) ? 'B' : 'f';
 				}
 				else {
@@ -1991,56 +1991,56 @@ 
 				}
 				$s = sprintf('%.2f %.2f %.2f %.2f re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);
 			}
-			if(is_string($border)) {
-				$x=$this->x;
-				$y=$this->y;
-				if(strpos($border,'L')!==false) {
-					$s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+			if (is_string($border)) {
+				$x = $this->x;
+				$y = $this->y;
+				if (strpos($border, 'L') !== false) {
+					$s .= sprintf('%.2f %.2f m %.2f %.2f l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);
 				}
-				if(strpos($border,'T')!==false) {
-					$s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+				if (strpos($border, 'T') !== false) {
+					$s .= sprintf('%.2f %.2f m %.2f %.2f l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);
 				}
-				if(strpos($border,'R')!==false) {
-					$s.=sprintf('%.2f %.2f m %.2f %.2f l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+				if (strpos($border, 'R') !== false) {
+					$s .= sprintf('%.2f %.2f m %.2f %.2f l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
 				}
-				if(strpos($border,'B')!==false) {
-					$s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+				if (strpos($border, 'B') !== false) {
+					$s .= sprintf('%.2f %.2f m %.2f %.2f l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
 				}
 			}
-			if($txt != '') {
+			if ($txt != '') {
 				$width = $this->GetStringWidth($txt);
-				if($align == 'R') {
+				if ($align == 'R') {
 					$dx = $w - $this->cMargin - $width;
 				}
-				elseif($align=='C') {
-					$dx = ($w - $width)/2;
+				elseif ($align == 'C') {
+					$dx = ($w - $width) / 2;
 				}
 				else {
 					$dx = $this->cMargin;
 				}
-				if($this->ColorFlag) {
+				if ($this->ColorFlag) {
 					$s .= 'q '.$this->TextColor.' ';
 				}
 				$txt2 = $this->_escapetext($txt);
-				$s.=sprintf('BT %.2f %.2f Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + 0.5 * $h + 0.3 * $this->FontSize)) * $k, $txt2);
-				if($this->underline) {
-					$s.=' '.$this->_dounderline($this->x + $dx, $this->y + 0.5 * $h + 0.3 * $this->FontSize, $txt);
+				$s .= sprintf('BT %.2f %.2f Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + 0.5 * $h + 0.3 * $this->FontSize)) * $k, $txt2);
+				if ($this->underline) {
+					$s .= ' '.$this->_dounderline($this->x + $dx, $this->y + 0.5 * $h + 0.3 * $this->FontSize, $txt);
 				}
-				if($this->ColorFlag) {
-					$s.=' Q';
+				if ($this->ColorFlag) {
+					$s .= ' Q';
 				}
-				if($link) {
+				if ($link) {
 					$this->Link($this->x + $dx, $this->y + 0.5 * $h - 0.5 * $this->FontSize, $width, $this->FontSize, $link);
 				}
 			}
-			if($s) {
+			if ($s) {
 				$this->_out($s);
 			}
 			$this->lasth = $h;
-			if($ln>0) {
+			if ($ln > 0) {
 				//Go to next line
 				$this->y += $h;
-				if($ln == 1) {
+				if ($ln == 1) {
 					$this->x = $this->lMargin;
 				}
 			}
@@ -2062,7 +2062,7 @@ 
 		* @since 1.3
 		* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
 		*/
-		function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1) {
+		function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = 0, $ln = 1) {
 
 			// save current position
 			$prevx = $this->x;
@@ -2071,7 +2071,7 @@ 
 			//Output text with automatic or explicit line breaks
 			$cw = &$this->CurrentFont['cw'];
 
-			if($w == 0) {
+			if ($w == 0) {
 				$w = $this->w - $this->rMargin - $this->x;
 			}
 
@@ -2080,86 +2080,86 @@ 
 			$s = str_replace("\r", '', $txt); // remove carriage returns
 			$nb = strlen($s);
 
-			$b=0;
-			if($border) {
-				if($border==1) {
-					$border='LTRB';
-					$b='LRT';
-					$b2='LR';
+			$b = 0;
+			if ($border) {
+				if ($border == 1) {
+					$border = 'LTRB';
+					$b = 'LRT';
+					$b2 = 'LR';
 				}
 				else {
-					$b2='';
-					if(strpos($border,'L')!==false) {
-						$b2.='L';
+					$b2 = '';
+					if (strpos($border, 'L') !== false) {
+						$b2 .= 'L';
 					}
-					if(strpos($border,'R')!==false) {
-						$b2.='R';
+					if (strpos($border, 'R') !== false) {
+						$b2 .= 'R';
 					}
-					$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
+					$b = (strpos($border, 'T') !== false) ? $b2.'T' : $b2;
 				}
 			}
-			$sep=-1;
-			$i=0;
-			$j=0;
-			$l=0;
-			$ns=0;
-			$nl=1;
-			while($i<$nb) {
+			$sep = -1;
+			$i = 0;
+			$j = 0;
+			$l = 0;
+			$ns = 0;
+			$nl = 1;
+			while ($i < $nb) {
 				//Get next character
 				$c = $s{$i};
-				if(preg_match("/[\n]/u", $c)) {
+				if (preg_match("/[\n]/u", $c)) {
 					//Explicit line break
-					if($this->ws > 0) {
+					if ($this->ws > 0) {
 						$this->ws = 0;
 						$this->_out('0 Tw');
 					}
-					$this->Cell($w, $h, substr($s, $j, $i-$j), $b, 2, $align, $fill);
+					$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 					$i++;
-					$sep=-1;
-					$j=$i;
-					$l=0;
-					$ns=0;
+					$sep = -1;
+					$j = $i;
+					$l = 0;
+					$ns = 0;
 					$nl++;
-					if($border and $nl==2) {
+					if ($border and $nl == 2) {
 						$b = $b2;
 					}
 					continue;
 				}
-				if(preg_match("/[ ]/u", $c)) {
+				if (preg_match("/[ ]/u", $c)) {
 					$sep = $i;
 					$ls = $l;
 					$ns++;
 				}
 
-				$l = $this->GetStringWidth(substr($s, $j, $i-$j));
+				$l = $this->GetStringWidth(substr($s, $j, $i - $j));
 
-				if($l > $wmax) {
+				if ($l > $wmax) {
 					//Automatic line break
-					if($sep == -1) {
-						if($i == $j) {
+					if ($sep == -1) {
+						if ($i == $j) {
 							$i++;
 						}
-						if($this->ws > 0) {
+						if ($this->ws > 0) {
 							$this->ws = 0;
 							$this->_out('0 Tw');
 						}
-						$this->Cell($w, $h, substr($s, $j, $i-$j), $b, 2, $align, $fill);
+						$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 					}
 					else {
-						if($align=='J') {
-							$this->ws = ($ns>1) ? ($wmax-$ls)/($ns-1) : 0;
+						if ($align == 'J') {
+							$this->ws = ($ns > 1) ? ($wmax - $ls) / ($ns - 1) : 0;
 							$this->_out(sprintf('%.3f Tw', $this->ws * $this->k));
 						}
-						$this->Cell($w, $h, substr($s, $j, $sep-$j), $b, 2, $align, $fill);
+						$this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
 						$i = $sep + 1;
 					}
-					$sep=-1;
-					$j=$i;
-					$l=0;
-					$ns=0;
+					$sep = -1;
+					$j = $i;
+					$l = 0;
+					$ns = 0;
 					$nl++;
-					if($border AND ($nl==2)) {
-						$b=$b2;
+					if ($border AND ($nl == 2)) {
+						$b = $b2;
 					}
 				}
 				else {
@@ -2167,25 +2167,25 @@ 
 				}
 			}
 			//Last chunk
-			if($this->ws>0) {
-				$this->ws=0;
+			if ($this->ws > 0) {
+				$this->ws = 0;
 				$this->_out('0 Tw');
 			}
-			if($border and is_int(strpos($border,'B'))) {
-				$b.='B';
+			if ($border and is_int(strpos($border, 'B'))) {
+				$b .= 'B';
 			}
-			$this->Cell($w, $h, substr($s, $j, $i-$j), $b, 2, $align, $fill);
+			$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 
 			// move cursor to specified position
 			// since: 2007-03-03
-			 if($ln == 1) {
+			 if ($ln == 1) {
 				// go to the beginning of the next line
 				$this->x = $this->lMargin;
-			} elseif($ln == 0) {
+			} elseif ($ln == 0) {
 				// go to the top-right of the cell
 				$this->y = $prevy;
 				$this->x = $prevx + $w;
-			} elseif($ln == 2) {
+			} elseif ($ln == 2) {
 				// go to the bottom-left of the cell
 				$this->x = $prevx;
 			}
@@ -2210,7 +2210,7 @@ 
 		* @since 1.5
 		* @see SetFont(), SetTextColor(), AddLink(), MultiCell(), SetAutoPageBreak()
 		*/
-		function Write($h, $txt, $link='', $fill=0) {
+		function Write($h, $txt, $link = '', $fill = 0) {
 
 			//Output text in flowing mode
 			$cw = &$this->CurrentFont['cw'];
@@ -2221,27 +2221,27 @@ 
 			$nb = strlen($s);
 
 			// handle single space character
-			if(($nb==1) AND preg_match("/[ ]/u", $s)) {
+			if (($nb == 1) AND preg_match("/[ ]/u", $s)) {
 				$this->x += $this->GetStringWidth($s);
 				return;
 			}
 
-			$sep=-1;
-			$i=0;
-			$j=0;
-			$l=0;
-			$nl=1;
-			while($i<$nb) {
+			$sep = -1;
+			$i = 0;
+			$j = 0;
+			$l = 0;
+			$nl = 1;
+			while ($i < $nb) {
 				//Get next character
-				$c=$s{$i};
-				if(preg_match("/[\n]/u", $c)) {
+				$c = $s{$i};
+				if (preg_match("/[\n]/u", $c)) {
 					//Explicit line break
-					$this->Cell($w, $h, substr($s, $j, $i-$j), 0, 2, '', $fill, $link);
+					$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', $fill, $link);
 					$i++;
 					$sep = -1;
 					$j = $i;
 					$l = 0;
-					if($nl == 1) {
+					if ($nl == 1) {
 						$this->x = $this->lMargin;
 						$w = $this->w - $this->rMargin - $this->x;
 						$wmax = ($w - 2 * $this->cMargin);
@@ -2249,38 +2249,38 @@ 
 					$nl++;
 					continue;
 				}
-				if(preg_match("/[ ]/u", $c)) {
-					$sep= $i;
+				if (preg_match("/[ ]/u", $c)) {
+					$sep = $i;
 				}
 
-				$l = $this->GetStringWidth(substr($s, $j, $i-$j));
+				$l = $this->GetStringWidth(substr($s, $j, $i - $j));
 
-				if($l > $wmax) {
+				if ($l > $wmax) {
 					//Automatic line break (word wrapping)
-					if($sep == -1) {
-						if($this->x > $this->lMargin) {
+					if ($sep == -1) {
+						if ($this->x > $this->lMargin) {
 							//Move to next line
 							$this->x = $this->lMargin;
 							$this->y += $h;
-							$w=$this->w - $this->rMargin - $this->x;
-							$wmax=($w - 2 * $this->cMargin);
+							$w = $this->w - $this->rMargin - $this->x;
+							$wmax = ($w - 2 * $this->cMargin);
 							$i++;
 							$nl++;
 							continue;
 						}
-						if($i==$j) {
+						if ($i == $j) {
 							$i++;
 						}
-						$this->Cell($w, $h, substr($s, $j, $i-$j), 0, 2, '', $fill, $link);
+						$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', $fill, $link);
 					}
 					else {
-						$this->Cell($w, $h, substr($s, $j, $sep-$j), 0, 2, '', $fill, $link);
-						$i=$sep+1;
+						$this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', $fill, $link);
+						$i = $sep + 1;
 					}
 					$sep = -1;
 					$j = $i;
 					$l = 0;
-					if($nl==1) {
+					if ($nl == 1) {
 						$this->x = $this->lMargin;
 						$w = $this->w - $this->rMargin - $this->x;
 						$wmax = ($w - 2 * $this->cMargin);
@@ -2293,7 +2293,7 @@ 
 			}
 
 			//Last chunk
-			if($i!=$j) {
+			if ($i != $j) {
 				$this->Cell($this->GetStringWidth(substr($s, $j)), $h, substr($s, $j), 0, 0, '', $fill, $link);
 			}
 		}
@@ -2318,56 +2318,56 @@ 
 		* @since 1.1
 		* @see AddLink()
 		*/
-		function Image($file, $x, $y, $w=0, $h=0, $type='', $link='') {
+		function Image($file, $x, $y, $w = 0, $h = 0, $type = '', $link = '') {
 			//Put an image on the page
-			if(!isset($this->images[$file])) {
+			if (!isset($this->images[$file])) {
 				//First use of image, get info
-				if($type == '') {
-					$pos = strrpos($file,'.');
-					if(empty($pos)) {
+				if ($type == '') {
+					$pos = strrpos($file, '.');
+					if (empty($pos)) {
 						$this->Error('Image file has no extension and no type was specified: '.$file);
 					}
-					$type = substr($file, $pos+1);
+					$type = substr($file, $pos + 1);
 				}
 				$type = strtolower($type);
 				$mqr = get_magic_quotes_runtime();
 				set_magic_quotes_runtime(0);
-				if($type == 'jpg' or $type == 'jpeg') {
-					$info=$this->_parsejpg($file);
+				if ($type == 'jpg' or $type == 'jpeg') {
+					$info = $this->_parsejpg($file);
 				}
-				elseif($type == 'png') {
-					$info=$this->_parsepng($file);
+				elseif ($type == 'png') {
+					$info = $this->_parsepng($file);
 				}
 				else {
 					//Allow for additional formats
-					$mtd='_parse'.$type;
-					if(!method_exists($this,$mtd)) {
+					$mtd = '_parse'.$type;
+					if (!method_exists($this, $mtd)) {
 						$this->Error('Unsupported image type: '.$type);
 					}
-					$info=$this->$mtd($file);
+					$info = $this->$mtd($file);
 				}
 				set_magic_quotes_runtime($mqr);
-				$info['i']=count($this->images)+1;
-				$this->images[$file]=$info;
+				$info['i'] = count($this->images) + 1;
+				$this->images[$file] = $info;
 			}
 			else {
-				$info=$this->images[$file];
+				$info = $this->images[$file];
 			}
 			//Automatic width and height calculation if needed
-			if(($w == 0) and ($h == 0)) {
+			if (($w == 0) and ($h == 0)) {
 				//Put image at 72 dpi
 				// 2004-06-14 :: Nicola Asuni, scale factor where added
 				$w = $info['w'] / ($this->imgscale * $this->k);
 				$h = $info['h'] / ($this->imgscale * $this->k);
 			}
-			if($w == 0) {
+			if ($w == 0) {
 				$w = $h * $info['w'] / $info['h'];
 			}
-			if($h == 0) {
+			if ($h == 0) {
 				$h = $w * $info['h'] / $info['w'];
 			}
-			$this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k, $info['i']));
-			if($link) {
+			$this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));
+			if ($link) {
 				$this->Link($x, $y, $w, $h, $link);
 			}
 
@@ -2383,14 +2383,14 @@ 
 		* @since 1.0
 		* @see Cell()
 		*/
-		function Ln($h='') {
+		function Ln($h = '') {
 			//Line feed; default value is last cell height
-			$this->x=$this->lMargin;
-			if(is_string($h)) {
-				$this->y+=$this->lasth;
+			$this->x = $this->lMargin;
+			if (is_string($h)) {
+				$this->y += $this->lasth;
 			}
 			else {
-				$this->y+=$h;
+				$this->y += $h;
 			}
 		}
 
@@ -2413,11 +2413,11 @@ 
 		*/
 		function SetX($x) {
 			//Set x position
-			if($x>=0) {
-				$this->x=$x;
+			if ($x >= 0) {
+				$this->x = $x;
 			}
 			else {
-				$this->x=$this->w+$x;
+				$this->x = $this->w + $x;
 			}
 		}
 
@@ -2440,12 +2440,12 @@ 
 		*/
 		function SetY($y) {
 			//Set y position and reset x
-			$this->x=$this->lMargin;
-			if($y>=0) {
-				$this->y=$y;
+			$this->x = $this->lMargin;
+			if ($y >= 0) {
+				$this->y = $y;
 			}
 			else {
-				$this->y=$this->h+$y;
+				$this->y = $this->h + $y;
 			}
 		}
 
@@ -2470,35 +2470,35 @@ 
 		* @since 1.0
 		* @see Close()
 		*/
-		function Output($name='',$dest='') {
+		function Output($name = '', $dest = '') {
 			//Output PDF to some destination
 			//Finish document if necessary
-			if($this->state < 3) {
+			if ($this->state < 3) {
 				$this->Close();
 			}
 			//Normalize parameters
-			if(is_bool($dest)) {
-				$dest=$dest ? 'D' : 'F';
-			}
-			$dest=strtoupper($dest);
-			if($dest=='') {
-				if($name=='') {
-					$name='doc.pdf';
-					$dest='I';
+			if (is_bool($dest)) {
+				$dest = $dest ? 'D' : 'F';
+			}
+			$dest = strtoupper($dest);
+			if ($dest == '') {
+				if ($name == '') {
+					$name = 'doc.pdf';
+					$dest = 'I';
 				} else {
-					$dest='F';
+					$dest = 'F';
 				}
 			}
-			switch($dest) {
+			switch ($dest) {
 				case 'I': {
 					//Send to standard output
-					if(ob_get_contents()) {
+					if (ob_get_contents()) {
 						$this->Error('Some data has already been output, can\'t send PDF file');
 					}
-					if(php_sapi_name()!='cli') {
+					if (php_sapi_name() != 'cli') {
 						//We send to a browser
 						header('Content-Type: application/pdf');
-						if(headers_sent()) {
+						if (headers_sent()) {
 							$this->Error('Some data has already been output to browser, can\'t send PDF file');
 						}
 						header('Content-Length: '.strlen($this->buffer));
@@ -2509,15 +2509,15 @@ 
 				}
 				case 'D': {
 					//Download file
-					if(ob_get_contents()) {
+					if (ob_get_contents()) {
 						$this->Error('Some data has already been output, can\'t send PDF file');
 					}
-					if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) {
+					if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
 						header('Content-Type: application/force-download');
 					} else {
 						header('Content-Type: application/octet-stream');
 					}
-					if(headers_sent()) {
+					if (headers_sent()) {
 						$this->Error('Some data has already been output to browser, can\'t send PDF file');
 					}
 					header('Content-Length: '.strlen($this->buffer));
@@ -2527,11 +2527,11 @@ 
 				}
 				case 'F': {
 					//Save to local file
-					$f=fopen($name,'wb');
-					if(!$f) {
+					$f = fopen($name, 'wb');
+					if (!$f) {
 						$this->Error('Unable to create output file: '.$name);
 					}
-					fwrite($f,$this->buffer,strlen($this->buffer));
+					fwrite($f, $this->buffer, strlen($this->buffer));
 					fclose($f);
 					break;
 				}
@@ -2554,12 +2554,12 @@ 
 		*/
 		function _dochecks() {
 			//Check for locale-related bug
-			if(1.1==1) {
+			if (1.1 == 1) {
 				$this->Error('Don\'t alter the locale before including class file');
 			}
 			//Check for decimal separator
-			if(sprintf('%.1f',1.0)!='1.0') {
-				setlocale(LC_NUMERIC,'C');
+			if (sprintf('%.1f', 1.0) != '1.0') {
+				setlocale(LC_NUMERIC, 'C');
 			}
 		}
 
@@ -2568,7 +2568,7 @@ 
 		* @access protected
 		*/
 		function _getfontpath() {
-			if(!defined('FPDF_FONTPATH') AND is_dir(dirname(__FILE__).'/font')) {
+			if (!defined('FPDF_FONTPATH') AND is_dir(dirname(__FILE__).'/font')) {
 				define('FPDF_FONTPATH', dirname(__FILE__).'/font/');
 			}
 			return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
@@ -2580,7 +2580,7 @@ 
 		*/
 		function _begindoc() {
 			//Start document
-			$this->state=1;
+			$this->state = 1;
 			$this->_out('%PDF-1.3');
 		}
 
@@ -2590,68 +2590,68 @@ 
 		*/
 		function _putpages() {
 			$nb = $this->page;
-			if(!empty($this->AliasNbPages)) {
+			if (!empty($this->AliasNbPages)) {
 				$nbstr = $this->UTF8ToUTF16BE($nb, false);
 				//Replace number of pages
-				for($n=1;$n<=$nb;$n++) {
-					$this->pages[$n]=str_replace($this->AliasNbPages, $nbstr, $this->pages[$n]);
+				for ($n = 1; $n <= $nb; $n++) {
+					$this->pages[$n] = str_replace($this->AliasNbPages, $nbstr, $this->pages[$n]);
 				}
 			}
-			if($this->DefOrientation=='P') {
-				$wPt=$this->fwPt;
-				$hPt=$this->fhPt;
+			if ($this->DefOrientation == 'P') {
+				$wPt = $this->fwPt;
+				$hPt = $this->fhPt;
 			}
 			else {
-				$wPt=$this->fhPt;
-				$hPt=$this->fwPt;
+				$wPt = $this->fhPt;
+				$hPt = $this->fwPt;
 			}
-			$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-			for($n=1;$n<=$nb;$n++) {
+			$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
+			for ($n = 1; $n <= $nb; $n++) {
 				//Page
 				$this->_newobj();
 				$this->_out('<</Type /Page');
 				$this->_out('/Parent 1 0 R');
-				if(isset($this->OrientationChanges[$n])) {
-					$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
+				if (isset($this->OrientationChanges[$n])) {
+					$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]', $hPt, $wPt));
 				}
 				$this->_out('/Resources 2 0 R');
-				if(isset($this->PageLinks[$n])) {
+				if (isset($this->PageLinks[$n])) {
 					//Links
-					$annots='/Annots [';
-					foreach($this->PageLinks[$n] as $pl) {
-						$rect=sprintf('%.2f %.2f %.2f %.2f',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
-						$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-						if(is_string($pl[4])) {
-							$annots.='/A <</S /URI /URI ('.$this->_escape($pl[4]).')>>>>';
+					$annots = '/Annots [';
+					foreach ($this->PageLinks[$n] as $pl) {
+						$rect = sprintf('%.2f %.2f %.2f %.2f', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
+						$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
+						if (is_string($pl[4])) {
+							$annots .= '/A <</S /URI /URI ('.$this->_escape($pl[4]).')>>>>';
 						}
 						else {
-							$l=$this->links[$pl[4]];
-							$h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
-							$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+							$l = $this->links[$pl[4]];
+							$h = isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
+							$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>', 1 + 2 * $l[0], $h - $l[1] * $this->k);
 						}
 					}
 					$this->_out($annots.']');
 				}
-				$this->_out('/Contents '.($this->n+1).' 0 R>>');
+				$this->_out('/Contents '.($this->n + 1).' 0 R>>');
 				$this->_out('endobj');
 				//Page content
-				$p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
+				$p = ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
 				$this->_newobj();
 				$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
 				$this->_putstream($p);
 				$this->_out('endobj');
 			}
 			//Pages root
-			$this->offsets[1]=strlen($this->buffer);
+			$this->offsets[1] = strlen($this->buffer);
 			$this->_out('1 0 obj');
 			$this->_out('<</Type /Pages');
-			$kids='/Kids [';
-			for($i=0;$i<$nb;$i++) {
-				$kids.=(3+2*$i).' 0 R ';
+			$kids = '/Kids [';
+			for ($i = 0; $i < $nb; $i++) {
+				$kids .= (3 + 2 * $i).' 0 R ';
 			}
 			$this->_out($kids.']');
 			$this->_out('/Count '.$nb);
-			$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt));
+			$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]', $wPt, $hPt));
 			$this->_out('>>');
 			$this->_out('endobj');
 		}
@@ -2662,46 +2662,46 @@ 
 		* @access protected
 		*/
 		function _putfonts() {
-			$nf=$this->n;
-			foreach($this->diffs as $diff) {
+			$nf = $this->n;
+			foreach ($this->diffs as $diff) {
 				//Encodings
 				$this->_newobj();
 				$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
 				$this->_out('endobj');
 			}
-			$mqr=get_magic_quotes_runtime();
+			$mqr = get_magic_quotes_runtime();
 			set_magic_quotes_runtime(0);
-			foreach($this->FontFiles as $file=>$info) {
+			foreach ($this->FontFiles as $file=>$info) {
 				//Font file embedding
 				$this->_newobj();
-				$this->FontFiles[$file]['n']=$this->n;
-				$font='';
-				$f=fopen($this->_getfontpath().$file,'rb',1);
-				if(!$f) {
+				$this->FontFiles[$file]['n'] = $this->n;
+				$font = '';
+				$f = fopen($this->_getfontpath().$file, 'rb', 1);
+				if (!$f) {
 					$this->Error('Font file not found');
 				}
-				while(!feof($f)) {
+				while (!feof($f)) {
 					$font .= fread($f, 8192);
 				}
 				fclose($f);
-				$compressed=(substr($file,-2)=='.z');
-				if(!$compressed && isset($info['length2'])) {
-					$header=(ord($font{0})==128);
-					if($header) {
+				$compressed = (substr($file, -2) == '.z');
+				if (!$compressed && isset($info['length2'])) {
+					$header = (ord($font{0}) == 128);
+					if ($header) {
 						//Strip first binary header
-						$font=substr($font,6);
+						$font = substr($font, 6);
 					}
-					if($header && ord($font{$info['length1']})==128) {
+					if ($header && ord($font{$info['length1']}) == 128) {
 						//Strip second binary header
-						$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+						$font = substr($font, 0, $info['length1']).substr($font, $info['length1'] + 6);
 					}
 				}
 				$this->_out('<</Length '.strlen($font));
-				if($compressed) {
+				if ($compressed) {
 					$this->_out('/Filter /FlateDecode');
 				}
 				$this->_out('/Length1 '.$info['length1']);
-				if(isset($info['length2'])) {
+				if (isset($info['length2'])) {
 					$this->_out('/Length2 '.$info['length2'].' /Length3 0');
 				}
 				$this->_out('>>');
@@ -2709,34 +2709,34 @@ 
 				$this->_out('endobj');
 			}
 			set_magic_quotes_runtime($mqr);
-			foreach($this->fonts as $k=>$font) {
+			foreach ($this->fonts as $k=>$font) {
 				//Font objects
-				$this->fonts[$k]['n']=$this->n+1;
-				$type=$font['type'];
-				$name=$font['name'];
-				if($type=='core') {
+				$this->fonts[$k]['n'] = $this->n + 1;
+				$type = $font['type'];
+				$name = $font['name'];
+				if ($type == 'core') {
 					//Standard font
 					$this->_newobj();
 					$this->_out('<</Type /Font');
 					$this->_out('/BaseFont /'.$name);
 					$this->_out('/Subtype /Type1');
-					if($name!='Symbol' && $name!='ZapfDingbats') {
+					if ($name != 'Symbol' && $name != 'ZapfDingbats') {
 						$this->_out('/Encoding /WinAnsiEncoding');
 					}
 					$this->_out('>>');
 					$this->_out('endobj');
-				} elseif($type=='Type1' || $type=='TrueType') {
+				} elseif ($type == 'Type1' || $type == 'TrueType') {
 					//Additional Type1 or TrueType font
 					$this->_newobj();
 					$this->_out('<</Type /Font');
 					$this->_out('/BaseFont /'.$name);
 					$this->_out('/Subtype /'.$type);
 					$this->_out('/FirstChar 32 /LastChar 255');
-					$this->_out('/Widths '.($this->n+1).' 0 R');
-					$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
-					if($font['enc']) {
-						if(isset($font['diff'])) {
-							$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+					$this->_out('/Widths '.($this->n + 1).' 0 R');
+					$this->_out('/FontDescriptor '.($this->n + 2).' 0 R');
+					if ($font['enc']) {
+						if (isset($font['diff'])) {
+							$this->_out('/Encoding '.($nf + $font['diff']).' 0 R');
 						} else {
 							$this->_out('/Encoding /WinAnsiEncoding');
 						}
@@ -2745,29 +2745,29 @@ 
 					$this->_out('endobj');
 					//Widths
 					$this->_newobj();
-					$cw=&$font['cw'];
-					$s='[';
-					for($i=32;$i<=255;$i++) {
-						$s.=$cw[chr($i)].' ';
+					$cw = &$font['cw'];
+					$s = '[';
+					for ($i = 32; $i <= 255; $i++) {
+						$s .= $cw[chr($i)].' ';
 					}
 					$this->_out($s.']');
 					$this->_out('endobj');
 					//Descriptor
 					$this->_newobj();
-					$s='<</Type /FontDescriptor /FontName /'.$name;
-					foreach($font['desc'] as $k=>$v) {
-						$s.=' /'.$k.' '.$v;
+					$s = '<</Type /FontDescriptor /FontName /'.$name;
+					foreach ($font['desc'] as $k=>$v) {
+						$s .= ' /'.$k.' '.$v;
 					}
 					$file = $font['file'];
-					if($file) {
-						$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+					if ($file) {
+						$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
 					}
 					$this->_out($s.'>>');
 					$this->_out('endobj');
 				} else {
 					//Allow for additional types
-					$mtd='_put'.strtolower($type);
-					if(!method_exists($this, $mtd)) {
+					$mtd = '_put'.strtolower($type);
+					if (!method_exists($this, $mtd)) {
 						$this->Error('Unsupported font type: '.$type);
 					}
 					$this->$mtd($font);
@@ -2780,35 +2780,35 @@ 
 		* @access protected
 		*/
 		function _putimages() {
-			$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+			$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 			reset($this->images);
-			while(list($file,$info)=each($this->images)) {
+			while (list($file, $info) = each($this->images)) {
 				$this->_newobj();
-				$this->images[$file]['n']=$this->n;
+				$this->images[$file]['n'] = $this->n;
 				$this->_out('<</Type /XObject');
 				$this->_out('/Subtype /Image');
 				$this->_out('/Width '.$info['w']);
 				$this->_out('/Height '.$info['h']);
-				if($info['cs']=='Indexed') {
-					$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+				if ($info['cs'] == 'Indexed') {
+					$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');
 				}
 				else {
 					$this->_out('/ColorSpace /'.$info['cs']);
-					if($info['cs']=='DeviceCMYK') {
+					if ($info['cs'] == 'DeviceCMYK') {
 						$this->_out('/Decode [1 0 1 0 1 0 1 0]');
 					}
 				}
 				$this->_out('/BitsPerComponent '.$info['bpc']);
-				if(isset($info['f'])) {
+				if (isset($info['f'])) {
 					$this->_out('/Filter /'.$info['f']);
 				}
-				if(isset($info['parms'])) {
+				if (isset($info['parms'])) {
 					$this->_out($info['parms']);
 				}
-				if(isset($info['trns']) and is_array($info['trns'])) {
-					$trns='';
-					for($i=0;$i<count($info['trns']);$i++) {
-						$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
+				if (isset($info['trns']) and is_array($info['trns'])) {
+					$trns = '';
+					for ($i = 0; $i < count($info['trns']); $i++) {
+						$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
 					}
 					$this->_out('/Mask ['.$trns.']');
 				}
@@ -2817,9 +2817,9 @@ 
 				unset($this->images[$file]['data']);
 				$this->_out('endobj');
 				//Palette
-				if($info['cs']=='Indexed') {
+				if ($info['cs'] == 'Indexed') {
 					$this->_newobj();
-					$pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];
+					$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
 					$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
 					$this->_putstream($pal);
 					$this->_out('endobj');
@@ -2832,7 +2832,7 @@ 
 		* @access protected
 		*/
 		function _putxobjectdict() {
-			foreach($this->images as $image) {
+			foreach ($this->images as $image) {
 				$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
 			}
 		}
@@ -2841,10 +2841,10 @@ 
 		* _putresourcedict
 		* @access protected
 		*/
-		function _putresourcedict(){
+		function _putresourcedict() {
 			$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 			$this->_out('/Font <<');
-			foreach($this->fonts as $font) {
+			foreach ($this->fonts as $font) {
 				$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
 			}
 			$this->_out('>>');
@@ -2861,7 +2861,7 @@ 
 			$this->_putfonts();
 			$this->_putimages();
 			//Resource dictionary
-			$this->offsets[2]=strlen($this->buffer);
+			$this->offsets[2] = strlen($this->buffer);
 			$this->_out('2 0 obj');
 			$this->_out('<<');
 			$this->_putresourcedict();
@@ -2875,19 +2875,19 @@ 
 		*/
 		function _putinfo() {
 			$this->_out('/Producer '.$this->_textstring(PDF_PRODUCER));
-			if(!empty($this->title)) {
+			if (!empty($this->title)) {
 				$this->_out('/Title '.$this->_textstring($this->title));
 			}
-			if(!empty($this->subject)) {
+			if (!empty($this->subject)) {
 				$this->_out('/Subject '.$this->_textstring($this->subject));
 			}
-			if(!empty($this->author)) {
+			if (!empty($this->author)) {
 				$this->_out('/Author '.$this->_textstring($this->author));
 			}
-			if(!empty($this->keywords)) {
+			if (!empty($this->keywords)) {
 				$this->_out('/Keywords '.$this->_textstring($this->keywords));
 			}
-			if(!empty($this->creator)) {
+			if (!empty($this->creator)) {
 				$this->_out('/Creator '.$this->_textstring($this->creator));
 			}
 			$this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
@@ -2900,25 +2900,25 @@ 
 		function _putcatalog() {
 			$this->_out('/Type /Catalog');
 			$this->_out('/Pages 1 0 R');
-			if($this->ZoomMode=='fullpage') {
+			if ($this->ZoomMode == 'fullpage') {
 				$this->_out('/OpenAction [3 0 R /Fit]');
 			}
-			elseif($this->ZoomMode=='fullwidth') {
+			elseif ($this->ZoomMode == 'fullwidth') {
 				$this->_out('/OpenAction [3 0 R /FitH null]');
 			}
-			elseif($this->ZoomMode=='real') {
+			elseif ($this->ZoomMode == 'real') {
 				$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
 			}
-			elseif(!is_string($this->ZoomMode)) {
-				$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
+			elseif (!is_string($this->ZoomMode)) {
+				$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode / 100).']');
 			}
-			if($this->LayoutMode=='single') {
+			if ($this->LayoutMode == 'single') {
 				$this->_out('/PageLayout /SinglePage');
 			}
-			elseif($this->LayoutMode=='continuous') {
+			elseif ($this->LayoutMode == 'continuous') {
 				$this->_out('/PageLayout /OneColumn');
 			}
-			elseif($this->LayoutMode=='two') {
+			elseif ($this->LayoutMode == 'two') {
 				$this->_out('/PageLayout /TwoColumnLeft');
 			}
 		}
@@ -2928,9 +2928,9 @@ 
 		* @access protected
 		*/
 		function _puttrailer() {
-			$this->_out('/Size '.($this->n+1));
+			$this->_out('/Size '.($this->n + 1));
 			$this->_out('/Root '.$this->n.' 0 R');
-			$this->_out('/Info '.($this->n-1).' 0 R');
+			$this->_out('/Info '.($this->n - 1).' 0 R');
 		}
 
 		/**
@@ -2962,12 +2962,12 @@ 
 			$this->_out('>>');
 			$this->_out('endobj');
 			//Cross-ref
-			$o=strlen($this->buffer);
+			$o = strlen($this->buffer);
 			$this->_out('xref');
-			$this->_out('0 '.($this->n+1));
+			$this->_out('0 '.($this->n + 1));
 			$this->_out('0000000000 65535 f ');
-			for($i=1;$i<=$this->n;$i++) {
-				$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+			for ($i = 1; $i <= $this->n; $i++) {
+				$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
 			}
 			//Trailer
 			$this->_out('trailer');
@@ -2977,7 +2977,7 @@ 
 			$this->_out('startxref');
 			$this->_out($o);
 			$this->_out('%%EOF');
-			$this->state=3;
+			$this->state = 3;
 		}
 
 		/**
@@ -2986,37 +2986,37 @@ 
 		*/
 		function _beginpage($orientation) {
 			$this->page++;
-			$this->pages[$this->page]='';
-			$this->state=2;
-			$this->x=$this->lMargin;
-			$this->y=$this->tMargin;
-			$this->FontFamily='';
+			$this->pages[$this->page] = '';
+			$this->state = 2;
+			$this->x = $this->lMargin;
+			$this->y = $this->tMargin;
+			$this->FontFamily = '';
 			//Page orientation
-			if(empty($orientation)) {
-				$orientation=$this->DefOrientation;
+			if (empty($orientation)) {
+				$orientation = $this->DefOrientation;
 			}
 			else {
-				$orientation=strtoupper($orientation{0});
-				if($orientation!=$this->DefOrientation) {
-					$this->OrientationChanges[$this->page]=true;
+				$orientation = strtoupper($orientation{0});
+				if ($orientation != $this->DefOrientation) {
+					$this->OrientationChanges[$this->page] = true;
 				}
 			}
-			if($orientation!=$this->CurOrientation) {
+			if ($orientation != $this->CurOrientation) {
 				//Change orientation
-				if($orientation=='P') {
-					$this->wPt=$this->fwPt;
-					$this->hPt=$this->fhPt;
-					$this->w=$this->fw;
-					$this->h=$this->fh;
+				if ($orientation == 'P') {
+					$this->wPt = $this->fwPt;
+					$this->hPt = $this->fhPt;
+					$this->w = $this->fw;
+					$this->h = $this->fh;
 				}
 				else {
-					$this->wPt=$this->fhPt;
-					$this->hPt=$this->fwPt;
-					$this->w=$this->fh;
-					$this->h=$this->fw;
+					$this->wPt = $this->fhPt;
+					$this->hPt = $this->fwPt;
+					$this->w = $this->fh;
+					$this->h = $this->fw;
 				}
-				$this->PageBreakTrigger=$this->h-$this->bMargin;
-				$this->CurOrientation=$orientation;
+				$this->PageBreakTrigger = $this->h - $this->bMargin;
+				$this->CurOrientation = $orientation;
 			}
 		}
 
@@ -3025,7 +3025,7 @@ 
 		* @access protected
 		*/
 		function _endpage() {
-			$this->state=1;
+			$this->state = 1;
 		}
 
 		/**
@@ -3034,7 +3034,7 @@ 
 		*/
 		function _newobj() {
 			$this->n++;
-			$this->offsets[$this->n]=strlen($this->buffer);
+			$this->offsets[$this->n] = strlen($this->buffer);
 			$this->_out($this->n.' 0 obj');
 		}
 
@@ -3042,10 +3042,10 @@ 
 		* Underline text
 		* @access protected
 		*/
-		function _dounderline($x,$y,$txt) {
+		function _dounderline($x, $y, $txt) {
 			$up = $this->CurrentFont['up'];
 			$ut = $this->CurrentFont['ut'];
-			$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt,' ');
+			$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt, ' ');
 			return sprintf('%.2f %.2f %.2f %.2f re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);
 		}
 
@@ -3054,31 +3054,31 @@ 
 		* @access protected
 		*/
 		function _parsejpg($file) {
-			$a=GetImageSize($file);
-			if(empty($a)) {
+			$a = GetImageSize($file);
+			if (empty($a)) {
 				$this->Error('Missing or incorrect image file: '.$file);
 			}
-			if($a[2]!=2) {
+			if ($a[2] != 2) {
 				$this->Error('Not a JPEG file: '.$file);
 			}
-			if(!isset($a['channels']) or $a['channels']==3) {
-				$colspace='DeviceRGB';
+			if (!isset($a['channels']) or $a['channels'] == 3) {
+				$colspace = 'DeviceRGB';
 			}
-			elseif($a['channels']==4) {
-				$colspace='DeviceCMYK';
+			elseif ($a['channels'] == 4) {
+				$colspace = 'DeviceCMYK';
 			}
 			else {
-				$colspace='DeviceGray';
+				$colspace = 'DeviceGray';
 			}
-			$bpc=isset($a['bits']) ? $a['bits'] : 8;
+			$bpc = isset($a['bits']) ? $a['bits'] : 8;
 			//Read whole file
-			$f=fopen($file,'rb');
-			$data='';
-			while(!feof($f)) {
-				$data.=fread($f,4096);
+			$f = fopen($file, 'rb');
+			$data = '';
+			while (!feof($f)) {
+				$data .= fread($f, 4096);
 			}
 			fclose($f);
-			return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
+			return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 		}
 
 		/**
@@ -3086,92 +3086,92 @@ 
 		* @access protected
 		*/
 		function _parsepng($file) {
-			$f=fopen($file,'rb');
-			if(empty($f)) {
+			$f = fopen($file, 'rb');
+			if (empty($f)) {
 				$this->Error('Can\'t open image file: '.$file);
 			}
 			//Check signature
-			if(fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
+			if (fread($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
 				$this->Error('Not a PNG file: '.$file);
 			}
 			//Read header chunk
-			fread($f,4);
-			if(fread($f,4)!='IHDR') {
+			fread($f, 4);
+			if (fread($f, 4) != 'IHDR') {
 				$this->Error('Incorrect PNG file: '.$file);
 			}
-			$w=$this->_freadint($f);
-			$h=$this->_freadint($f);
-			$bpc=ord(fread($f,1));
-			if($bpc>8) {
+			$w = $this->_freadint($f);
+			$h = $this->_freadint($f);
+			$bpc = ord(fread($f, 1));
+			if ($bpc > 8) {
 				$this->Error('16-bit depth not supported: '.$file);
 			}
-			$ct=ord(fread($f,1));
-			if($ct==0) {
-				$colspace='DeviceGray';
+			$ct = ord(fread($f, 1));
+			if ($ct == 0) {
+				$colspace = 'DeviceGray';
 			}
-			elseif($ct==2) {
-				$colspace='DeviceRGB';
+			elseif ($ct == 2) {
+				$colspace = 'DeviceRGB';
 			}
-			elseif($ct==3) {
-				$colspace='Indexed';
+			elseif ($ct == 3) {
+				$colspace = 'Indexed';
 			}
 			else {
 				$this->Error('Alpha channel not supported: '.$file);
 			}
-			if(ord(fread($f,1))!=0) {
+			if (ord(fread($f, 1)) != 0) {
 				$this->Error('Unknown compression method: '.$file);
 			}
-			if(ord(fread($f,1))!=0) {
+			if (ord(fread($f, 1)) != 0) {
 				$this->Error('Unknown filter method: '.$file);
 			}
-			if(ord(fread($f,1))!=0) {
+			if (ord(fread($f, 1)) != 0) {
 				$this->Error('Interlacing not supported: '.$file);
 			}
-			fread($f,4);
-			$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+			fread($f, 4);
+			$parms = '/DecodeParms <</Predictor 15 /Colors '.($ct == 2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
 			//Scan chunks looking for palette, transparency and image data
-			$pal='';
-			$trns='';
-			$data='';
+			$pal = '';
+			$trns = '';
+			$data = '';
 			do {
-				$n=$this->_freadint($f);
-				$type=fread($f,4);
-				if($type=='PLTE') {
+				$n = $this->_freadint($f);
+				$type = fread($f, 4);
+				if ($type == 'PLTE') {
 					//Read palette
-					$pal=fread($f,$n);
-					fread($f,4);
+					$pal = fread($f, $n);
+					fread($f, 4);
 				}
-				elseif($type=='tRNS') {
+				elseif ($type == 'tRNS') {
 					//Read transparency info
-					$t=fread($f,$n);
-					if($ct==0) {
-						$trns=array(ord(substr($t,1,1)));
+					$t = fread($f, $n);
+					if ($ct == 0) {
+						$trns = array(ord(substr($t, 1, 1)));
 					}
-					elseif($ct==2) {
-						$trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1)));
+					elseif ($ct == 2) {
+						$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
 					}
 					else {
-						$pos=strpos($t,chr(0));
-						if($pos!==false) {
-							$trns=array($pos);
+						$pos = strpos($t, chr(0));
+						if ($pos !== false) {
+							$trns = array($pos);
 						}
 					}
-					fread($f,4);
+					fread($f, 4);
 				}
-				elseif($type=='IDAT') {
+				elseif ($type == 'IDAT') {
 					//Read image data block
-					$data.=fread($f,$n);
-					fread($f,4);
+					$data .= fread($f, $n);
+					fread($f, 4);
 				}
-				elseif($type=='IEND') {
+				elseif ($type == 'IEND') {
 					break;
 				}
 				else {
-					fread($f,$n+4);
+					fread($f, $n + 4);
 				}
 			}
-			while($n);
-			if($colspace=='Indexed' and empty($pal)) {
+			while ($n);
+			if ($colspace == 'Indexed' and empty($pal)) {
 				$this->Error('Missing palette in '.$file);
 			}
 			fclose($f);
@@ -3184,7 +3184,7 @@ 
 		*/
 		function _freadint($f) {
 			//Read a 4-byte integer from file
-			$a=unpack('Ni',fread($f,4));
+			$a = unpack('Ni', fread($f, 4));
 			return $a['i'];
 		}
 
@@ -3193,11 +3193,11 @@ 
 		* @access protected
 		*/
 		function _textstring($s) {
-			if($this->isunicode) {
+			if ($this->isunicode) {
 				//Convert string to UTF-16BE
 				$s = $this->UTF8ToUTF16BE($s, true);
 			}
-			return '('. $this->_escape($s).')';
+			return '('.$this->_escape($s).')';
 		}
 
 		/**
@@ -3205,7 +3205,7 @@ 
 		* @access protected
 		*/
 		function _escapetext($s) {
-			if($this->isunicode) {
+			if ($this->isunicode) {
 				//Convert string to UTF-16BE
 				$s = $this->UTF8ToUTF16BE($s, false);
 			}
@@ -3236,7 +3236,7 @@ 
 		* @access protected
 		*/
 		function _out($s) {
-			if($this->state==2) {
+			if ($this->state == 2) {
 				$this->pages[$this->page] .= $s."\n";
 			}
 			else {
@@ -3272,7 +3272,7 @@ 
 			$this->_out('/BaseFont /'.$font['name'].'');
 			$this->_out('/CIDSystemInfo '.($this->n + 2).' 0 R');
 			$this->_out('/FontDescriptor '.($this->n + 3).' 0 R');
-			if (isset($font['desc']['MissingWidth'])){
+			if (isset($font['desc']['MissingWidth'])) {
 				$this->_out('/DW '.$font['desc']['MissingWidth'].''); // The default width for glyphs in the CIDFont MissingWidth
 			}
 			$w = "";
@@ -3341,12 +3341,12 @@ 
 			// A specification of the mapping from CIDs to glyph indices
 			$this->_newobj();
 			$ctgfile = $this->_getfontpath().$font['ctg'];
-			if(!file_exists($ctgfile)) {
+			if (!file_exists($ctgfile)) {
 				$this->Error('Font file not found: '.$ctgfile);
 			}
 			$size = filesize($ctgfile);
 			$this->_out('<</Length '.$size.'');
-			if(substr($ctgfile, -2) == '.z') { // check file extension
+			if (substr($ctgfile, -2) == '.z') { // check file extension
 				/* Decompresses data encoded using the public-domain
 				zlib/deflate compression method, reproducing the
 				original text or binary data */
@@ -3392,19 +3392,19 @@ 
 		 * @since 1.53.0.TC005 (2005-01-05)
 		 */
 		function UTF8StringToArray($str) {
-			if(!$this->isunicode) {
+			if (!$this->isunicode) {
 				return $str; // string is not in unicode
 			}
 			$unicode = array(); // array containing unicode values
-			$bytes  = array(); // array containing single character byte sequences
-			$numbytes  = 1; // number of octetc needed to represent the UTF-8 character
+			$bytes = array(); // array containing single character byte sequences
+			$numbytes = 1; // number of octetc needed to represent the UTF-8 character
 
 			$str .= ""; // force $str to be a string
 			$length = strlen($str);
 
-			for($i = 0; $i < $length; $i++) {
+			for ($i = 0; $i < $length; $i++) {
 				$char = ord($str{$i}); // get one string character at time
-				if(count($bytes) == 0) { // get starting octect
+				if (count($bytes) == 0) { // get starting octect
 					if ($char <= 0x7F) {
 						$unicode[] = $char; // use the character "as is" because is ASCII
 						$numbytes = 1;
@@ -3428,7 +3428,7 @@ 
 					if (count($bytes) == $numbytes) {
 						// compose UTF-8 bytes to a single unicode value
 						$char = $bytes[0];
-						for($j = 1; $j < $numbytes; $j++) {
+						for ($j = 1; $j < $numbytes; $j++) {
 							$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
 						}
 						if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
@@ -3493,8 +3493,8 @@ 
 		 * @since 1.53.0.TC005 (2005-01-05)
 		 * @uses UTF8StringToArray
 		 */
-		function UTF8ToUTF16BE($str, $setbom=true) {
-			if(!$this->isunicode) {
+		function UTF8ToUTF16BE($str, $setbom = true) {
+			if (!$this->isunicode) {
 				return $str; // string is not in unicode
 			}
 			$outstr = ""; // string to be returned
@@ -3504,8 +3504,8 @@ 
 			if ($setbom) {
 				$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
 			}
-			foreach($unicode as $char) {
-				if($char == 0xFFFD) {
+			foreach ($unicode as $char) {
+				if ($char == 0xFFFD) {
 					$outstr .= "\xFF\xFD"; // replacement character
 				} elseif ($char < 0x10000) {
 					$outstr .= chr($char >> 0x08);
@@ -3556,7 +3556,7 @@ 
 	 	 * Set document barcode.
 		 * @param string $bc barcode
 		 */
-		function setBarcode($bc="") {
+		function setBarcode($bc = "") {
 			$this->barcode = $bc;
 		}
 
@@ -3593,8 +3593,8 @@ 
 				//$style |= BCS_STRETCH_TEXT;
 				//$style |= BCS_REVERSE_COLOR;
 			}
-			if (empty($font)) {$font = BCD_DEFAULT_FONT;}
-			if (empty($xres)) {$xres = BCD_DEFAULT_XRES;}
+			if (empty($font)) {$font = BCD_DEFAULT_FONT; }
+			if (empty($xres)) {$xres = BCD_DEFAULT_XRES; }
 
 			$scale_factor = 1.5 * $xres * $this->k;
 			$bc_w = round($w * $scale_factor); //width in points
@@ -3628,7 +3628,7 @@ 
 			$obj->DrawObject($xres);
 
 			//use a temporary file....
-			$tmpName = tempnam(K_PATH_CACHE,'img');
+			$tmpName = tempnam(K_PATH_CACHE, 'img');
 			imagepng($obj->getImage(), $tmpName);
 			$this->Image($tmpName, $x, $y, $w, $h, 'png');
 			$obj->DestroyObject();
@@ -3640,7 +3640,7 @@ 
 	 	 * Returns the PDF data.
 		 */
 		function getPDFData() {
-			if($this->state < 3) {
+			if ($this->state < 3) {
 				$this->Close();
 			}
 			return $this->buffer;
@@ -3655,10 +3655,10 @@ 
 		 * @param boolean $ln if true add a new line after text (default = true)
 		 * @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
 		 */
-		function writeHTML($html, $ln=true, $fill=0) {
+		function writeHTML($html, $ln = true, $fill = 0) {
 
 			// store some variables
-			$html=strip_tags($html,"<h1><h2><h3><h4><h5><h6><b><u><i><a><img><p><br><br/><strong><em><font><blockquote><li><ul><ol><hr><td><th><tr><table><sup><sub><small>"); //remove all unsupported tags
+			$html = strip_tags($html, "<h1><h2><h3><h4><h5><h6><b><u><i><a><img><p><br><br/><strong><em><font><blockquote><li><ul><ol><hr><td><th><tr><table><sup><sub><small>"); //remove all unsupported tags
 			//replace carriage returns, newlines and tabs
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 			$html = strtr($html, $repTable);
@@ -3670,17 +3670,17 @@ 
 				$this->lasth = $this->FontSize * K_CELL_HEIGHT_RATIO;
 			}
 
-			foreach($a as $key=>$element) {
+			foreach ($a as $key=>$element) {
 				if (!preg_match($pattern, $element)) {
 					//Text
-					if($this->HREF) {
+					if ($this->HREF) {
 						$this->addHtmlLink($this->HREF, $element, $fill);
 					}
-					elseif($this->tdbegin) {
-						if((strlen(trim($element)) > 0) AND ($element != "&nbsp;")) {
+					elseif ($this->tdbegin) {
+						if ((strlen(trim($element)) > 0) AND ($element != "&nbsp;")) {
 							$this->Cell($this->tdwidth, $this->tdheight, $this->unhtmlentities($element), $this->tableborder, '', $this->tdalign, $this->tdbgcolor);
 						}
-						elseif($element == "&nbsp;") {
+						elseif ($element == "&nbsp;") {
 							$this->Cell($this->tdwidth, $this->tdheight, '', $this->tableborder, '', $this->tdalign, $this->tdbgcolor);
 						}
 					}
@@ -3691,7 +3691,7 @@ 
 				else {
 					$element = substr($element, 1, -1);
 					//Tag
-					if($element{0}=='/') {
+					if ($element{0} == '/') {
 						$this->closedHTMLTagHandler(strtolower(substr($element, 1)));
 					}
 					else {
@@ -3702,7 +3702,7 @@ 
 						// get attributes
 						preg_match_all('/([^=\s]*)=["\']?([^"\']*)["\']?/', $element, $attr_array, PREG_PATTERN_ORDER);
 						$attr = array(); // reset attribute array
-						while(list($id,$name)=each($attr_array[1])) {
+						while (list($id, $name) = each($attr_array[1])) {
 							$attr[strtolower($name)] = $attr_array[2][$id];
 						}
 						$this->openHTMLTagHandler($tag, $attr, $fill);
@@ -3728,7 +3728,7 @@ 
 		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
 		 * @see Cell()
 		 */
-		function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=0) {
+		function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = 0) {
 
 			if (empty($this->lasth)) {
 				//set row height
@@ -3748,7 +3748,7 @@ 
 			$this->SetX($x);
 			$this->SetY($y);
 
-			if(empty($w)) {
+			if (empty($w)) {
 				$w = $this->fw - $x - $this->rMargin;
 			}
 
@@ -3765,7 +3765,7 @@ 
 
 			$this->writeHTML($html, true, $fill); // write html text
 
-			$currentY =  $this->GetY();
+			$currentY = $this->GetY();
 
 			// check if a new page has been created
 			if ($this->page > $pagenum) {
@@ -3803,9 +3803,9 @@ 
 		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
 		 * @access private
 		 */
-		function openHTMLTagHandler($tag, $attr, $fill=0) {
+		function openHTMLTagHandler($tag, $attr, $fill = 0) {
 			//Opening tag
-			switch($tag) {
+			switch ($tag) {
 				case 'table': {
 					if ((isset($attr['border'])) AND ($attr['border'] != '')) {
 						$this->tableborder = $attr['border'];
@@ -3821,13 +3821,13 @@ 
 				case 'td':
 				case 'th': {
 					if ((isset($attr['width'])) AND ($attr['width'] != '')) {
-						$this->tdwidth = ($attr['width']/4);
+						$this->tdwidth = ($attr['width'] / 4);
 					}
 					else {
 						$this->tdwidth = (($this->w - $this->lMargin - $this->rMargin) / $this->default_table_columns);
 					}
 					if ((isset($attr['height'])) AND ($attr['height'] != '')) {
-						$this->tdheight=($attr['height'] / $this->k);
+						$this->tdheight = ($attr['height'] / $this->k);
 					}
 					else {
 						$this->tdheight = $this->lasth;
@@ -3852,9 +3852,9 @@ 
 					if ((isset($attr['bgcolor'])) AND ($attr['bgcolor'] != '')) {
 						$coul = $this->convertColorHexToDec($attr['bgcolor']);
 						$this->SetFillColor($coul['R'], $coul['G'], $coul['B']);
-						$this->tdbgcolor=true;
+						$this->tdbgcolor = true;
 					}
-					$this->tdbegin=true;
+					$this->tdbegin = true;
 					break;
 				}
 				case 'hr': {
@@ -3892,17 +3892,17 @@ 
 					break;
 				}
 				case 'img': {
-					if(isset($attr['src'])) {
+					if (isset($attr['src'])) {
 						// replace relative path with real server path
 						$attr['src'] = str_replace(K_PATH_URL_CACHE, K_PATH_CACHE, $attr['src']);
-						if(!isset($attr['width'])) {
+						if (!isset($attr['width'])) {
 							$attr['width'] = 0;
 						}
-						if(!isset($attr['height'])) {
+						if (!isset($attr['height'])) {
 							$attr['height'] = 0;
 						}
 
-						$this->Image($attr['src'], $this->GetX(),$this->GetY(), $this->pixelsToMillimeters($attr['width']), $this->pixelsToMillimeters($attr['height']));
+						$this->Image($attr['src'], $this->GetX(), $this->GetY(), $this->pixelsToMillimeters($attr['width']), $this->pixelsToMillimeters($attr['height']));
 						//$this->SetX($this->img_rb_x);
 						$this->SetY($this->img_rb_y);
 
@@ -3934,7 +3934,7 @@ 
 				case 'blockquote':
 				case 'br': {
 					$this->Ln();
-					if(strlen($this->lispacer) > 0) {
+					if (strlen($this->lispacer) > 0) {
 						$this->x += $this->GetStringWidth($this->lispacer);
 					}
 					break;
@@ -3948,32 +3948,32 @@ 
 					$currentFontSize = $this->FontSize;
 					$this->tempfontsize = $this->FontSizePt;
 					$this->SetFontSize($this->FontSizePt * K_SMALL_RATIO);
-					$this->SetXY($this->GetX(), $this->GetY() - (($currentFontSize - $this->FontSize)*(K_SMALL_RATIO)));
+					$this->SetXY($this->GetX(), $this->GetY() - (($currentFontSize - $this->FontSize) * (K_SMALL_RATIO)));
 					break;
 				}
 				case 'sub': {
 					$currentFontSize = $this->FontSize;
 					$this->tempfontsize = $this->FontSizePt;
 					$this->SetFontSize($this->FontSizePt * K_SMALL_RATIO);
-					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize)*(K_SMALL_RATIO)));
+					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize) * (K_SMALL_RATIO)));
 					break;
 				}
 				case 'small': {
 					$currentFontSize = $this->FontSize;
 					$this->tempfontsize = $this->FontSizePt;
 					$this->SetFontSize($this->FontSizePt * K_SMALL_RATIO);
-					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize)/3));
+					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize) / 3));
 					break;
 				}
 				case 'font': {
-					if (isset($attr['color']) AND $attr['color']!='') {
+					if (isset($attr['color']) AND $attr['color'] != '') {
 						$coul = $this->convertColorHexToDec($attr['color']);
-						$this->SetTextColor($coul['R'],$coul['G'],$coul['B']);
-						$this->issetcolor=true;
+						$this->SetTextColor($coul['R'], $coul['G'], $coul['B']);
+						$this->issetcolor = true;
 					}
 					if (isset($attr['face']) and in_array(strtolower($attr['face']), $this->fontlist)) {
 						$this->SetFont(strtolower($attr['face']));
-						$this->issetfont=true;
+						$this->issetfont = true;
 					}
 					if (isset($attr['size'])) {
 						$headsize = intval($attr['size']);
@@ -4010,7 +4010,7 @@ 
 		 */
 		function closedHTMLTagHandler($tag) {
 			//Closing tag
-			switch($tag) {
+			switch ($tag) {
 				case 'td':
 				case 'th': {
 					$this->tdbegin = false;
@@ -4026,7 +4026,7 @@ 
 					break;
 				}
 				case 'table': {
-					$this->tableborder=0;
+					$this->tableborder = 0;
 					break;
 				}
 				case 'strong': {
@@ -4051,21 +4051,21 @@ 
 					$currentFontSize = $this->FontSize;
 					$this->SetFontSize($this->tempfontsize);
 					$this->tempfontsize = $this->FontSizePt;
-					$this->SetXY($this->GetX(), $this->GetY() - (($currentFontSize - $this->FontSize)*(K_SMALL_RATIO)));
+					$this->SetXY($this->GetX(), $this->GetY() - (($currentFontSize - $this->FontSize) * (K_SMALL_RATIO)));
 					break;
 				}
 				case 'sub': {
 					$currentFontSize = $this->FontSize;
 					$this->SetFontSize($this->tempfontsize);
 					$this->tempfontsize = $this->FontSizePt;
-					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize)*(K_SMALL_RATIO)));
+					$this->SetXY($this->GetX(), $this->GetY() + (($currentFontSize - $this->FontSize) * (K_SMALL_RATIO)));
 					break;
 				}
 				case 'small': {
 					$currentFontSize = $this->FontSize;
 					$this->SetFontSize($this->tempfontsize);
 					$this->tempfontsize = $this->FontSizePt;
-					$this->SetXY($this->GetX(), $this->GetY() - (($this->FontSize - $currentFontSize)/3));
+					$this->SetXY($this->GetX(), $this->GetY() - (($this->FontSize - $currentFontSize) / 3));
 					break;
 				}
 				case 'font': {
@@ -4126,9 +4126,9 @@ 
 		function setStyle($tag, $enable) {
 			//Modify style and select corresponding font
 			$this->$tag += ($enable ? 1 : -1);
-			$style='';
-			foreach(array('b', 'i', 'u') as $s) {
-				if($this->$s > 0) {
+			$style = '';
+			foreach (array('b', 'i', 'u') as $s) {
+				if ($this->$s > 0) {
 					$style .= $s;
 				}
 			}
@@ -4142,7 +4142,7 @@ 
 		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
 		 * @access public
 		 */
-		function addHtmlLink($url, $name, $fill=0) {
+		function addHtmlLink($url, $name, $fill = 0) {
 			//Put a hyperlink
 			$this->SetTextColor(0, 0, 255);
 			$this->setStyle('u', true);
@@ -4158,7 +4158,7 @@ 
 		 * @return array
 		 * @access private
 		 */
-		function convertColorHexToDec($color = "#000000"){
+		function convertColorHexToDec($color = "#000000") {
 			$tbl_color = array();
 			$tbl_color['R'] = hexdec(substr($color, 1, 2));
 			$tbl_color['G'] = hexdec(substr($color, 3, 2));
@@ -4172,7 +4172,7 @@ 
 		 * @return float millimeters
 		 * @access private
 		 */
-		function pixelsToMillimeters($px){
+		function pixelsToMillimeters($px) {
 			return $px * 25.4 / 72;
 		}
 
@@ -4190,7 +4190,7 @@ 
 	} // END OF CLASS
 
 	//Handle special IE contype request
-	if(isset($_SERVER['HTTP_USER_AGENT']) AND ($_SERVER['HTTP_USER_AGENT']=='contype')) {
+	if (isset($_SERVER['HTTP_USER_AGENT']) AND ($_SERVER['HTTP_USER_AGENT'] == 'contype')) {
 		header('Content-Type: application/pdf');
 		exit;
 	}

Braces +64 added lines, -128 removed lines

@@ -854,8 +854,7 @@ 
 				}
 				$this->fwPt=$format[0];
 				$this->fhPt=$format[1];
-			}
-			else {
+			} else {
 				$this->fwPt=$format[0]*$this->k;
 				$this->fhPt=$format[1]*$this->k;
 			}
@@ -869,13 +868,11 @@ 
 				$this->DefOrientation='P';
 				$this->wPt=$this->fwPt;
 				$this->hPt=$this->fhPt;
-			}
-			elseif($orientation=='l' or $orientation=='landscape') {
+			} elseif($orientation=='l' or $orientation=='landscape') {
 				$this->DefOrientation='L';
 				$this->wPt=$this->fhPt;
 				$this->hPt=$this->fwPt;
-			}
-			else {
+			} else {
 				$this->Error('Incorrect orientation: '.$orientation);
 			}
 
@@ -1055,14 +1052,12 @@ 
 			//Set display mode in viewer
 			if($zoom=='fullpage' or $zoom=='fullwidth' or $zoom=='real' or $zoom=='default' or !is_string($zoom)) {
 				$this->ZoomMode=$zoom;
-			}
-			else {
+			} else {
 				$this->Error('Incorrect zoom display mode: '.$zoom);
 			}
 			if($layout=='single' or $layout=='continuous' or $layout=='two' or $layout=='default') {
 				$this->LayoutMode=$layout;
-			}
-			else {
+			} else {
 				$this->Error('Incorrect layout display mode: '.$layout);
 			}
 		}
@@ -1077,8 +1072,7 @@ 
 			//Set page compression
 			if(function_exists('gzcompress')) {
 				$this->compress=$compress;
-			}
-			else {
+			} else {
 				$this->compress=false;
 			}
 		}
@@ -1353,8 +1347,7 @@ 
 
 				if (($this->header_logo) AND ($this->header_logo != K_BLANK_IMAGE)) {
 					$this->Image(K_PATH_IMAGES.$this->header_logo, $this->original_lMargin, $this->header_margin, $this->header_logo_width);
-				}
-				else {
+				} else {
 					$this->img_rb_y = $this->GetY();
 				}
 
@@ -1451,8 +1444,7 @@ 
 			//Set color for all stroking operations
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
 				$this->DrawColor=sprintf('%.3f G',$r/255);
-			}
-			else {
+			} else {
 				$this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
 			}
 			if($this->page>0) {
@@ -1473,8 +1465,7 @@ 
 			//Set color for all filling operations
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
 				$this->FillColor=sprintf('%.3f g',$r/255);
-			}
-			else {
+			} else {
 				$this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
 			}
 			$this->ColorFlag=($this->FillColor!=$this->TextColor);
@@ -1500,8 +1491,7 @@ 
 			//Set color for text
 			if(($r==0 and $g==0 and $b==0) or $g==-1) {
 				$this->TextColor=sprintf('%.3f g',$r/255);
-			}
-			else {
+			} else {
 				$this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
 			}
 			$this->ColorFlag=($this->FillColor!=$this->TextColor);
@@ -1593,11 +1583,9 @@ 
 			//Draw a rectangle
 			if($style=='F') {
 				$op='f';
-			}
-			elseif($style=='FD' or $style=='DF') {
+			} elseif($style=='FD' or $style=='DF') {
 				$op='B';
-			}
-			else {
+			} else {
 				$op='S';
 			}
 			$this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
@@ -1683,8 +1671,7 @@ 
 			if(!empty($file)) {
 				if((strcasecmp($type,"TrueType") == 0) OR (strcasecmp($type,"TrueTypeUnicode") == 0)) {
 					$this->FontFiles[$file]=array('length1'=>$originalsize);
-				}
-				else {
+				} else {
 					$this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
 				}
 			}
@@ -1731,8 +1718,7 @@ 
 			}
 			if((!$this->isunicode) AND ($family == 'arial')) {
 				$family = 'helvetica';
-			}
-			elseif(($family=="symbol") OR ($family=="zapfdingbats")) {
+			} elseif(($family=="symbol") OR ($family=="zapfdingbats")) {
 				$style='';
 			}
 			$style=strtoupper($style);
@@ -1740,8 +1726,7 @@ 
 			if(strpos($style,'U')!==false) {
 				$this->underline=true;
 				$style=str_replace('U','',$style);
-			}
-			else {
+			} else {
 				$this->underline=false;
 			}
 			if($style=='IB') {
@@ -1794,8 +1779,7 @@ 
 					} else {
 						$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$this->CoreFonts[$fontkey], 'up'=>-100, 'ut'=>50, 'cw'=>$fpdf_charwidths[$fontkey]);
 					}
-				}
-				else {
+				} else {
 					$this->Error('Undefined font: '.$family.' '.$style);
 				}
 			}
@@ -1985,8 +1969,7 @@ 
 			if(($fill == 1) OR ($border == 1)) {
 				if($fill == 1) {
 					$op = ($border == 1) ? 'B' : 'f';
-				}
-				else {
+				} else {
 					$op = 'S';
 				}
 				$s = sprintf('%.2f %.2f %.2f %.2f re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);
@@ -2011,11 +1994,9 @@ 
 				$width = $this->GetStringWidth($txt);
 				if($align == 'R') {
 					$dx = $w - $this->cMargin - $width;
-				}
-				elseif($align=='C') {
+				} elseif($align=='C') {
 					$dx = ($w - $width)/2;
-				}
-				else {
+				} else {
 					$dx = $this->cMargin;
 				}
 				if($this->ColorFlag) {
@@ -2043,8 +2024,7 @@ 
 				if($ln == 1) {
 					$this->x = $this->lMargin;
 				}
-			}
-			else {
+			} else {
 				$this->x += $w;
 			}
 		}
@@ -2086,8 +2066,7 @@ 
 					$border='LTRB';
 					$b='LRT';
 					$b2='LR';
-				}
-				else {
+				} else {
 					$b2='';
 					if(strpos($border,'L')!==false) {
 						$b2.='L';
@@ -2144,8 +2123,7 @@ 
 							$this->_out('0 Tw');
 						}
 						$this->Cell($w, $h, substr($s, $j, $i-$j), $b, 2, $align, $fill);
-					}
-					else {
+					} else {
 						if($align=='J') {
 							$this->ws = ($ns>1) ? ($wmax-$ls)/($ns-1) : 0;
 							$this->_out(sprintf('%.3f Tw', $this->ws * $this->k));
@@ -2161,8 +2139,7 @@ 
 					if($border AND ($nl==2)) {
 						$b=$b2;
 					}
-				}
-				else {
+				} else {
 					$i++;
 				}
 			}
@@ -2272,8 +2249,7 @@ 
 							$i++;
 						}
 						$this->Cell($w, $h, substr($s, $j, $i-$j), 0, 2, '', $fill, $link);
-					}
-					else {
+					} else {
 						$this->Cell($w, $h, substr($s, $j, $sep-$j), 0, 2, '', $fill, $link);
 						$i=$sep+1;
 					}
@@ -2286,8 +2262,7 @@ 
 						$wmax = ($w - 2 * $this->cMargin);
 					}
 					$nl++;
-				}
-				else {
+				} else {
 					$i++;
 				}
 			}
@@ -2334,11 +2309,9 @@ 
 				set_magic_quotes_runtime(0);
 				if($type == 'jpg' or $type == 'jpeg') {
 					$info=$this->_parsejpg($file);
-				}
-				elseif($type == 'png') {
+				} elseif($type == 'png') {
 					$info=$this->_parsepng($file);
-				}
-				else {
+				} else {
 					//Allow for additional formats
 					$mtd='_parse'.$type;
 					if(!method_exists($this,$mtd)) {
@@ -2349,8 +2322,7 @@ 
 				set_magic_quotes_runtime($mqr);
 				$info['i']=count($this->images)+1;
 				$this->images[$file]=$info;
-			}
-			else {
+			} else {
 				$info=$this->images[$file];
 			}
 			//Automatic width and height calculation if needed
@@ -2388,8 +2360,7 @@ 
 			$this->x=$this->lMargin;
 			if(is_string($h)) {
 				$this->y+=$this->lasth;
-			}
-			else {
+			} else {
 				$this->y+=$h;
 			}
 		}
@@ -2415,8 +2386,7 @@ 
 			//Set x position
 			if($x>=0) {
 				$this->x=$x;
-			}
-			else {
+			} else {
 				$this->x=$this->w+$x;
 			}
 		}
@@ -2443,8 +2413,7 @@ 
 			$this->x=$this->lMargin;
 			if($y>=0) {
 				$this->y=$y;
-			}
-			else {
+			} else {
 				$this->y=$this->h+$y;
 			}
 		}
@@ -2600,8 +2569,7 @@ 
 			if($this->DefOrientation=='P') {
 				$wPt=$this->fwPt;
 				$hPt=$this->fhPt;
-			}
-			else {
+			} else {
 				$wPt=$this->fhPt;
 				$hPt=$this->fwPt;
 			}
@@ -2623,8 +2591,7 @@ 
 						$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
 						if(is_string($pl[4])) {
 							$annots.='/A <</S /URI /URI ('.$this->_escape($pl[4]).')>>>>';
-						}
-						else {
+						} else {
 							$l=$this->links[$pl[4]];
 							$h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
 							$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
@@ -2791,8 +2758,7 @@ 
 				$this->_out('/Height '.$info['h']);
 				if($info['cs']=='Indexed') {
 					$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-				}
-				else {
+				} else {
 					$this->_out('/ColorSpace /'.$info['cs']);
 					if($info['cs']=='DeviceCMYK') {
 						$this->_out('/Decode [1 0 1 0 1 0 1 0]');
@@ -2902,23 +2868,18 @@ 
 			$this->_out('/Pages 1 0 R');
 			if($this->ZoomMode=='fullpage') {
 				$this->_out('/OpenAction [3 0 R /Fit]');
-			}
-			elseif($this->ZoomMode=='fullwidth') {
+			} elseif($this->ZoomMode=='fullwidth') {
 				$this->_out('/OpenAction [3 0 R /FitH null]');
-			}
-			elseif($this->ZoomMode=='real') {
+			} elseif($this->ZoomMode=='real') {
 				$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-			}
-			elseif(!is_string($this->ZoomMode)) {
+			} elseif(!is_string($this->ZoomMode)) {
 				$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
 			}
 			if($this->LayoutMode=='single') {
 				$this->_out('/PageLayout /SinglePage');
-			}
-			elseif($this->LayoutMode=='continuous') {
+			} elseif($this->LayoutMode=='continuous') {
 				$this->_out('/PageLayout /OneColumn');
-			}
-			elseif($this->LayoutMode=='two') {
+			} elseif($this->LayoutMode=='two') {
 				$this->_out('/PageLayout /TwoColumnLeft');
 			}
 		}
@@ -2994,8 +2955,7 @@ 
 			//Page orientation
 			if(empty($orientation)) {
 				$orientation=$this->DefOrientation;
-			}
-			else {
+			} else {
 				$orientation=strtoupper($orientation{0});
 				if($orientation!=$this->DefOrientation) {
 					$this->OrientationChanges[$this->page]=true;
@@ -3008,8 +2968,7 @@ 
 					$this->hPt=$this->fhPt;
 					$this->w=$this->fw;
 					$this->h=$this->fh;
-				}
-				else {
+				} else {
 					$this->wPt=$this->fhPt;
 					$this->hPt=$this->fwPt;
 					$this->w=$this->fh;
@@ -3063,11 +3022,9 @@ 
 			}
 			if(!isset($a['channels']) or $a['channels']==3) {
 				$colspace='DeviceRGB';
-			}
-			elseif($a['channels']==4) {
+			} elseif($a['channels']==4) {
 				$colspace='DeviceCMYK';
-			}
-			else {
+			} else {
 				$colspace='DeviceGray';
 			}
 			$bpc=isset($a['bits']) ? $a['bits'] : 8;
@@ -3108,14 +3065,11 @@ 
 			$ct=ord(fread($f,1));
 			if($ct==0) {
 				$colspace='DeviceGray';
-			}
-			elseif($ct==2) {
+			} elseif($ct==2) {
 				$colspace='DeviceRGB';
-			}
-			elseif($ct==3) {
+			} elseif($ct==3) {
 				$colspace='Indexed';
-			}
-			else {
+			} else {
 				$this->Error('Alpha channel not supported: '.$file);
 			}
 			if(ord(fread($f,1))!=0) {
@@ -3140,33 +3094,27 @@ 
 					//Read palette
 					$pal=fread($f,$n);
 					fread($f,4);
-				}
-				elseif($type=='tRNS') {
+				} elseif($type=='tRNS') {
 					//Read transparency info
 					$t=fread($f,$n);
 					if($ct==0) {
 						$trns=array(ord(substr($t,1,1)));
-					}
-					elseif($ct==2) {
+					} elseif($ct==2) {
 						$trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1)));
-					}
-					else {
+					} else {
 						$pos=strpos($t,chr(0));
 						if($pos!==false) {
 							$trns=array($pos);
 						}
 					}
 					fread($f,4);
-				}
-				elseif($type=='IDAT') {
+				} elseif($type=='IDAT') {
 					//Read image data block
 					$data.=fread($f,$n);
 					fread($f,4);
-				}
-				elseif($type=='IEND') {
+				} elseif($type=='IEND') {
 					break;
-				}
-				else {
+				} else {
 					fread($f,$n+4);
 				}
 			}
@@ -3238,8 +3186,7 @@ 
 		function _out($s) {
 			if($this->state==2) {
 				$this->pages[$this->page] .= $s."\n";
-			}
-			else {
+			} else {
 				$this->buffer .= $s."\n";
 			}
 		}
@@ -3437,8 +3384,7 @@ 
 							encoding form (as surrogate pairs) and do not directly represent
 							characters. */
 							$unicode[] = 0xFFFD; // use replacement character
-						}
-						else {
+						} else {
 							$unicode[] = $char; // add char to array
 						}
 						// reset data for next char
@@ -3675,26 +3621,21 @@ 
 					//Text
 					if($this->HREF) {
 						$this->addHtmlLink($this->HREF, $element, $fill);
-					}
-					elseif($this->tdbegin) {
+					} elseif($this->tdbegin) {
 						if((strlen(trim($element)) > 0) AND ($element != "&nbsp;")) {
 							$this->Cell($this->tdwidth, $this->tdheight, $this->unhtmlentities($element), $this->tableborder, '', $this->tdalign, $this->tdbgcolor);
-						}
-						elseif($element == "&nbsp;") {
+						} elseif($element == "&nbsp;") {
 							$this->Cell($this->tdwidth, $this->tdheight, '', $this->tableborder, '', $this->tdalign, $this->tdbgcolor);
 						}
-					}
-					else {
+					} else {
 						$this->Write($this->lasth, stripslashes($this->unhtmlentities($element)), '', $fill);
 					}
-				}
-				else {
+				} else {
 					$element = substr($element, 1, -1);
 					//Tag
 					if($element{0}=='/') {
 						$this->closedHTMLTagHandler(strtolower(substr($element, 1)));
-					}
-					else {
+					} else {
 						//Extract attributes
 						// get tag name
 						preg_match('/([a-zA-Z0-9]*)/', $element, $tag);
@@ -3809,8 +3750,7 @@ 
 				case 'table': {
 					if ((isset($attr['border'])) AND ($attr['border'] != '')) {
 						$this->tableborder = $attr['border'];
-					}
-					else {
+					} else {
 						$this->tableborder = 0;
 					}
 					break;
@@ -3822,14 +3762,12 @@ 
 				case 'th': {
 					if ((isset($attr['width'])) AND ($attr['width'] != '')) {
 						$this->tdwidth = ($attr['width']/4);
-					}
-					else {
+					} else {
 						$this->tdwidth = (($this->w - $this->lMargin - $this->rMargin) / $this->default_table_columns);
 					}
 					if ((isset($attr['height'])) AND ($attr['height'] != '')) {
 						$this->tdheight=($attr['height'] / $this->k);
-					}
-					else {
+					} else {
 						$this->tdheight = $this->lasth;
 					}
 					if ((isset($attr['align'])) AND ($attr['align'] != '')) {
@@ -3861,8 +3799,7 @@ 
 					$this->Ln();
 					if ((isset($attr['width'])) AND ($attr['width'] != '')) {
 						$hrWidth = $attr['width'];
-					}
-					else {
+					} else {
 						$hrWidth = $this->w - $this->lMargin - $this->rMargin;
 					}
 					$x = $this->GetX();
@@ -3923,8 +3860,7 @@ 
 					$this->Ln();
 					if ($this->listordered) {
 						$this->lispacer = "    ".(++$this->listcount).". ";
-					}
-					else {
+					} else {
 						//unordered list simbol
 						$this->lispacer = "    -  ";
 					}

pdf/config/tcpdf_config.php

Spacing +28 added lines, -28 removed lines

@@ -37,137 +37,137 @@ 
 	/**
 	 * installation path
 	 */
-	define ("K_PATH_MAIN", BOOKSHOP_PATH.'pdf/');
+	define("K_PATH_MAIN", BOOKSHOP_PATH.'pdf/');
 
 	/**
 	 * url path
 	 */
-	define ("K_PATH_URL", BOOKSHOP_URL.'/pdf/');
+	define("K_PATH_URL", BOOKSHOP_URL.'/pdf/');
 
 	/**
 	 * path for PDF fonts
 	 */
-	define ("FPDF_FONTPATH", K_PATH_MAIN."fonts/");
+	define("FPDF_FONTPATH", K_PATH_MAIN."fonts/");
 
 	/**
 	 * cache directory for temporary files (full path)
 	 */
-	define ("K_PATH_CACHE", K_PATH_MAIN."cache/");
+	define("K_PATH_CACHE", K_PATH_MAIN."cache/");
 
 	/**
 	 * cache directory for temporary files (url path)
 	 */
-	define ("K_PATH_URL_CACHE", K_PATH_URL."cache/");
+	define("K_PATH_URL_CACHE", K_PATH_URL."cache/");
 
 	/**
 	 *images directory
 	 */
-	define ("K_PATH_IMAGES", K_PATH_MAIN."images/");
+	define("K_PATH_IMAGES", K_PATH_MAIN."images/");
 
 	/**
 	 * blank image
 	 */
-	define ("K_BLANK_IMAGE", K_PATH_IMAGES."_blank.png");
+	define("K_BLANK_IMAGE", K_PATH_IMAGES."_blank.png");
 
 	/**
 	 * page format
 	 */
-	define ("PDF_PAGE_FORMAT", "A4");
+	define("PDF_PAGE_FORMAT", "A4");
 
 	/**
 	 * page orientation (P=portrait, L=landscape)
 	 */
-	define ("PDF_PAGE_ORIENTATION", "P");
+	define("PDF_PAGE_ORIENTATION", "P");
 
 	/**
 	 * document creator
 	 */
-	define ("PDF_CREATOR", "Instant Zero (http://www.instant-zero.com)");
+	define("PDF_CREATOR", "Instant Zero (http://www.instant-zero.com)");
 
 	/**
 	 * document author
 	 */
-	define ("PDF_AUTHOR", "Instant Zero (http://www.instant-zero.com)");
+	define("PDF_AUTHOR", "Instant Zero (http://www.instant-zero.com)");
 
 	/**
 	 * header title
 	 */
-	define ("PDF_HEADER_TITLE", "Bookshop");
+	define("PDF_HEADER_TITLE", "Bookshop");
 
 	/**
 	 * header description string
 	 */
-	define ("PDF_HEADER_STRING", "first row\nsecond row\nthird row");
+	define("PDF_HEADER_STRING", "first row\nsecond row\nthird row");
 
 	/**
 	 * image logo
 	 */
-	define ("PDF_HEADER_LOGO", "logo_example.png");
+	define("PDF_HEADER_LOGO", "logo_example.png");
 
 	/**
 	 * header logo image width [mm]
 	 */
-	define ("PDF_HEADER_LOGO_WIDTH", 20);
+	define("PDF_HEADER_LOGO_WIDTH", 20);
 
 	/**
 	 *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
 	 */
-	define ("PDF_UNIT", "mm");
+	define("PDF_UNIT", "mm");
 
 	/**
 	 * header margin
 	 */
-	define ("PDF_MARGIN_HEADER", 5);
+	define("PDF_MARGIN_HEADER", 5);
 
 	/**
 	 * footer margin
 	 */
-	define ("PDF_MARGIN_FOOTER", 10);
+	define("PDF_MARGIN_FOOTER", 10);
 
 	/**
 	 * top margin
 	 */
-	define ("PDF_MARGIN_TOP", 27);
+	define("PDF_MARGIN_TOP", 27);
 
 	/**
 	 * bottom margin
 	 */
-	define ("PDF_MARGIN_BOTTOM", 25);
+	define("PDF_MARGIN_BOTTOM", 25);
 
 	/**
 	 * left margin
 	 */
-	define ("PDF_MARGIN_LEFT", 15);
+	define("PDF_MARGIN_LEFT", 15);
 
 	/**
 	 * right margin
 	 */
-	define ("PDF_MARGIN_RIGHT", 15);
+	define("PDF_MARGIN_RIGHT", 15);
 
 	/**
 	 * main font name
 	 */
-	define ("PDF_FONT_NAME_MAIN", "FreeSerif"); //vera
+	define("PDF_FONT_NAME_MAIN", "FreeSerif"); //vera
 
 	/**
 	 * main font size
 	 */
-	define ("PDF_FONT_SIZE_MAIN", 10);
+	define("PDF_FONT_SIZE_MAIN", 10);
 
 	/**
 	 * data font name
 	 */
-	define ("PDF_FONT_NAME_DATA", "FreeSerif"); //verase
+	define("PDF_FONT_NAME_DATA", "FreeSerif"); //verase
 
 	/**
 	 * data font size
 	 */
-	define ("PDF_FONT_SIZE_DATA", 8);
+	define("PDF_FONT_SIZE_DATA", 8);
 
 	/**
 	 *  scale factor for images (number of points in user unit)
 	 */
-	define ("PDF_IMAGE_SCALE_RATIO", 2);
+	define("PDF_IMAGE_SCALE_RATIO", 2);
 
 	/**
 	 * magnification factor for titles
@@ -187,7 +187,7 @@ 
 	/**
 	 * reduction factor for small font
 	 */
-	define("K_SMALL_RATIO", 2/3);
+	define("K_SMALL_RATIO", 2 / 3);
 }
 
 //============================================================+

pdf/html_entity_decode_php4.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
  * @return string converted
  */
 function html_entity_decode_php4($text_to_convert) {
-	$htmlentities_table = array (
+	$htmlentities_table = array(
 		"Á" => "".chr(195).chr(129)."",
 		"á" => "".chr(195).chr(161)."",
 		"Â" => "".chr(195).chr(130)."",

pdf/barcode/c128bobject.php

Spacing +131 added lines, -131 removed lines

@@ -57,109 +57,109 @@ 
 		$this->BarcodeObject($Width, $Height, $Style);
 		$this->mValue = $Value;
 		$this->mChars = " !\"#$%&'()*+�-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{ }~";
-		$this->mCharSet = array (
-		"212222",   /*   00 */
-		"222122",   /*   01 */
-		"222221",   /*   02 */
-		"121223",   /*   03 */
-		"121322",   /*   04 */
-		"131222",   /*   05 */
-		"122213",   /*   06 */
-		"122312",   /*   07 */
-		"132212",   /*   08 */
-		"221213",   /*   09 */
-		"221312",   /*   10 */
-		"231212",   /*   11 */
-		"112232",   /*   12 */
-		"122132",   /*   13 */
-		"122231",   /*   14 */
-		"113222",   /*   15 */
-		"123122",   /*   16 */
-		"123221",   /*   17 */
-		"223211",   /*   18 */
-		"221132",   /*   19 */
-		"221231",   /*   20 */
-		"213212",   /*   21 */
-		"223112",   /*   22 */
-		"312131",   /*   23 */
-		"311222",   /*   24 */
-		"321122",   /*   25 */
-		"321221",   /*   26 */
-		"312212",   /*   27 */
-		"322112",   /*   28 */
-		"322211",   /*   29 */
-		"212123",   /*   30 */
-		"212321",   /*   31 */
-		"232121",   /*   32 */
-		"111323",   /*   33 */
-		"131123",   /*   34 */
-		"131321",   /*   35 */
-		"112313",   /*   36 */
-		"132113",   /*   37 */
-		"132311",   /*   38 */
-		"211313",   /*   39 */
-		"231113",   /*   40 */
-		"231311",   /*   41 */
-		"112133",   /*   42 */
-		"112331",   /*   43 */
-		"132131",   /*   44 */
-		"113123",   /*   45 */
-		"113321",   /*   46 */
-		"133121",   /*   47 */
-		"313121",   /*   48 */
-		"211331",   /*   49 */
-		"231131",   /*   50 */
-		"213113",   /*   51 */
-		"213311",   /*   52 */
-		"213131",   /*   53 */
-		"311123",   /*   54 */
-		"311321",   /*   55 */
-		"331121",   /*   56 */
-		"312113",   /*   57 */
-		"312311",   /*   58 */
-		"332111",   /*   59 */
-		"314111",   /*   60 */
-		"221411",   /*   61 */
-		"431111",   /*   62 */
-		"111224",   /*   63 */
-		"111422",   /*   64 */
-		"121124",   /*   65 */
-		"121421",   /*   66 */
-		"141122",   /*   67 */
-		"141221",   /*   68 */
-		"112214",   /*   69 */
-		"112412",   /*   70 */
-		"122114",   /*   71 */
-		"122411",   /*   72 */
-		"142112",   /*   73 */
-		"142211",   /*   74 */
-		"241211",   /*   75 */
-		"221114",   /*   76 */
-		"413111",   /*   77 */
-		"241112",   /*   78 */
-		"134111",   /*   79 */
-		"111242",   /*   80 */
-		"121142",   /*   81 */
-		"121241",   /*   82 */
-		"114212",   /*   83 */
-		"124112",   /*   84 */
-		"124211",   /*   85 */
-		"411212",   /*   86 */
-		"421112",   /*   87 */
-		"421211",   /*   88 */
-		"212141",   /*   89 */
-		"214121",   /*   90 */
-		"412121",   /*   91 */
-		"111143",   /*   92 */
-		"111341",   /*   93 */
-		"131141",   /*   94 */
-		"114113",   /*   95 */
-		"114311",   /*   96 */
-		"411113",   /*   97 */
-		"411311",   /*   98 */
-		"113141",   /*   99 */
-		"114131",   /*  100 */
-		"311141",   /*  101 */
+		$this->mCharSet = array(
+		"212222", /*   00 */
+		"222122", /*   01 */
+		"222221", /*   02 */
+		"121223", /*   03 */
+		"121322", /*   04 */
+		"131222", /*   05 */
+		"122213", /*   06 */
+		"122312", /*   07 */
+		"132212", /*   08 */
+		"221213", /*   09 */
+		"221312", /*   10 */
+		"231212", /*   11 */
+		"112232", /*   12 */
+		"122132", /*   13 */
+		"122231", /*   14 */
+		"113222", /*   15 */
+		"123122", /*   16 */
+		"123221", /*   17 */
+		"223211", /*   18 */
+		"221132", /*   19 */
+		"221231", /*   20 */
+		"213212", /*   21 */
+		"223112", /*   22 */
+		"312131", /*   23 */
+		"311222", /*   24 */
+		"321122", /*   25 */
+		"321221", /*   26 */
+		"312212", /*   27 */
+		"322112", /*   28 */
+		"322211", /*   29 */
+		"212123", /*   30 */
+		"212321", /*   31 */
+		"232121", /*   32 */
+		"111323", /*   33 */
+		"131123", /*   34 */
+		"131321", /*   35 */
+		"112313", /*   36 */
+		"132113", /*   37 */
+		"132311", /*   38 */
+		"211313", /*   39 */
+		"231113", /*   40 */
+		"231311", /*   41 */
+		"112133", /*   42 */
+		"112331", /*   43 */
+		"132131", /*   44 */
+		"113123", /*   45 */
+		"113321", /*   46 */
+		"133121", /*   47 */
+		"313121", /*   48 */
+		"211331", /*   49 */
+		"231131", /*   50 */
+		"213113", /*   51 */
+		"213311", /*   52 */
+		"213131", /*   53 */
+		"311123", /*   54 */
+		"311321", /*   55 */
+		"331121", /*   56 */
+		"312113", /*   57 */
+		"312311", /*   58 */
+		"332111", /*   59 */
+		"314111", /*   60 */
+		"221411", /*   61 */
+		"431111", /*   62 */
+		"111224", /*   63 */
+		"111422", /*   64 */
+		"121124", /*   65 */
+		"121421", /*   66 */
+		"141122", /*   67 */
+		"141221", /*   68 */
+		"112214", /*   69 */
+		"112412", /*   70 */
+		"122114", /*   71 */
+		"122411", /*   72 */
+		"142112", /*   73 */
+		"142211", /*   74 */
+		"241211", /*   75 */
+		"221114", /*   76 */
+		"413111", /*   77 */
+		"241112", /*   78 */
+		"134111", /*   79 */
+		"111242", /*   80 */
+		"121142", /*   81 */
+		"121241", /*   82 */
+		"114212", /*   83 */
+		"124112", /*   84 */
+		"124211", /*   85 */
+		"411212", /*   86 */
+		"421112", /*   87 */
+		"421211", /*   88 */
+		"212141", /*   89 */
+		"214121", /*   90 */
+		"412121", /*   91 */
+		"111143", /*   92 */
+		"111341", /*   93 */
+		"131141", /*   94 */
+		"114113", /*   95 */
+		"114311", /*   96 */
+		"411113", /*   97 */
+		"411311", /*   98 */
+		"113141", /*   99 */
+		"114131", /*  100 */
+		"311141", /*  101 */
 		"411131"    /*  102 */
 		);
 	}
@@ -171,7 +171,7 @@ 
 	 * @access private
 	 */
 	function GetCharIndex($char) {
-		for ($i=0;$i<95;$i++) {
+		for ($i = 0; $i < 95; $i++) {
 			if ($this->mChars[$i] == $char) {
 				return $i;
 			}
@@ -220,12 +220,12 @@ 
 	function GetSize($xres) {
 		$len = strlen($this->mValue);
 
-		if ($len == 0)  {
+		if ($len == 0) {
 			$this->mError = "Null value";
 			return false;
 		}
 		$ret = 0;
-		for ($i=0;$i<$len;$i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if (($id = $this->GetCharIndex($this->mValue[$i])) == -1) {
 				$this->mError = "C128B not include the char '".$this->mValue[$i]."'";
 				return false;
@@ -242,12 +242,12 @@ 
 		/* length of Check character */
 		$cset = $this->GetCheckCharValue();
 		$CheckSize = 0;
-		for ($i=0;$i<6;$i++) {
+		for ($i = 0; $i < 6; $i++) {
 			$CheckSize += $this->GetBarSize($cset[$i], $xres);
 		}
 
-		$StartSize = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres;
-		$StopSize  = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + 2*BCD_C128_BAR_3*$xres;
+		$StartSize = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres;
+		$StopSize  = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + 2 * BCD_C128_BAR_3 * $xres;
 
 		return $StartSize + $ret + $CheckSize + $StopSize;
 	}
@@ -260,10 +260,10 @@ 
 	function GetCheckCharValue() {
 		$len = strlen($this->mValue);
 		$sum = 104; // 'B' type;
-		for ($i=0;$i<$len;$i++) {
-			$sum += $this->GetCharIndex($this->mValue[$i]) * ($i+1);
+		for ($i = 0; $i < $len; $i++) {
+			$sum += $this->GetCharIndex($this->mValue[$i]) * ($i + 1);
 		}
-		$check  = $sum % 103;
+		$check = $sum % 103;
 		return $this->mCharSet[$check];
 	}
 
@@ -301,16 +301,16 @@ 
 	 */
 	function DrawStop($DrawPos, $yPos, $ySize, $xres) {
 		/* Stop code is '2331112' */
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		$DrawPos += $this->GetBarSize('3', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('3', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		return $DrawPos;
 	}
@@ -326,13 +326,13 @@ 
 	 */
 	function DrawCheckChar($DrawPos, $yPos, $ySize, $xres) {
 		$cset = $this->GetCheckCharValue();
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[0], $xres);
 		$DrawPos += $this->GetBarSize($cset[1], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[2], $xres);
 		$DrawPos += $this->GetBarSize($cset[3], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[4], $xres);
 		$DrawPos += $this->GetBarSize($cset[5], $xres);
 		return $DrawPos;
@@ -345,11 +345,11 @@ 
 	 */
 	function DrawObject($xres) {
 		$len = strlen($this->mValue);
-		if (($size = $this->GetSize($xres))==0) {
+		if (($size = $this->GetSize($xres)) == 0) {
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
+		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size) / 2);
 		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
 		else $sPos = 0;
 
@@ -360,35 +360,35 @@ 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {
 			if ($this->mStyle & BCS_STRETCH_TEXT) {
-				for ($i=0;$i<$len;$i++) {
-					$this->DrawChar($this->mFont, $sPos+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres)+($size/$len)*$i,
+				for ($i = 0; $i < $len; $i++) {
+					$this->DrawChar($this->mFont, $sPos + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres) + ($size / $len) * $i,
 					$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue[$i]);
 				}
 			} else {/* Center */
 			$text_width = $this->GetFontWidth($this->mFont) * strlen($this->mValue);
-			$this->DrawText($this->mFont, $sPos+(($size-$text_width)/2)+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres),
+			$this->DrawText($this->mFont, $sPos + (($size - $text_width) / 2) + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres),
 			$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue);
 			}
 		}
 
 		$cPos = 0;
-		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		do {
 			$c     = $this->GetCharIndex($this->mValue[$cPos]);
 			$cset  = $this->mCharSet[$c];
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[0], $xres);
 			$DrawPos += $this->GetBarSize($cset[1], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[2], $xres);
 			$DrawPos += $this->GetBarSize($cset[3], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[4], $xres);
 			$DrawPos += $this->GetBarSize($cset[5], $xres);
 			$cPos++;
-		} while ($cPos<$len);
-		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
-		$DrawPos =  $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		} while ($cPos < $len);
+		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
+		$DrawPos = $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		return true;
 	}
 }

Braces +12 added lines, -5 removed lines

@@ -349,13 +349,20 @@
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
-		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
-		else $sPos = 0;
+		if ($this->mStyle & BCS_ALIGN_CENTER) {
+			$sPos = (integer)(($this->mWidth - $size ) / 2);
+		} else if ($this->mStyle & BCS_ALIGN_RIGHT) {
+			$sPos = $this->mWidth - $size;
+		} else {
+			$sPos = 0;
+		}
 
 		/* Total height of bar code -Bars only- */
-		if ($this->mStyle & BCS_DRAW_TEXT) $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
-		else $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		if ($this->mStyle & BCS_DRAW_TEXT) {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
+		} else {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		}
 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {

pdf/barcode/c128aobject.php

Spacing +134 added lines, -134 removed lines

@@ -58,109 +58,109 @@ 
 		$this->BarcodeObject($Width, $Height, $Style);
 		$this->mValue   = $Value;
 		$this->mChars   = " !\"#$%&'()*+�-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
-		$this->mCharSet = array (
-		"212222",   /*   00 */
-		"222122",   /*   01 */
-		"222221",   /*   02 */
-		"121223",   /*   03 */
-		"121322",   /*   04 */
-		"131222",   /*   05 */
-		"122213",   /*   06 */
-		"122312",   /*   07 */
-		"132212",   /*   08 */
-		"221213",   /*   09 */
-		"221312",   /*   10 */
-		"231212",   /*   11 */
-		"112232",   /*   12 */
-		"122132",   /*   13 */
-		"122231",   /*   14 */
-		"113222",   /*   15 */
-		"123122",   /*   16 */
-		"123221",   /*   17 */
-		"223211",   /*   18 */
-		"221132",   /*   19 */
-		"221231",   /*   20 */
-		"213212",   /*   21 */
-		"223112",   /*   22 */
-		"312131",   /*   23 */
-		"311222",   /*   24 */
-		"321122",   /*   25 */
-		"321221",   /*   26 */
-		"312212",   /*   27 */
-		"322112",   /*   28 */
-		"322211",   /*   29 */
-		"212123",   /*   30 */
-		"212321",   /*   31 */
-		"232121",   /*   32 */
-		"111323",   /*   33 */
-		"131123",   /*   34 */
-		"131321",   /*   35 */
-		"112313",   /*   36 */
-		"132113",   /*   37 */
-		"132311",   /*   38 */
-		"211313",   /*   39 */
-		"231113",   /*   40 */
-		"231311",   /*   41 */
-		"112133",   /*   42 */
-		"112331",   /*   43 */
-		"132131",   /*   44 */
-		"113123",   /*   45 */
-		"113321",   /*   46 */
-		"133121",   /*   47 */
-		"313121",   /*   48 */
-		"211331",   /*   49 */
-		"231131",   /*   50 */
-		"213113",   /*   51 */
-		"213311",   /*   52 */
-		"213131",   /*   53 */
-		"311123",   /*   54 */
-		"311321",   /*   55 */
-		"331121",   /*   56 */
-		"312113",   /*   57 */
-		"312311",   /*   58 */
-		"332111",   /*   59 */
-		"314111",   /*   60 */
-		"221411",   /*   61 */
-		"431111",   /*   62 */
-		"111224",   /*   63 */
-		"111422",   /*   64 */
-		"121124",   /*   65 */
-		"121421",   /*   66 */
-		"141122",   /*   67 */
-		"141221",   /*   68 */
-		"112214",   /*   69 */
-		"112412",   /*   70 */
-		"122114",   /*   71 */
-		"122411",   /*   72 */
-		"142112",   /*   73 */
-		"142211",   /*   74 */
-		"241211",   /*   75 */
-		"221114",   /*   76 */
-		"413111",   /*   77 */
-		"241112",   /*   78 */
-		"134111",   /*   79 */
-		"111242",   /*   80 */
-		"121142",   /*   81 */
-		"121241",   /*   82 */
-		"114212",   /*   83 */
-		"124112",   /*   84 */
-		"124211",   /*   85 */
-		"411212",   /*   86 */
-		"421112",   /*   87 */
-		"421211",   /*   88 */
-		"212141",   /*   89 */
-		"214121",   /*   90 */
-		"412121",   /*   91 */
-		"111143",   /*   92 */
-		"111341",   /*   93 */
-		"131141",   /*   94 */
-		"114113",   /*   95 */
-		"114311",   /*   96 */
-		"411113",   /*   97 */
-		"411311",   /*   98 */
-		"113141",   /*   99 */
-		"114131",   /*  100 */
-		"311141",   /*  101 */
+		$this->mCharSet = array(
+		"212222", /*   00 */
+		"222122", /*   01 */
+		"222221", /*   02 */
+		"121223", /*   03 */
+		"121322", /*   04 */
+		"131222", /*   05 */
+		"122213", /*   06 */
+		"122312", /*   07 */
+		"132212", /*   08 */
+		"221213", /*   09 */
+		"221312", /*   10 */
+		"231212", /*   11 */
+		"112232", /*   12 */
+		"122132", /*   13 */
+		"122231", /*   14 */
+		"113222", /*   15 */
+		"123122", /*   16 */
+		"123221", /*   17 */
+		"223211", /*   18 */
+		"221132", /*   19 */
+		"221231", /*   20 */
+		"213212", /*   21 */
+		"223112", /*   22 */
+		"312131", /*   23 */
+		"311222", /*   24 */
+		"321122", /*   25 */
+		"321221", /*   26 */
+		"312212", /*   27 */
+		"322112", /*   28 */
+		"322211", /*   29 */
+		"212123", /*   30 */
+		"212321", /*   31 */
+		"232121", /*   32 */
+		"111323", /*   33 */
+		"131123", /*   34 */
+		"131321", /*   35 */
+		"112313", /*   36 */
+		"132113", /*   37 */
+		"132311", /*   38 */
+		"211313", /*   39 */
+		"231113", /*   40 */
+		"231311", /*   41 */
+		"112133", /*   42 */
+		"112331", /*   43 */
+		"132131", /*   44 */
+		"113123", /*   45 */
+		"113321", /*   46 */
+		"133121", /*   47 */
+		"313121", /*   48 */
+		"211331", /*   49 */
+		"231131", /*   50 */
+		"213113", /*   51 */
+		"213311", /*   52 */
+		"213131", /*   53 */
+		"311123", /*   54 */
+		"311321", /*   55 */
+		"331121", /*   56 */
+		"312113", /*   57 */
+		"312311", /*   58 */
+		"332111", /*   59 */
+		"314111", /*   60 */
+		"221411", /*   61 */
+		"431111", /*   62 */
+		"111224", /*   63 */
+		"111422", /*   64 */
+		"121124", /*   65 */
+		"121421", /*   66 */
+		"141122", /*   67 */
+		"141221", /*   68 */
+		"112214", /*   69 */
+		"112412", /*   70 */
+		"122114", /*   71 */
+		"122411", /*   72 */
+		"142112", /*   73 */
+		"142211", /*   74 */
+		"241211", /*   75 */
+		"221114", /*   76 */
+		"413111", /*   77 */
+		"241112", /*   78 */
+		"134111", /*   79 */
+		"111242", /*   80 */
+		"121142", /*   81 */
+		"121241", /*   82 */
+		"114212", /*   83 */
+		"124112", /*   84 */
+		"124211", /*   85 */
+		"411212", /*   86 */
+		"421112", /*   87 */
+		"421211", /*   88 */
+		"212141", /*   89 */
+		"214121", /*   90 */
+		"412121", /*   91 */
+		"111143", /*   92 */
+		"111341", /*   93 */
+		"131141", /*   94 */
+		"114113", /*   95 */
+		"114311", /*   96 */
+		"411113", /*   97 */
+		"411311", /*   98 */
+		"113141", /*   99 */
+		"114131", /*  100 */
+		"311141", /*  101 */
 		"411131"    /*  102 */
 		);
 	}
@@ -172,7 +172,7 @@ 
 	 * @access private
 	 */
 	function GetCharIndex($char) {
-		for ($i=0;$i<64;$i++) {
+		for ($i = 0; $i < 64; $i++) {
 			if ($this->mChars[$i] == $char) {
 				return $i;
 			}
@@ -221,12 +221,12 @@ 
 	function GetSize($xres) {
 		$len = strlen($this->mValue);
 
-		if ($len == 0)  {
+		if ($len == 0) {
 			$this->mError = "Null value";
 			return false;
 		}
 		$ret = 0;
-		for ($i=0;$i<$len;$i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if (($id = $this->GetCharIndex($this->mValue[$i])) == -1) {
 				$this->mError = "C128A not include the char '".$this->mValue[$i]."'";
 				return false;
@@ -244,11 +244,11 @@ 
 		/* length of Check character */
 		$cset = $this->GetCheckCharValue();
 		$CheckSize = 0;
-		for ($i=0;$i<6;$i++) {
+		for ($i = 0; $i < 6; $i++) {
 			$CheckSize += $this->GetBarSize($cset[$i], $xres);
 		}
-		$StartSize = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres;
-		$StopSize  = 2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + 2*BCD_C128_BAR_3*$xres;
+		$StartSize = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres;
+		$StopSize  = 2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + 2 * BCD_C128_BAR_3 * $xres;
 		return $StartSize + $ret + $CheckSize + $StopSize;
 	}
 	
@@ -260,10 +260,10 @@ 
 	function GetCheckCharValue() {
 		$len = strlen($this->mValue);
 		$sum = 103; // 'A' type;
-		for ($i=0;$i<$len;$i++) {
-			$sum +=  $this->GetCharIndex($this->mValue[$i]) * ($i+1);
+		for ($i = 0; $i < $len; $i++) {
+			$sum += $this->GetCharIndex($this->mValue[$i]) * ($i + 1);
 		}
-		$check  = $sum % 103;
+		$check = $sum % 103;
 		return $this->mCharSet[$check];
 	}
 
@@ -278,13 +278,13 @@ 
 	 */
 	function DrawStart($DrawPos, $yPos, $ySize, $xres) {
 		/* Start code is '211412' */
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('4', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		return $DrawPos;
@@ -301,16 +301,16 @@ 
 	 */
 	function DrawStop($DrawPos, $yPos, $ySize, $xres) {
 		/* Stop code is '2331112' */
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		$DrawPos += $this->GetBarSize('3', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('3', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('3', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('1', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('1', $xres);
 		$DrawPos += $this->GetBarSize('1', $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize('2', $xres), $ySize);
 		$DrawPos += $this->GetBarSize('2', $xres);
 		return $DrawPos;
 	}
@@ -326,13 +326,13 @@ 
 	 */
 	function DrawCheckChar($DrawPos, $yPos, $ySize, $xres) {
 		$cset = $this->GetCheckCharValue();
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[0], $xres);
 		$DrawPos += $this->GetBarSize($cset[1], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[2], $xres);
 		$DrawPos += $this->GetBarSize($cset[3], $xres);
-		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ySize);
+		$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ySize);
 		$DrawPos += $this->GetBarSize($cset[4], $xres);
 		$DrawPos += $this->GetBarSize($cset[5], $xres);
 		return $DrawPos;
@@ -345,11 +345,11 @@ 
 	 */
 	function DrawObject($xres) {
 		$len = strlen($this->mValue);
-		if (($size = $this->GetSize($xres))==0) {
+		if (($size = $this->GetSize($xres)) == 0) {
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
+		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size) / 2);
 		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
 		else $sPos = 0;
 
@@ -360,35 +360,35 @@ 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {
 			if ($this->mStyle & BCS_STRETCH_TEXT) {
-				for ($i=0;$i<$len;$i++) {
-					$this->DrawChar($this->mFont, $sPos+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres)+($size/$len)*$i,
+				for ($i = 0; $i < $len; $i++) {
+					$this->DrawChar($this->mFont, $sPos + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres) + ($size / $len) * $i,
 					$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue[$i]);
 				}
 			} else {/* Center */
 			$text_width = $this->GetFontWidth($this->mFont) * strlen($this->mValue);
-			$this->DrawText($this->mFont, $sPos+(($size-$text_width)/2)+(2*BCD_C128_BAR_2*$xres + 3*BCD_C128_BAR_1*$xres + BCD_C128_BAR_4*$xres),
+			$this->DrawText($this->mFont, $sPos + (($size - $text_width) / 2) + (2 * BCD_C128_BAR_2 * $xres + 3 * BCD_C128_BAR_1 * $xres + BCD_C128_BAR_4 * $xres),
 			$ysize + BCD_DEFAULT_MAR_Y1 + BCD_DEFAULT_TEXT_OFFSET, $this->mValue);
 			}
 		}
 
 		$cPos = 0;
-		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		$DrawPos = $this->DrawStart($sPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		do {
 			$c     = $this->GetCharIndex($this->mValue[$cPos]);
 			$cset  = $this->mCharSet[$c];
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[0], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[0], $xres);
 			$DrawPos += $this->GetBarSize($cset[1], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[2], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[2], $xres);
 			$DrawPos += $this->GetBarSize($cset[3], $xres);
-			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres) , $ysize);
+			$this->DrawSingleBar($DrawPos, BCD_DEFAULT_MAR_Y1, $this->GetBarSize($cset[4], $xres), $ysize);
 			$DrawPos += $this->GetBarSize($cset[4], $xres);
 			$DrawPos += $this->GetBarSize($cset[5], $xres);
 			$cPos++;
-		} while ($cPos<$len);
-		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
-		$DrawPos =  $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1 , $ysize, $xres);
+		} while ($cPos < $len);
+		$DrawPos = $this->DrawCheckChar($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
+		$DrawPos = $this->DrawStop($DrawPos, BCD_DEFAULT_MAR_Y1, $ysize, $xres);
 		return true;
 	}
 }

Braces +12 added lines, -5 removed lines

@@ -349,13 +349,20 @@
 			return false;
 		}
 
-		if ($this->mStyle & BCS_ALIGN_CENTER) $sPos = (integer)(($this->mWidth - $size ) / 2);
-		else if ($this->mStyle & BCS_ALIGN_RIGHT) $sPos = $this->mWidth - $size;
-		else $sPos = 0;
+		if ($this->mStyle & BCS_ALIGN_CENTER) {
+			$sPos = (integer)(($this->mWidth - $size ) / 2);
+		} else if ($this->mStyle & BCS_ALIGN_RIGHT) {
+			$sPos = $this->mWidth - $size;
+		} else {
+			$sPos = 0;
+		}
 
 		/* Total height of bar code -Bars only- */
-		if ($this->mStyle & BCS_DRAW_TEXT) $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
-		else $ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		if ($this->mStyle & BCS_DRAW_TEXT) {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2 - $this->GetFontHeight($this->mFont);
+		} else {
+			$ysize = $this->mHeight - BCD_DEFAULT_MAR_Y1 - BCD_DEFAULT_MAR_Y2;
+		}
 
 		/* Draw text */
 		if ($this->mStyle & BCS_DRAW_TEXT) {