Stefanius67 / XFPDF

OPlathey/FPDF/FPDF.php

Braces +452 added lines, -347 removed lines

@@ -241,15 +241,14 @@ 
     		$this->DefOrientation = 'P';

     		$this->w = $size[0];

     		$this->h = $size[1];

-    	}

-    	elseif($orientation=='l' || $orientation=='landscape')

+    	} elseif($orientation=='l' || $orientation=='landscape')

     	{

     		$this->DefOrientation = 'L';

     		$this->w = $size[1];

     		$this->h = $size[0];

+    	} else {

+    	    		$this->Error('Incorrect orientation: '.$orientation);

     	}

-    	else

-    		$this->Error('Incorrect orientation: '.$orientation);

     	$this->CurOrientation = $this->DefOrientation;

     	$this->wPt = $this->w*$this->k;

     	$this->hPt = $this->h*$this->k;

@@ -284,8 +283,9 @@ 
     	// Set left, top and right margins

     	$this->lMargin = $left;

     	$this->tMargin = $top;

-    	if($right===null)

-    		$right = $left;

+    	if($right===null) {

+    	    		$right = $left;

+    	}

     	$this->rMargin = $right;

     }

 

@@ -299,8 +299,9 @@ 
     {

     	// Set left margin

     	$this->lMargin = $margin;

-    	if($this->page>0 && $this->x<$margin)

-    		$this->x = $margin;

+    	if($this->page>0 && $this->x<$margin) {

+    	    		$this->x = $margin;

+    	}

     }

 

     /**

@@ -372,14 +373,16 @@ 
     public function SetDisplayMode($zoom, string $layout='default') : void

     {

     	// Set display mode in viewer

-    	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

-    		$this->ZoomMode = $zoom;

-    	else

-    		$this->Error('Incorrect zoom display mode: '.$zoom);

-    	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

-    		$this->LayoutMode = $layout;

-    	else

-    		$this->Error('Incorrect layout display mode: '.$layout);

+    	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {

+    	    		$this->ZoomMode = $zoom;

+    	} else {

+    	    		$this->Error('Incorrect zoom display mode: '.$zoom);

+    	}

+    	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {

+    	    		$this->LayoutMode = $layout;

+    	} else {

+    	    		$this->Error('Incorrect layout display mode: '.$layout);

+    	}

     }

 

     /**

@@ -394,10 +397,11 @@ 
     public function SetCompression(bool $compress) : void

     {

     	// Set page compression

-    	if(function_exists('gzcompress'))

-    		$this->compress = $compress;

-    	else

-    		$this->compress = false;

+    	if(function_exists('gzcompress')) {

+    	    		$this->compress = $compress;

+    	} else {

+    	    		$this->compress = false;

+    	}

     }

 

     /**

@@ -488,10 +492,12 @@ 
     public function Close() : void

     {

     	// Terminate document

-    	if($this->state==3)

-    		return;

-    	if($this->page==0)

-    		$this->addPage();

+    	if($this->state==3) {

+    	    		return;

+    	}

+    	if($this->page==0) {

+    	    		$this->addPage();

+    	}

     	// Page footer

     	$this->InFooter = true;

     	$this->Footer();

@@ -533,8 +539,9 @@ 
     public function AddPage(string $orientation='', $size='', int $rotation=0) : void

     {

     	// Start a new page

-    	if($this->state==3)

-    		$this->Error('The document is closed');

+    	if($this->state==3) {

+    	    		$this->Error('The document is closed');

+    	}

     	$family = $this->FontFamily;

     	$style = $this->FontStyle.($this->underline ? 'U' : '');

     	$fontsize = $this->FontSizePt;

@@ -560,15 +567,18 @@ 
     	$this->LineWidth = $lw;

     	$this->_out(sprintf('%.2F w',$lw*$this->k));

     	// Set font

-    	if($family)

-    		$this->setFont($family,$style,$fontsize);

+    	if($family) {

+    	    		$this->setFont($family,$style,$fontsize);

+    	}

     	// Set colors

     	$this->DrawColor = $dc;

-    	if($dc!='0 G')

-    		$this->_out($dc);

+    	if($dc!='0 G') {

+    	    		$this->_out($dc);

+    	}

     	$this->FillColor = $fc;

-    	if($fc!='0 g')

-    		$this->_out($fc);

+    	if($fc!='0 g') {

+    	    		$this->_out($fc);

+    	}

     	$this->TextColor = $tc;

     	$this->ColorFlag = $cf;

     	// Page header

@@ -582,8 +592,9 @@ 
     		$this->_out(sprintf('%.2F w',$lw*$this->k));

     	}

     	// Restore font

-    	if($family)

-    		$this->setFont($family,$style,$fontsize);

+    	if($family) {

+    	    		$this->setFont($family,$style,$fontsize);

+    	}

     	// Restore colors

     	if($this->DrawColor!=$dc)

     	{

@@ -706,8 +717,9 @@ 
     	$cw = &$this->CurrentFont['cw'];

     	$w = 0;

     	$l = strlen($s);

-    	for($i=0;$i<$l;$i++)

-    		$w += $cw[$s[$i]];

+    	for($i=0;$i<$l;$i++) {

+    	    		$w += $cw[$s[$i]];

+    	}

     	return $w*$this->FontSize/1000;

     }

     

@@ -721,8 +733,9 @@ 
     {

     	// Set line width

     	$this->LineWidth = $width;

-    	if($this->page>0)

-    		$this->_out(sprintf('%.2F w',$width*$this->k));

+    	if($this->page>0) {

+    	    		$this->_out(sprintf('%.2F w',$width*$this->k));

+    	}

     }

     

     /**

@@ -758,12 +771,13 @@ 
     public function Rect(float $x, float $y, float $w, float $h, string $style='') : void

     {

     	// Draw a rectangle

-    	if($style=='F')

-    		$op = 'f';

-    	elseif($style=='FD' || $style=='DF')

-    		$op = 'B';

-    	else

-    		$op = 'S';

+    	if($style=='F') {

+    	    		$op = 'f';

+    	} elseif($style=='FD' || $style=='DF') {

+    	    		$op = 'B';

+    	} 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));

     }

     

@@ -788,23 +802,27 @@ 
     {

     	// Add a TrueType, OpenType or Type1 font

     	$family = strtolower($family);

-    	if($file=='')

-    		$file = str_replace(' ','',$family).strtolower($style).'.php';

+    	if($file=='') {

+    	    		$file = str_replace(' ','',$family).strtolower($style).'.php';

+    	}

     	$style = strtoupper($style);

-    	if($style=='IB')

-    		$style = 'BI';

+    	if($style=='IB') {

+    	    		$style = 'BI';

+    	}

     	$fontkey = $family.$style;

-    	if(isset($this->fonts[$fontkey]))

-    		return;

+    	if(isset($this->fonts[$fontkey])) {

+    	    		return;

+    	}

     	$info = $this->_loadfont($file);

     	$info['i'] = count($this->fonts)+1;

     	if(!empty($info['file']))

     	{

     		// Embedded font

-    		if($info['type']=='TrueType')

-    			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

-    		else

-    			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+    		if($info['type']=='TrueType') {

+    		    			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

+    		} else {

+    		    			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+    		}

     	}

     	$this->fonts[$fontkey] = $info;

     }

@@ -847,42 +865,49 @@ 
     public function SetFont(string $family, string $style='', float $size=0) : void

     {

     	// Select a font; size given in points

-    	if($family=='')

-    		$family = $this->FontFamily;

-    	else

-    		$family = strtolower($family);

+    	if($family=='') {

+    	    		$family = $this->FontFamily;

+    	} else {

+    	    		$family = strtolower($family);

+    	}

     	$style = strtoupper($style);

     	if(strpos($style,'U')!==false)

     	{

     		$this->underline = true;

     		$style = str_replace('U','',$style);

+    	} else {

+    	    		$this->underline = false;

+    	}

+    	if($style=='IB') {

+    	    		$style = 'BI';

+    	}

+    	if($size==0) {

+    	    		$size = $this->FontSizePt;

     	}

-    	else

-    		$this->underline = false;

-    	if($style=='IB')

-    		$style = 'BI';

-    	if($size==0)

-    		$size = $this->FontSizePt;

     	// Test if font is already selected

-    	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

-    		return;

+    	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {

+    	    		return;

+    	}

     	// Test if font is already loaded

     	$fontkey = $family.$style;

     	if(!isset($this->fonts[$fontkey]))

     	{

     		// Test if one of the core fonts

-    		if($family=='arial')

-    			$family = 'helvetica';

+    		if($family=='arial') {

+    		    			$family = 'helvetica';

+    		}

     		if(in_array($family,$this->CoreFonts))

     		{

-    			if($family=='symbol' || $family=='zapfdingbats')

-    				$style = '';

+    			if($family=='symbol' || $family=='zapfdingbats') {

+    			    				$style = '';

+    			}

     			$fontkey = $family.$style;

-    			if(!isset($this->fonts[$fontkey]))

-    				$this->addFont($family,$style);

+    			if(!isset($this->fonts[$fontkey])) {

+    			    				$this->addFont($family,$style);

+    			}

+    		} else {

+    		    			$this->Error('Undefined font: '.$family.' '.$style);

     		}

-    		else

-    			$this->Error('Undefined font: '.$family.' '.$style);

     	}

     	// Select it

     	$this->FontFamily = $family;

@@ -890,8 +915,9 @@ 
     	$this->FontSizePt = $size;

     	$this->FontSize = $size/$this->k;

     	$this->CurrentFont = &$this->fonts[$fontkey];

-    	if($this->page>0)

-    		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+    	if($this->page>0) {

+    	    		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+    	}

     }

     

     /**

@@ -901,12 +927,14 @@ 
     public function SetFontSize(float $size) : void

     {

     	// Set font size in points

-    	if($this->FontSizePt==$size)

-    		return;

+    	if($this->FontSizePt==$size) {

+    	    		return;

+    	}

     	$this->FontSizePt = $size;

     	$this->FontSize = $size/$this->k;

-    	if($this->page>0)

-    		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+    	if($this->page>0) {

+    	    		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+    	}

     }

     

     /**

@@ -933,10 +961,12 @@ 
     public function SetLink(int $link, float $y=0, int $page=-1) : void

     {

     	// Set destination of internal link

-    	if($y==-1)

-    		$y = $this->y;

-    	if($page==-1)

-    		$page = $this->page;

+    	if($y==-1) {

+    	    		$y = $this->y;

+    	}

+    	if($page==-1) {

+    	    		$page = $this->page;

+    	}

     	$this->links[$link] = array($page, $y);

     }

     

@@ -970,13 +1000,16 @@ 
     public function Text(float $x, float $y, string $txt) : void

     {

     	// Output a string

-    	if(!isset($this->CurrentFont))

-    		$this->Error('No font has been set');

+    	if(!isset($this->CurrentFont)) {

+    	    		$this->Error('No font has been set');

+    	}

     	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));

-    	if($this->underline && $txt!='')

-    		$s .= ' '.$this->_dounderline($x,$y,$txt);

-    	if($this->ColorFlag)

-    		$s = 'q '.$this->TextColor.' '.$s.' Q';

+    	if($this->underline && $txt!='') {

+    	    		$s .= ' '.$this->_dounderline($x,$y,$txt);

+    	}

+    	if($this->ColorFlag) {

+    	    		$s = 'q '.$this->TextColor.' '.$s.' Q';

+    	}

     	$this->_out($s);

     }

     

@@ -1056,62 +1089,76 @@ 
     			$this->_out(sprintf('%.3F Tw',$ws*$k));

     		}

     	}

-    	if($w==0)

-    		$w = $this->w-$this->rMargin-$this->x;

+    	if($w==0) {

+    	    		$w = $this->w-$this->rMargin-$this->x;

+    	}

     	$s = '';

     	if($fill || $border==1)

     	{

-    		if($fill)

-    			$op = ($border==1) ? 'B' : 'f';

-    		else

-    			$op = 'S';

+    		if($fill) {

+    		    			$op = ($border==1) ? 'B' : 'f';

+    		} else {

+    		    			$op = 'S';

+    		}

     		$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(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,'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,'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,'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($txt!=='')

     	{

-    		if(!isset($this->CurrentFont))

-    			$this->Error('No font has been set');

-    		if($align=='R')

-    			$dx = $w-$this->cMargin-$this->getStringWidth($txt);

-    		elseif($align=='C')

-    			$dx = ($w-$this->getStringWidth($txt))/2;

-    		else

-    			$dx = $this->cMargin;

-    		if($this->ColorFlag)

-    			$s .= 'q '.$this->TextColor.' ';

+    		if(!isset($this->CurrentFont)) {

+    		    			$this->Error('No font has been set');

+    		}

+    		if($align=='R') {

+    		    			$dx = $w-$this->cMargin-$this->getStringWidth($txt);

+    		} elseif($align=='C') {

+    		    			$dx = ($w-$this->getStringWidth($txt))/2;

+    		} else {

+    		    			$dx = $this->cMargin;

+    		}

+    		if($this->ColorFlag) {

+    		    			$s .= 'q '.$this->TextColor.' ';

+    		}

     		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));

-    		if($this->underline)

-    			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-    		if($this->ColorFlag)

-    			$s .= ' Q';

-    		if($link)

-    			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->getStringWidth($txt),$this->FontSize,$link);

-    	}

-    	if($s)

-    		$this->_out($s);

+    		if($this->underline) {

+    		    			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

+    		}

+    		if($this->ColorFlag) {

+    		    			$s .= ' Q';

+    		}

+    		if($link) {

+    		    			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->getStringWidth($txt),$this->FontSize,$link);

+    		}

+    	}

+    	if($s) {

+    	    		$this->_out($s);

+    	}

     	$this->lasth = $h;

     	if($ln>0)

     	{

     		// Go to next line

     		$this->y += $h;

-    		if($ln==1)

-    			$this->x = $this->lMargin;

+    		if($ln==1) {

+    		    			$this->x = $this->lMargin;

+    		}

+    	} else {

+    	    		$this->x += $w;

     	}

-    	else

-    		$this->x += $w;

     }

     

     /**

@@ -1145,16 +1192,19 @@ 
     public function MultiCell(float $w, float $h, string $txt, $border=0, string $align='J', bool $fill=false) : void

     {

     	// Output text with automatic or explicit line breaks

-    	if(!isset($this->CurrentFont))

-    		$this->Error('No font has been set');

+    	if(!isset($this->CurrentFont)) {

+    	    		$this->Error('No font has been set');

+    	}

     	$cw = &$this->CurrentFont['cw'];

-    	if($w==0)

-    		$w = $this->w-$this->rMargin-$this->x;

+    	if($w==0) {

+    	    		$w = $this->w-$this->rMargin-$this->x;

+    	}

     	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

     	$s = str_replace("\r",'',$txt);

     	$nb = strlen($s);

-    	if($nb>0 && $s[$nb-1]=="\n")

-    		$nb--;

+    	if($nb>0 && $s[$nb-1]=="\n") {

+    	    		$nb--;

+    	}

     	$b = 0;

     	$b2 = '';

     	if($border)

@@ -1164,14 +1214,15 @@ 
     			$border = 'LTRB';

     			$b = 'LRT';

     			$b2 = 'LR';

-    		}

-    		else

+    		} else

     		{

     			$b2 = '';

-    			if(strpos($border,'L')!==false)

-    				$b2 .= 'L';

-    			if(strpos($border,'R')!==false)

-    				$b2 .= 'R';

+    			if(strpos($border,'L')!==false) {

+    			    				$b2 .= 'L';

+    			}

+    			if(strpos($border,'R')!==false) {

+    			    				$b2 .= 'R';

+    			}

     			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;

     		}

     	}

@@ -1201,8 +1252,9 @@ 
     			$l = 0;

     			$ns = 0;

     			$nl++;

-    			if($border && $nl==2)

-    				$b = $b2;

+    			if($border && $nl==2) {

+    			    				$b = $b2;

+    			}

     			continue;

     		}

     		if($c==' ')

@@ -1217,16 +1269,16 @@ 
     			// Automatic line break

     			if($sep==-1)

     			{

-    				if($i==$j)

-    					$i++;

+    				if($i==$j) {

+    				    					$i++;

+    				}

     				if($this->ws>0)

     				{

     					$this->ws = 0;

     					$this->_out('0 Tw');

     				}

     				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

-    			}

-    			else

+    			} else

     			{

     				if($align=='J')

     				{

@@ -1241,11 +1293,12 @@ 
     			$l = 0;

     			$ns = 0;

     			$nl++;

-    			if($border && $nl==2)

-    				$b = $b2;

+    			if($border && $nl==2) {

+    			    				$b = $b2;

+    			}

+    		} else {

+    		    			$i++;

     		}

-    		else

-    			$i++;

     	}

     	// Last chunk

     	if($this->ws>0)

@@ -1253,8 +1306,9 @@ 
     		$this->ws = 0;

     		$this->_out('0 Tw');

     	}

-    	if($border && strpos($border,'B')!==false)

-    		$b .= 'B';

+    	if($border && strpos($border,'B')!==false) {

+    	    		$b .= 'B';

+    	}

     	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

     	$this->x = $this->lMargin;

     }

@@ -1272,8 +1326,9 @@ 
     public function Write(float $h, string $txt, $link='') : void

     {

     	// Output text in flowing mode

-    	if(!isset($this->CurrentFont))

-    		$this->Error('No font has been set');

+    	if(!isset($this->CurrentFont)) {

+    	    		$this->Error('No font has been set');

+    	}

     	$cw = &$this->CurrentFont['cw'];

     	$w = $this->w-$this->rMargin-$this->x;

     	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

@@ -1305,8 +1360,9 @@ 
     			$nl++;

     			continue;

     		}

-    		if($c==' ')

-    			$sep = $i;

+    		if($c==' ') {

+    		    			$sep = $i;

+    		}

     		$l += $cw[$c];

     		if($l>$wmax)

     		{

@@ -1324,11 +1380,11 @@ 
     					$nl++;

     					continue;

     				}

-    				if($i==$j)

-    					$i++;

+    				if($i==$j) {

+    				    					$i++;

+    				}

     				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);

-    			}

-    			else

+    			} else

     			{

     				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);

     				$i = $sep+1;

@@ -1343,13 +1399,14 @@ 
     				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

     			}

     			$nl++;

+    		} else {

+    		    			$i++;

     		}

-    		else

-    			$i++;

     	}

     	// Last chunk

-    	if($i!=$j)

-    		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+    	if($i!=$j) {

+    	    		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+    	}

     }

     

     /**

@@ -1363,10 +1420,11 @@ 
     {

     	// Line feed; default value is the last cell height

     	$this->x = $this->lMargin;

-    	if($h===null)

-    		$this->y += $this->lasth;

-    	else

-    		$this->y += $h;

+    	if($h===null) {

+    	    		$this->y += $this->lasth;

+    	} else {

+    	    		$this->y += $h;

+    	}

     }

     

     /**

@@ -1418,30 +1476,34 @@ 
     public function Image(string $file, ?float $x=null, ?float $y=null, float $w=0, float $h=0, string $type='', $link='') : void

     {

     	// Put an image on the page

-    	if($file=='')

-    		$this->Error('Image file name is empty');

+    	if($file=='') {

+    	    		$this->Error('Image file name is empty');

+    	}

     	if(!isset($this->images[$file]))

     	{

     		// First use of this image, get info

     		if($type=='')

     		{

     			$pos = strrpos($file,'.');

-    			if(!$pos)

-    				$this->Error('Image file has no extension and no type was specified: '.$file);

+    			if(!$pos) {

+    			    				$this->Error('Image file has no extension and no type was specified: '.$file);

+    			}

     			$type = substr($file,$pos+1);

     		}

     		$type = strtolower($type);

-    		if($type=='jpeg')

-    			$type = 'jpg';

+    		if($type=='jpeg') {

+    		    			$type = 'jpg';

+    		}

     		$mtd = '_parse'.$type;

-    		if(!method_exists($this,$mtd))

-    			$this->Error('Unsupported image type: '.$type);

+    		if(!method_exists($this,$mtd)) {

+    		    			$this->Error('Unsupported image type: '.$type);

+    		}

     		$info = $this->$mtd($file);

     		$info['i'] = count($this->images)+1;

     		$this->images[$file] = $info;

+    	} else {

+    	    		$info = $this->images[$file];

     	}

-    	else

-    		$info = $this->images[$file];

     

     	// Automatic width and height calculation if needed

     	if($w==0 && $h==0)

@@ -1450,14 +1512,18 @@ 
     		$w = -96;

     		$h = -96;

     	}

-    	if($w<0)

-    		$w = -$info['w']*72/$w/$this->k;

-    	if($h<0)

-    		$h = -$info['h']*72/$h/$this->k;

-    	if($w==0)

-    		$w = $h*$info['w']/$info['h'];

-    	if($h==0)

-    		$h = $w*$info['h']/$info['w'];

+    	if($w<0) {

+    	    		$w = -$info['w']*72/$w/$this->k;

+    	}

+    	if($h<0) {

+    	    		$h = -$info['h']*72/$h/$this->k;

+    	}

+    	if($w==0) {

+    	    		$w = $h*$info['w']/$info['h'];

+    	}

+    	if($h==0) {

+    	    		$h = $w*$info['h']/$info['w'];

+    	}

     

     	// Flowing mode

     	if($y===null)

@@ -1473,11 +1539,13 @@ 
     		$this->y += $h;

     	}

     

-    	if($x===null)

-    		$x = $this->x;

+    	if($x===null) {

+    	    		$x = $this->x;

+    	}

     	$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);

+    	if($link) {

+    	    		$this->Link($x,$y,$w,$h,$link);

+    	}

     }

     

     /**

@@ -1518,10 +1586,11 @@ 
     public function SetX(float $x) : void

     {

     	// Set x position

-    	if($x>=0)

-    		$this->x = $x;

-    	else

-    		$this->x = $this->w+$x;

+    	if($x>=0) {

+    	    		$this->x = $x;

+    	} else {

+    	    		$this->x = $this->w+$x;

+    	}

     }

 

     /**

@@ -1543,12 +1612,14 @@ 
     public function SetY(float $y, bool $resetX=true) : void

     {

     	// Set y position and optionally reset x

-    	if($y>=0)

-    		$this->y = $y;

-    	else

-    		$this->y = $this->h+$y;

-    	if($resetX)

-    		$this->x = $this->lMargin;

+    	if($y>=0) {

+    	    		$this->y = $y;

+    	} else {

+    	    		$this->y = $this->h+$y;

+    	}

+    	if($resetX) {

+    	    		$this->x = $this->lMargin;

+    	}

     }

     

     /**

@@ -1593,10 +1664,12 @@ 
     		$dest = $name;

     		$name = $tmp;

     	}

-    	if($dest=='')

-    		$dest = 'I';

-    	if($name=='')

-    		$name = 'doc.pdf';

+    	if($dest=='') {

+    	    		$dest = 'I';

+    	}

+    	if($name=='') {

+    	    		$name = 'doc.pdf';

+    	}

     	switch(strtoupper($dest))

     	{

     		case 'I':

@@ -1623,8 +1696,9 @@ 
     			break;

     		case 'F':

     			// Save to local file

-    			if(!file_put_contents($name,$this->buffer))

-    				$this->Error('Unable to create output file: '.$name);

+    			if(!file_put_contents($name,$this->buffer)) {

+    			    				$this->Error('Unable to create output file: '.$name);

+    			}

     			break;

     		case 'S':

     			// Return as a string

@@ -1641,8 +1715,9 @@ 
     protected function _dochecks() : void

     {

     	// Check mbstring overloading

-    	if(ini_get('mbstring.func_overload') & 2)

-    		$this->Error('mbstring overloading must be disabled');

+    	if(ini_get('mbstring.func_overload') & 2) {

+    	    		$this->Error('mbstring overloading must be disabled');

+    	}

     }

 

     /**

@@ -1654,8 +1729,9 @@ 
     	{

     	    $file = '';

     	    $line = 0;

-    		if(headers_sent($file,$line))

-    			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");

+    		if(headers_sent($file,$line)) {

+    		    			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");

+    		}

     	}

     	if(ob_get_length())

     	{

@@ -1664,9 +1740,9 @@ 
     		{

     			// It contains only a UTF-8 BOM and/or whitespace, let's clean it

     			ob_clean();

+    		} else {

+    		    			$this->Error("Some data has already been output, can't send PDF file");

     		}

-    		else

-    			$this->Error("Some data has already been output, can't send PDF file");

     	}

     }

     

@@ -1680,17 +1756,18 @@ 
     	if(is_string($size))

     	{

     		$size = strtolower($size);

-    		if(!isset($this->StdPageSizes[$size]))

-    			$this->Error('Unknown page size: '.$size);

+    		if(!isset($this->StdPageSizes[$size])) {

+    		    			$this->Error('Unknown page size: '.$size);

+    		}

     		$a = $this->StdPageSizes[$size];

     		return array($a[0]/$this->k, $a[1]/$this->k);

-    	}

-    	else

+    	} else

     	{

-    		if($size[0]>$size[1])

-    			return array($size[1], $size[0]);

-    		else

-    			return $size;

+    		if($size[0]>$size[1]) {

+    		    			return array($size[1], $size[0]);

+    		} else {

+    		    			return $size;

+    		}

     	}

     }

     

@@ -1709,14 +1786,16 @@ 
     	$this->y = $this->tMargin;

     	$this->FontFamily = '';

     	// Check page size and orientation

-    	if($orientation=='')

-    		$orientation = $this->DefOrientation;

-    	else

-    		$orientation = strtoupper($orientation[0]);

-    	if($size=='')

-    		$size = $this->DefPageSize;

-    	else

-    		$size = $this->_getpagesize($size);

+    	if($orientation=='') {

+    	    		$orientation = $this->DefOrientation;

+    	} else {

+    	    		$orientation = strtoupper($orientation[0]);

+    	}

+    	if($size=='') {

+    	    		$size = $this->DefPageSize;

+    	} else {

+    	    		$size = $this->_getpagesize($size);

+    	}

     	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])

     	{

     		// New size or orientation

@@ -1724,8 +1803,7 @@ 
     		{

     			$this->w = $size[0];

     			$this->h = $size[1];

-    		}

-    		else

+    		} else

     		{

     			$this->w = $size[1];

     			$this->h = $size[0];

@@ -1736,12 +1814,14 @@ 
     		$this->CurOrientation = $orientation;

     		$this->CurPageSize = $size;

     	}

-    	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])

-    		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);

+    	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1]) {

+    	    		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);

+    	}

     	if($rotation!=0)

     	{

-    		if($rotation%90!=0)

-    			$this->Error('Incorrect rotation value: '.$rotation);

+    		if($rotation%90!=0) {

+    		    			$this->Error('Incorrect rotation value: '.$rotation);

+    		}

     		$this->CurRotation = $rotation;

     		$this->PageInfo[$this->page]['rotation'] = $rotation;

     	}

@@ -1796,8 +1876,9 @@ 
     	$nb = strlen($s);

     	for($i=0;$i<$nb;$i++)

     	{

-    		if(ord($s[$i])>127)

-    			return false;

+    		if(ord($s[$i])>127) {

+    		    			return false;

+    		}

     	}

     	return true;

     }

@@ -1811,14 +1892,17 @@ 
     protected function _httpencode(string $param, string $value, bool $isUTF8) : string

     {

     	// Encode HTTP header field parameter

-    	if($this->_isascii($value))

-    		return $param.'="'.$value.'"';

-    	if(!$isUTF8)

-    		$value = utf8_encode($value);

-    	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)

-    		return $param.'="'.rawurlencode($value).'"';

-    	else

-    		return $param."*=UTF-8''".rawurlencode($value);

+    	if($this->_isascii($value)) {

+    	    		return $param.'="'.$value.'"';

+    	}

+    	if(!$isUTF8) {

+    	    		$value = utf8_encode($value);

+    	}

+    	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false) {

+    	    		return $param.'="'.rawurlencode($value).'"';

+    	} else {

+    	    		return $param."*=UTF-8''".rawurlencode($value);

+    	}

     }

     

     /**

@@ -1842,15 +1926,13 @@ 
     			$c3 = ord($s[$i++]);

     			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));

     			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));

-    		}

-    		elseif($c1>=192)

+    		} elseif($c1>=192)

     		{

     			// 2-byte character

     			$c2 = ord($s[$i++]);

     			$res .= chr(($c1 & 0x1C)>>2);

     			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));

-    		}

-    		else

+    		} else

     		{

     			// Single-byte character

     			$res .= "\0".chr($c1);

@@ -1867,10 +1949,11 @@ 
     protected function _escape(string $s) : string

     {

     	// Escape special characters

-    	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)

-    		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);

-    	else

-    		return $s;

+    	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false) {

+    	    		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);

+    	} else {

+    	    		return $s;

+    	}

     }

     

     /**

@@ -1881,8 +1964,9 @@ 
     protected function _textstring(string $s) : string

     {

     	// Format a text string

-    	if(!$this->_isascii($s))

-    		$s = $this->_UTF8toUTF16($s);

+    	if(!$this->_isascii($s)) {

+    	    		$s = $this->_UTF8toUTF16($s);

+    	}

     	return '('.$this->_escape($s).')';

     }

     

@@ -1911,16 +1995,19 @@ 
     {

     	// Extract info from a JPEG file

     	$a = getimagesize($file);

-    	if(!$a)

-    		$this->Error('Missing or incorrect image file: '.$file);

-    	if($a[2]!=2)

-    		$this->Error('Not a JPEG file: '.$file);

-    	if(!isset($a['channels']) || $a['channels']==3)

-    		$colspace = 'DeviceRGB';

-    	elseif($a['channels']==4)

-    		$colspace = 'DeviceCMYK';

-    	else

-    		$colspace = 'DeviceGray';

+    	if(!$a) {

+    	    		$this->Error('Missing or incorrect image file: '.$file);

+    	}

+    	if($a[2]!=2) {

+    	    		$this->Error('Not a JPEG file: '.$file);

+    	}

+    	if(!isset($a['channels']) || $a['channels']==3) {

+    	    		$colspace = 'DeviceRGB';

+    	} elseif($a['channels']==4) {

+    	    		$colspace = 'DeviceCMYK';

+    	} else {

+    	    		$colspace = 'DeviceGray';

+    	}

     	$bpc = isset($a['bits']) ? $a['bits'] : 8;

     	$data = file_get_contents($file);

     	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);

@@ -1952,34 +2039,41 @@ 
     protected function _parsepngstream($f, string $file) : array

     {

     	// Check signature

-    	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

-    		$this->Error('Not a PNG file: '.$file);

+    	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {

+    	    		$this->Error('Not a PNG file: '.$file);

+    	}

     

     	// Read header chunk

     	$this->_readstream($f,4);

-    	if($this->_readstream($f,4)!='IHDR')

-    		$this->Error('Incorrect PNG file: '.$file);

+    	if($this->_readstream($f,4)!='IHDR') {

+    	    		$this->Error('Incorrect PNG file: '.$file);

+    	}

     	$w = $this->_readint($f);

     	$h = $this->_readint($f);

     	$bpc = ord($this->_readstream($f,1));

-    	if($bpc>8)

-    		$this->Error('16-bit depth not supported: '.$file);

+    	if($bpc>8) {

+    	    		$this->Error('16-bit depth not supported: '.$file);

+    	}

     	$ct = ord($this->_readstream($f,1));

     	$colspace = '';

-    	if($ct==0 || $ct==4)

-    		$colspace = 'DeviceGray';

-    	elseif($ct==2 || $ct==6)

-    		$colspace = 'DeviceRGB';

-    	elseif($ct==3)

-    		$colspace = 'Indexed';

-    	else

-    		$this->Error('Unknown color type: '.$file);

-    	if(ord($this->_readstream($f,1))!=0)

-    		$this->Error('Unknown compression method: '.$file);

-    	if(ord($this->_readstream($f,1))!=0)

-    		$this->Error('Unknown filter method: '.$file);

-    	if(ord($this->_readstream($f,1))!=0)

-    		$this->Error('Interlacing not supported: '.$file);

+    	if($ct==0 || $ct==4) {

+    	    		$colspace = 'DeviceGray';

+    	} elseif($ct==2 || $ct==6) {

+    	    		$colspace = 'DeviceRGB';

+    	} elseif($ct==3) {

+    	    		$colspace = 'Indexed';

+    	} else {

+    	    		$this->Error('Unknown color type: '.$file);

+    	}

+    	if(ord($this->_readstream($f,1))!=0) {

+    	    		$this->Error('Unknown compression method: '.$file);

+    	}

+    	if(ord($this->_readstream($f,1))!=0) {

+    	    		$this->Error('Unknown filter method: '.$file);

+    	}

+    	if(ord($this->_readstream($f,1))!=0) {

+    	    		$this->Error('Interlacing not supported: '.$file);

+    	}

     	$this->_readstream($f,4);

     	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;

     

@@ -1996,44 +2090,45 @@ 
     			// Read palette

     			$pal = $this->_readstream($f,$n);

     			$this->_readstream($f,4);

-    		}

-    		elseif($type=='tRNS')

+    		} elseif($type=='tRNS')

     		{

     			// Read transparency info

     			$t = $this->_readstream($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)));

-    			else

+    			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)));

+    			} else

     			{

     				$pos = strpos($t,chr(0));

-    				if($pos!==false)

-    					$trns = array($pos);

+    				if($pos!==false) {

+    				    					$trns = array($pos);

+    				}

     			}

     			$this->_readstream($f,4);

-    		}

-    		elseif($type=='IDAT')

+    		} elseif($type=='IDAT')

     		{

     			// Read image data block

     			$data .= $this->_readstream($f,$n);

     			$this->_readstream($f,4);

+    		} elseif($type=='IEND') {

+    		    			break;

+    		} else {

+    		    			$this->_readstream($f,$n+4);

     		}

-    		elseif($type=='IEND')

-    			break;

-    		else

-    			$this->_readstream($f,$n+4);

     	}

     	while($n);

     

-    	if($colspace=='Indexed' && empty($pal))

-    		$this->Error('Missing palette in '.$file);

+    	if($colspace=='Indexed' && empty($pal)) {

+    	    		$this->Error('Missing palette in '.$file);

+    	}

     	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);

     	if($ct>=4)

     	{

     		// Extract alpha channel

-    		if(!function_exists('gzuncompress'))

-    			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);

+    		if(!function_exists('gzuncompress')) {

+    		    			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);

+    		}

     		$data = gzuncompress($data);

     		$color = '';

     		$alpha = '';

@@ -2050,8 +2145,7 @@ 
     				$color .= preg_replace('/(.)./s','$1',$line);

     				$alpha .= preg_replace('/.(.)/s','$1',$line);

     			}

-    		}

-    		else

+    		} else

     		{

     			// RGB image

     			$len = 4*$w;

@@ -2069,8 +2163,9 @@ 
     		$data = gzcompress($color);

     		$info['smask'] = gzcompress($alpha);

     		$this->WithAlpha = true;

-    		if($this->PDFVersion<'1.4')

-    			$this->PDFVersion = '1.4';

+    		if($this->PDFVersion<'1.4') {

+    		    			$this->PDFVersion = '1.4';

+    		}

     	}

     	$info['data'] = $data;

     	return $info;

@@ -2089,13 +2184,15 @@ 
     	while($n>0 && !feof($f))

     	{

     		$s = fread($f,$n);

-    		if($s===false)

-    			$this->Error('Error while reading stream');

+    		if($s===false) {

+    		    			$this->Error('Error while reading stream');

+    		}

     		$n -= strlen($s);

     		$res .= $s;

     	}

-    	if($n>0)

-    		$this->Error('Unexpected end of stream');

+    	if($n>0) {

+    	    		$this->Error('Unexpected end of stream');

+    	}

     	return $res;

     }

     

@@ -2152,14 +2249,15 @@ 
     protected function _out(string $s) : void

     {

     	// Add a line to the document

-    	if($this->state==2)

-    		$this->pages[$this->page] .= $s."\n";

-    	elseif($this->state==1)

-    		$this->_put($s);

-    	elseif($this->state==0)

-    		$this->Error('No page has been added yet');

-    	elseif($this->state==3)

-    		$this->Error('The document is closed');

+    	if($this->state==2) {

+    	    		$this->pages[$this->page] .= $s."\n";

+    	} elseif($this->state==1) {

+    	    		$this->_put($s);

+    	} elseif($this->state==0) {

+    	    		$this->Error('No page has been added yet');

+    	} elseif($this->state==3) {

+    	    		$this->Error('The document is closed');

+    	}

     }

     

     /**

@@ -2187,8 +2285,9 @@ 
     protected function _newobj(?int $n=null) : void

     {

     	// Begin a new object

-    	if($n===null)

-    		$n = ++$this->n;

+    	if($n===null) {

+    	    		$n = ++$this->n;

+    	}

     	$this->offsets[$n] = $this->_getoffset();

     	$this->_put($n.' 0 obj');

     }

@@ -2214,9 +2313,9 @@ 
     	{

     		$entries = '/Filter /FlateDecode ';

     		$data = gzcompress($data);

+    	} else {

+    	    		$entries = '';

     	}

-    	else

-    		$entries = '';

     	$entries .= '/Length '.strlen($data);

     	$this->_newobj();

     	$this->_put('<<'.$entries.'>>');

@@ -2233,10 +2332,12 @@ 
     	$this->_newobj();

     	$this->_put('<</Type /Page');

     	$this->_put('/Parent 1 0 R');

-    	if(isset($this->PageInfo[$n]['size']))

-    		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));

-    	if(isset($this->PageInfo[$n]['rotation']))

-    		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);

+    	if(isset($this->PageInfo[$n]['size'])) {

+    	    		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));

+    	}

+    	if(isset($this->PageInfo[$n]['rotation'])) {

+    	    		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);

+    	}

     	$this->_put('/Resources 2 0 R');

     	if(isset($this->PageLinks[$n]))

     	{

@@ -2246,27 +2347,30 @@ 
     		{

     			$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->_textstring($pl[4]).'>>>>';

-    			else

+    			if(is_string($pl[4])) {

+    			    				$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

+    			} else

     			{

     				$l = $this->links[$pl[4]];

-    				if(isset($this->PageInfo[$l[0]]['size']))

-    					$h = $this->PageInfo[$l[0]]['size'][1];

-    				else

-    					$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;

+    				if(isset($this->PageInfo[$l[0]]['size'])) {

+    				    					$h = $this->PageInfo[$l[0]]['size'][1];

+    				} else {

+    				    					$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;

+    				}

     				$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);

     			}

     		}

     		$this->_put($annots.']');

     	}

-    	if($this->WithAlpha)

-    		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');

+    	if($this->WithAlpha) {

+    	    		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');

+    	}

     	$this->_put('/Contents '.($this->n+1).' 0 R>>');

     	$this->_put('endobj');

     	// Page content

-    	if(!empty($this->AliasNbPages))

-    		$this->pages[$n] = str_replace($this->AliasNbPages, strval($this->page), $this->pages[$n]);

+    	if(!empty($this->AliasNbPages)) {

+    	    		$this->pages[$n] = str_replace($this->AliasNbPages, strval($this->page), $this->pages[$n]);

+    	}

     	$this->_putstreamobject($this->pages[$n]);

     }

     

@@ -2276,24 +2380,26 @@ 
     protected function _putpages() : void

     {

     	$nb = $this->page;

-    	for($n=1;$n<=$nb;$n++)

-    		$this->PageInfo[$n]['n'] = $this->n+1+2*($n-1);

-    	for($n=1;$n<=$nb;$n++)

-    		$this->_putpage($n);

+    	for($n=1;$n<=$nb;$n++) {

+    	    		$this->PageInfo[$n]['n'] = $this->n+1+2*($n-1);

+    	}

+    	for($n=1;$n<=$nb;$n++) {

+    	    		$this->_putpage($n);

+    	}

     	// Pages root

     	$this->_newobj(1);

     	$this->_put('<</Type /Pages');

     	$kids = '/Kids [';

-    	for($n=1;$n<=$nb;$n++)

-    		$kids .= $this->PageInfo[$n]['n'].' 0 R ';

+    	for($n=1;$n<=$nb;$n++) {

+    	    		$kids .= $this->PageInfo[$n]['n'].' 0 R ';

+    	}

     	$this->_put($kids.']');

     	$this->_put('/Count '.$nb);

     	if($this->DefOrientation=='P')

     	{

     		$w = $this->DefPageSize[0];

     		$h = $this->DefPageSize[1];

-    	}

-    	else

+    	} else

     	{

     		$w = $this->DefPageSize[1];

     		$h = $this->DefPageSize[0];

@@ -2443,8 +2549,7 @@ 
     		{

     			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);

     			$nbr++;

-    		}

-    		else

+    		} else

     		{

     			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);

     			$nbc++;