Changeset 693 for trunk/phpbms/fpdf/fpdf.php

Timestamp:

12/31/09 13:36:45 (2 years ago)

Author:

brieb

Message:

• Introduced administratively changeable settings to indvidual reports
• Modified all reports to work with new settings system
• Altered invoice and line item total reports to accept parameters from reportsettings: You can now bypass the grouping/column dialog by providing the infrmation administratively
• Altered all sales order PDF reports to accept parameters from reportsettings: You can now administratively change certain aspects of the print outs, including what parts of the top of the report to show, and what to title the report
• Altered label reports to accept parameters from reportsettings: printed data as well

as label measurements and layout are now defined by administratively

• Altered export and tableprint reports to accept parameters from reportsettings: You can specify individual columns and from table instead of just the defaults (all fields, main table only)
• Added var_dump-esque 'debug' function for development purposes to common functions
• Integrated FPDI functionality with sales order PDF reports: It is now possible to use a PDF saved in the files table as a background template for your invoices (e.g. watermarks)

Files:

• trunk/phpbms/fpdf/fpdf.php (modified) (63 diffs)

trunk/phpbms/fpdf/fpdf.php

@@ -1 +1 @@
 <?php
 /*******************************************************************************
-* Software: FPDF                                                               *
-* Version:  1.53                                                               *
-* Date:     2004-12-31                                                         *
-* Author:   Olivier PLATHEY                                                    *
-* License:  Freeware                                                           *
+* FPDF                                                                         *
 *                                                                              *
-* You may use and modify this software as you wish.                            *
+* Version: 1.6                                                                 *
+* Date:    2008-08-03                                                          *
+* Author:  Olivier PLATHEY                                                     *
 *******************************************************************************/
 
-if(!class_exists('FPDF'))
-{
-define('FPDF_VERSION','1.53');
+define('FPDF_VERSION','1.6');
 
 class FPDF
 {
-//Private properties
 var $page;               //current page number
 var $n;                  //current object number
@@ -24 +19 @@
 var $state;              //current document state
 var $compress;           //compression flag
+var $k;                  //scale factor (number of points in user unit)
 var $DefOrientation;     //default orientation
 var $CurOrientation;     //current orientation
-var $OrientationChanges; //array indicating orientation changes
-var $k;                  //scale factor (number of points in user unit)
-var $fwPt,$fhPt;         //dimensions of page format in points
-var $fw,$fh;             //dimensions of page format in user unit
-var $wPt,$hPt;           //current dimensions of page in points
-var $w,$h;               //current dimensions of page in user unit
+var $PageFormats;        //available page formats
+var $DefPageFormat;      //default page format
+var $CurPageFormat;      //current page format
+var $PageSizes;          //array storing non-default page sizes
+var $wPt,$hPt;           //dimensions of current page in points
+var $w,$h;               //dimensions of current page in user unit
 var $lMargin;            //left margin
 var $tMargin;            //top margin
@@ -37 +33 @@
 var $bMargin;            //page break margin
 var $cMargin;            //cell margin
-var $x,$y;               //current position in user unit for cell positioning
-var $lasth;              //height of last cell printed
+var $x,$y;               //current position in user unit
+var $lasth;              //height of last printed cell
 var $LineWidth;          //line width in user unit
 var $CoreFonts;          //array of standard font names
@@ -44 +40 @@
 var $FontFiles;          //array of font files
 var $diffs;              //array of encoding differences
-var $images;             //array of used images
-var $PageLinks;          //array of links in pages
-var $links;              //array of internal links
 var $FontFamily;         //current font family
 var $FontStyle;          //current font style
@@ -58 +51 @@
 var $ColorFlag;          //indicates whether fill and text colors are different
 var $ws;                 //word spacing
+var $images;             //array of used images
+var $PageLinks;          //array of links in pages
+var $links;              //array of internal links
 var $AutoPageBreak;      //automatic page breaking
 var $PageBreakTrigger;   //threshold used to trigger page breaks
+var $InHeader;           //flag set when processing header
 var $InFooter;           //flag set when processing footer
 var $ZoomMode;           //zoom display mode
@@ -76 +73 @@
 *                                                                              *
 *******************************************************************************/
-function FPDF($orientation='P',$unit='mm',$format='A4')
+function FPDF($orientation='P', $unit='mm', $format='A4')
 {
         //Some checks
@@ -85 +82 @@
         $this->buffer='';
         $this->pages=array();
-        $this->OrientationChanges=array();
+        $this->PageSizes=array();
         $this->state=0;
         $this->fonts=array();
@@ -92 +89 @@
         $this->images=array();
         $this->links=array();
+        $this->InHeader=false;
         $this->InFooter=false;
         $this->lasth=0;
@@ -104 +102 @@
         $this->ws=0;
         //Standard fonts
-        $this->CoreFonts=array('courier'=>'Courier','courierB'=>'Courier-Bold','courierI'=>'Courier-Oblique','courierBI'=>'Courier-BoldOblique',
-                'helvetica'=>'Helvetica','helveticaB'=>'Helvetica-Bold','helveticaI'=>'Helvetica-Oblique','helveticaBI'=>'Helvetica-BoldOblique',
-                'times'=>'Times-Roman','timesB'=>'Times-Bold','timesI'=>'Times-Italic','timesBI'=>'Times-BoldItalic',
-                'symbol'=>'Symbol','zapfdingbats'=>'ZapfDingbats');
+        $this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
+                'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',
+                'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
+                'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
         //Scale factor
         if($unit=='pt')
@@ -120 +118 @@
                 $this->Error('Incorrect unit: '.$unit);
         //Page format
+        $this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
+                'letter'=>array(612,792), 'legal'=>array(612,1008));
         if(is_string($format))
-        {
-                $format=strtolower($format);
-                if($format=='a3')
-                        $format=array(841.89,1190.55);
-                elseif($format=='a4')
-                        $format=array(595.28,841.89);
-                elseif($format=='a5')
-                        $format=array(420.94,595.28);
-                elseif($format=='letter')
-                        $format=array(612,792);
-                elseif($format=='legal')
-                        $format=array(612,1008);
-                else
-                        $this->Error('Unknown page format: '.$format);
-                $this->fwPt=$format[0];
-                $this->fhPt=$format[1];
-        }
-        else
-        {
-                $this->fwPt=$format[0]*$this->k;
-                $this->fhPt=$format[1]*$this->k;
-        }
-        $this->fw=$this->fwPt/$this->k;
-        $this->fh=$this->fhPt/$this->k;
+                $format=$this->_getpageformat($format);
+        $this->DefPageFormat=$format;
+        $this->CurPageFormat=$format;
         //Page orientation
         $orientation=strtolower($orientation);
@@ -150 +129 @@
         {
                 $this->DefOrientation='P';
-                $this->wPt=$this->fwPt;
-                $this->hPt=$this->fhPt;
+                $this->w=$this->DefPageFormat[0];
+                $this->h=$this->DefPageFormat[1];
         }
         elseif($orientation=='l' || $orientation=='landscape')
         {
                 $this->DefOrientation='L';
-                $this->wPt=$this->fhPt;
-                $this->hPt=$this->fwPt;
+                $this->w=$this->DefPageFormat[1];
+                $this->h=$this->DefPageFormat[0];
         }
         else
                 $this->Error('Incorrect orientation: '.$orientation);
         $this->CurOrientation=$this->DefOrientation;
-        $this->w=$this->wPt/$this->k;
-        $this->h=$this->hPt/$this->k;
+        $this->wPt=$this->w*$this->k;
+        $this->hPt=$this->h*$this->k;
         //Page margins (1 cm)
         $margin=28.35/$this->k;
@@ -181 +160 @@
 }
 
-function SetMargins($left,$top,$right=-1)
+function SetMargins($left, $top, $right=null)
 {
         //Set left, top and right margins
         $this->lMargin=$left;
         $this->tMargin=$top;
-        if($right==-1)
+        if($right===null)
                 $right=$left;
         $this->rMargin=$right;
@@ -211 +190 @@
 }
 
-function SetAutoPageBreak($auto,$margin=0)
+function SetAutoPageBreak($auto, $margin=0)
 {
         //Set auto page break mode and triggering margin
@@ -219 +198 @@
 }
 
-function SetDisplayMode($zoom,$layout='continuous')
+function SetDisplayMode($zoom, $layout='continuous')
 {
         //Set display mode in viewer
@@ -241 +220 @@
 }
 
-function SetTitle($title)
+function SetTitle($title, $isUTF8=false)
 {
         //Title of document
+        if($isUTF8)
+                $title=$this->_UTF8toUTF16($title);
         $this->title=$title;
 }
 
-function SetSubject($subject)
+function SetSubject($subject, $isUTF8=false)
 {
         //Subject of document
+        if($isUTF8)
+                $subject=$this->_UTF8toUTF16($subject);
         $this->subject=$subject;
 }
 
-function SetAuthor($author)
+function SetAuthor($author, $isUTF8=false)
 {
         //Author of document
+        if($isUTF8)
+                $author=$this->_UTF8toUTF16($author);
         $this->author=$author;
 }
 
-function SetKeywords($keywords)
+function SetKeywords($keywords, $isUTF8=false)
 {
         //Keywords of document
+        if($isUTF8)
+                $keywords=$this->_UTF8toUTF16($keywords);
         $this->keywords=$keywords;
 }
 
-function SetCreator($creator)
+function SetCreator($creator, $isUTF8=false)
 {
         //Creator of document
+        if($isUTF8)
+                $creator=$this->_UTF8toUTF16($creator);
         $this->creator=$creator;
 }
@@ -280 +269 @@
 {
         //Fatal error
-        die('<B>FPDF error: </B>'.$msg);
+        die('<b>FPDF error:</b> '.$msg);
 }
 
@@ -306 +295 @@
 }
 
-function AddPage($orientation='')
+function AddPage($orientation='', $format='')
 {
         //Start a new page
@@ -329 +318 @@
         }
         //Start new page
-        $this->_beginpage($orientation);
+        $this->_beginpage($orientation,$format);
         //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->_out(sprintf('%.2F w',$lw*$this->k));
         //Set font
         if($family)
@@ -348 +337 @@
         $this->ColorFlag=$cf;
         //Page header
+        $this->InHeader=true;
         $this->Header();
+        $this->InHeader=false;
         //Restore line width
         if($this->LineWidth!=$lw)
         {
                 $this->LineWidth=$lw;
-                $this->_out(sprintf('%.2f w',$lw*$this->k));
+                $this->_out(sprintf('%.2F w',$lw*$this->k));
         }
         //Restore font
@@ -389 +380 @@
 }
 
-function SetDrawColor($r,$g=-1,$b=-1)
+function SetDrawColor($r, $g=null, $b=null)
 {
         //Set color for all stroking operations
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->DrawColor=sprintf('%.3f G',$r/255);
-        else
-                $this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->DrawColor=sprintf('%.3F G',$r/255);
+        else
+                $this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
         if($this->page>0)
                 $this->_out($this->DrawColor);
 }
 
-function SetFillColor($r,$g=-1,$b=-1)
+function SetFillColor($r, $g=null, $b=null)
 {
         //Set color for all filling operations
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->FillColor=sprintf('%.3f g',$r/255);
-        else
-                $this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->FillColor=sprintf('%.3F g',$r/255);
+        else
+                $this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
         $this->ColorFlag=($this->FillColor!=$this->TextColor);
         if($this->page>0)
@@ -412 +403 @@
 }
 
-function SetTextColor($r,$g=-1,$b=-1)
+function SetTextColor($r, $g=null, $b=null)
 {
         //Set color for text
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->TextColor=sprintf('%.3f g',$r/255);
-        else
-                $this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->TextColor=sprintf('%.3F g',$r/255);
+        else
+                $this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
         $this->ColorFlag=($this->FillColor!=$this->TextColor);
 }
@@ -430 +421 @@
         $l=strlen($s);
         for($i=0;$i<$l;$i++)
-                $w+=$cw[$s{$i}];
+                $w+=$cw[$s[$i]];
         return $w*$this->FontSize/1000;
 }
@@ -439 +430 @@
         $this->LineWidth=$width;
         if($this->page>0)
-                $this->_out(sprintf('%.2f w',$width*$this->k));
-}
-
-function Line($x1,$y1,$x2,$y2)
+                $this->_out(sprintf('%.2F w',$width*$this->k));
+}
+
+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));
-}
-
-function Rect($x,$y,$w,$h,$style='')
+        $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));
+}
+
+function Rect($x, $y, $w, $h, $style='')
 {
         //Draw a rectangle
@@ -457 +448 @@
         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));
-}
-
-function AddFont($family,$style='',$file='')
+        $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+}
+
+function AddFont($family, $style='', $file='')
 {
         //Add a TrueType or Type1 font
@@ -473 +464 @@
         $fontkey=$family.$style;
         if(isset($this->fonts[$fontkey]))
-                $this->Error('Font already added: '.$family.' '.$style);
+                return;
         include($this->_getfontpath().$file);
         if(!isset($name))
                 $this->Error('Could not include font definition file');
         $i=count($this->fonts)+1;
-        $this->fonts[$fontkey]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file);
+        $this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
         if($diff)
         {
@@ -504 +495 @@
                         $this->FontFiles[$file]=array('length1'=>$originalsize);
                 else
-                        $this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
-        }
-}
-
-function SetFont($family,$style='',$size=0)
+                        $this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+        }
+}
+
+function SetFont($family, $style='', $size=0)
 {
         //Select a font; size given in points
@@ -553 +544 @@
                         }
                         $i=count($this->fonts)+1;
-                        $this->fonts[$fontkey]=array('i'=>$i,'type'=>'core','name'=>$this->CoreFonts[$fontkey],'up'=>-100,'ut'=>50,'cw'=>$fpdf_charwidths[$fontkey]);
+                        $name=$this->CoreFonts[$fontkey];
+                        $cw=$fpdf_charwidths[$fontkey];
+                        $this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
                 }
                 else
@@ -565 +558 @@
         $this->CurrentFont=&$this->fonts[$fontkey];
         if($this->page>0)
-                $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+                $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
@@ -576 +569 @@
         $this->FontSize=$size/$this->k;
         if($this->page>0)
-                $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+                $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
@@ -583 +576 @@
         //Create a new internal link
         $n=count($this->links)+1;
-        $this->links[$n]=array(0,0);
+        $this->links[$n]=array(0, 0);
         return $n;
 }
 
-function SetLink($link,$y=0,$page=-1)
+function SetLink($link, $y=0, $page=-1)
 {
         //Set destination of internal link
@@ -594 +587 @@
         if($page==-1)
                 $page=$this->page;
-        $this->links[$link]=array($page,$y);
-}
-
-function Link($x,$y,$w,$h,$link)
+        $this->links[$link]=array($page, $y);
+}
+
+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);
-}
-
-function Text($x,$y,$txt)
+        $this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+}
+
+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->_escape($txt));
+        $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);
@@ -620 +613 @@
 }
 
-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=false, $link='')
 {
         //Output a cell
         $k=$this->k;
-        if($this->y+$h>$this->PageBreakTrigger && !$this->InFooter && $this->AcceptPageBreak())
+        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
         {
                 //Automatic page break
@@ -634 +627 @@
                         $this->_out('0 Tw');
                 }
-                $this->AddPage($this->CurOrientation);
+                $this->AddPage($this->CurOrientation,$this->CurPageFormat);
                 $this->x=$x;
                 if($ws>0)
                 {
                         $this->ws=$ws;
-                        $this->_out(sprintf('%.3f Tw',$ws*$k));
+                        $this->_out(sprintf('%.3F Tw',$ws*$k));
                 }
         }
@@ -645 +638 @@
                 $w=$this->w-$this->rMargin-$this->x;
         $s='';
-        if($fill==1 || $border==1)
-        {
-                if($fill==1)
+        if($fill || $border==1)
+        {
+                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);
+                $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))
@@ -658 +651 @@
                 $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);
+                        $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);
+                        $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);
+                        $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);
+                        $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!=='')
@@ -677 +670 @@
                         $s.='q '.$this->TextColor.' ';
                 $txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
-                $s.=sprintf('BT %.2f %.2f Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
+                $s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
                 if($this->underline)
                         $s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
@@ -699 +692 @@
 }
 
-function MultiCell($w,$h,$txt,$border="0",$align='J',$fill=0)
+function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
         //Output text with automatic or explicit line breaks
@@ -738 +731 @@
         {
                 //Get next character
-                $c=$s{$i};
+                $c=$s[$i];
                 if($c=="\n")
                 {
@@ -784 +777 @@
                                 {
                                         $this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-                                        $this->_out(sprintf('%.3f Tw',$this->ws*$this->k));
+                                        $this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
                                 }
                                 $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
@@ -812 +805 @@
 }
 
-function Write($h,$txt,$link='')
+function Write($h, $txt, $link='')
 {
         //Output text in flowing mode
@@ -828 +821 @@
         {
                 //Get next character
-                $c=$s{$i};
+                $c=$s[$i];
                 if($c=="\n")
                 {
@@ -893 +886 @@
 }
 
-function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
+function Ln($h=null)
+{
+        //Line feed; default value is last cell height
+        $this->x=$this->lMargin;
+        if($h===null)
+                $this->y+=$this->lasth;
+        else
+                $this->y+=$h;
+}
+
+function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
         //Put an image on the page
         if(!isset($this->images[$file]))
         {
-                //First use of image, get info
+                //First use of this image, get info
                 if($type=='')
                 {
@@ -907 +910 @@
                 }
                 $type=strtolower($type);
-                $mqr=get_magic_quotes_runtime();
-                set_magic_quotes_runtime(0);
-                if($type=='jpg' || $type=='jpeg')
-                        $info=$this->_parsejpg($file);
-                elseif($type=='png')
-                        $info=$this->_parsepng($file);
-                else
-                {
-                        //Allow for additional formats
-                        $mtd='_parse'.$type;
-                        if(!method_exists($this,$mtd))
-                                $this->Error('Unsupported image type: '.$type);
-                        $info=$this->$mtd($file);
-                }
-                set_magic_quotes_runtime($mqr);
+                if($type=='jpeg')
+                        $type='jpg';
+                $mtd='_parse'.$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;
@@ -934 +928 @@
                 $h=$info['h']/$this->k;
         }
-        if($w==0)
+        elseif($w==0)
                 $w=$h*$info['w']/$info['h'];
-        if($h==0)
+        elseif($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']));
+        //Flowing mode
+        if($y===null)
+        {
+                if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+                {
+                        //Automatic page break
+                        $x2=$this->x;
+                        $this->AddPage($this->CurOrientation,$this->CurPageFormat);
+                        $this->x=$x2;
+                }
+                $y=$this->y;
+                $this->y+=$h;
+        }
+        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);
-}
-
-function Ln($h='')
-{
-        //Line feed; default value is last cell height
-        $this->x=$this->lMargin;
-        if(is_string($h))
-                $this->y+=$this->lasth;
-        else
-                $this->y+=$h;
 }
 
@@ -984 +983 @@
 }
 
-function SetXY($x,$y)
+function SetXY($x, $y)
 {
         //Set x and y positions
@@ -991 +990 @@
 }
 
-function Output($name='',$dest='')
+function Output($name='', $dest='')
 {
         //Output PDF to some destination
-        //Finish document if necessary
         if($this->state<3)
                 $this->Close();
-        //Normalize parameters
-        if(is_bool($dest))
-                $dest=$dest ? 'D' : 'F';
         $dest=strtoupper($dest);
         if($dest=='')
@@ -1015 +1010 @@
                 case 'I':
                         //Send to standard output
-                        if(ob_get_contents())
+                        if(ob_get_length())
                                 $this->Error('Some data has already been output, can\'t send PDF file');
                         if(php_sapi_name()!='cli')
@@ -1022 +1017 @@
                                 header('Content-Type: application/pdf');
                                 if(headers_sent())
-                                        $this->Error('Some data has already been output to browser, can\'t send PDF file');
+                                        $this->Error('Some data has already been output, can\'t send PDF file');
                                 header('Content-Length: '.strlen($this->buffer));
-                                header('Content-disposition: inline; filename="'.$name.'"');
+                                header('Content-Disposition: inline; filename="'.$name.'"');
+                                header('Cache-Control: private, max-age=0, must-revalidate');
+                                header('Pragma: public');
+                                ini_set('zlib.output_compression','0');
                         }
                         echo $this->buffer;
@@ -1030 +1028 @@
                 case 'D':
                         //Download file
-                        if(ob_get_contents())
+                        if(ob_get_length())
                                 $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'))
-                                header('Content-Type: application/force-download');
-                        else
-                                header('Content-Type: application/octet-stream');
+                        header('Content-Type: application/x-download');
                         if(headers_sent())
-                                $this->Error('Some data has already been output to browser, can\'t send PDF file');
+                                $this->Error('Some data has already been output, can\'t send PDF file');
                         header('Content-Length: '.strlen($this->buffer));
-                        header('Content-disposition: attachment; filename="'.$name.'"');
+                        header('Content-Disposition: attachment; filename="'.$name.'"');
+                        header('Cache-Control: private, max-age=0, must-revalidate');
+                        header('Pragma: public');
+                        ini_set('zlib.output_compression','0');
                         echo $this->buffer;
                         break;
@@ -1066 +1064 @@
 function _dochecks()
 {
-        //Check for locale-related bug
-        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');
+        //Check availability of %F
+        if(sprintf('%.1F',1.0)!='1.0')
+                $this->Error('This version of PHP is not supported');
+        //Check mbstring overloading
+        if(ini_get('mbstring.func_overload') & 2)
+                $this->Error('mbstring overloading must be disabled');
+        //Disable runtime magic quotes
+        if(get_magic_quotes_runtime())
+                @set_magic_quotes_runtime(0);
+}
+
+function _getpageformat($format)
+{
+        $format=strtolower($format);
+        if(!isset($this->PageFormats[$format]))
+                $this->Error('Unknown page format: '.$format);
+        $a=$this->PageFormats[$format];
+        return array($a[0]/$this->k, $a[1]/$this->k);
 }
 
@@ -1081 +1091 @@
 }
 
+function _beginpage($orientation, $format)
+{
+        $this->page++;
+        $this->pages[$this->page]='';
+        $this->state=2;
+        $this->x=$this->lMargin;
+        $this->y=$this->tMargin;
+        $this->FontFamily='';
+        //Check page size
+        if($orientation=='')
+                $orientation=$this->DefOrientation;
+        else
+                $orientation=strtoupper($orientation[0]);
+        if($format=='')
+                $format=$this->DefPageFormat;
+        else
+        {
+                if(is_string($format))
+                        $format=$this->_getpageformat($format);
+        }
+        if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
+        {
+                //New size
+                if($orientation=='P')
+                {
+                        $this->w=$format[0];
+                        $this->h=$format[1];
+                }
+                else
+                {
+                        $this->w=$format[1];
+                        $this->h=$format[0];
+                }
+                $this->wPt=$this->w*$this->k;
+                $this->hPt=$this->h*$this->k;
+                $this->PageBreakTrigger=$this->h-$this->bMargin;
+                $this->CurOrientation=$orientation;
+                $this->CurPageFormat=$format;
+        }
+        if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
+                $this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
+}
+
+function _endpage()
+{
+        $this->state=1;
+}
+
+function _escape($s)
+{
+        //Escape special characters in strings
+        $s=str_replace('\\','\\\\',$s);
+        $s=str_replace('(','\\(',$s);
+        $s=str_replace(')','\\)',$s);
+        $s=str_replace("\r",'\\r',$s);
+        return $s;
+}
+
+function _textstring($s)
+{
+        //Format a text string
+        return '('.$this->_escape($s).')';
+}
+
+function _UTF8toUTF16($s)
+{
+        //Convert UTF-8 to UTF-16BE with BOM
+        $res="\xFE\xFF";
+        $nb=strlen($s);
+        $i=0;
+        while($i<$nb)
+        {
+                $c1=ord($s[$i++]);
+                if($c1>=224)
+                {
+                        //3-byte character
+                        $c2=ord($s[$i++]);
+                        $c3=ord($s[$i++]);
+                        $res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
+                        $res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+                }
+                elseif($c1>=192)
+                {
+                        //2-byte character
+                        $c2=ord($s[$i++]);
+                        $res.=chr(($c1 & 0x1C)>>2);
+                        $res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+                }
+                else
+                {
+                        //Single-byte character
+                        $res.="\0".chr($c1);
+                }
+        }
+        return $res;
+}
+
+function _dounderline($x, $y, $txt)
+{
+        //Underline text
+        $up=$this->CurrentFont['up'];
+        $ut=$this->CurrentFont['ut'];
+        $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);
+}
+
+function _parsejpg($file)
+{
+        //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';
+        $bpc=isset($a['bits']) ? $a['bits'] : 8;
+        //Read whole file
+        $f=fopen($file,'rb');
+        $data='';
+        while(!feof($f))
+                $data.=fread($f,8192);
+        fclose($f);
+        return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
+}
+
+function _parsepng($file)
+{
+        //Extract info from a PNG file
+        $f=fopen($file,'rb');
+        if(!$f)
+                $this->Error('Can\'t open image file: '.$file);
+        //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);
+        //Read header chunk
+        $this->_readstream($f,4);
+        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);
+        $ct=ord($this->_readstream($f,1));
+        if($ct==0)
+                $colspace='DeviceGray';
+        elseif($ct==2)
+                $colspace='DeviceRGB';
+        elseif($ct==3)
+                $colspace='Indexed';
+        else
+                $this->Error('Alpha channel not supported: '.$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);
+        $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='';
+        do
+        {
+                $n=$this->_readint($f);
+                $type=$this->_readstream($f,4);
+                if($type=='PLTE')
+                {
+                        //Read palette
+                        $pal=$this->_readstream($f,$n);
+                        $this->_readstream($f,4);
+                }
+                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
+                        {
+                                $pos=strpos($t,chr(0));
+                                if($pos!==false)
+                                        $trns=array($pos);
+                        }
+                        $this->_readstream($f,4);
+                }
+                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);
+        }
+        while($n);
+        if($colspace=='Indexed' && empty($pal))
+                $this->Error('Missing palette in '.$file);
+        fclose($f);
+        return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
+}
+
+function _readstream($f, $n)
+{
+        //Read n bytes from stream
+        $res='';
+        while($n>0 && !feof($f))
+        {
+                $s=fread($f,$n);
+                if($s===false)
+                        $this->Error('Error while reading stream');
+                $n-=strlen($s);
+                $res.=$s;
+        }
+        if($n>0)
+                $this->Error('Unexpected end of stream');
+        return $res;
+}
+
+function _readint($f)
+{
+        //Read a 4-byte integer from stream
+        $a=unpack('Ni',$this->_readstream($f,4));
+        return $a['i'];
+}
+
+function _parsegif($file)
+{
+        //Extract info from a GIF file (via PNG conversion)
+        if(!function_exists('imagepng'))
+                $this->Error('GD extension is required for GIF support');
+        if(!function_exists('imagecreatefromgif'))
+                $this->Error('GD has no GIF read support');
+        $im=imagecreatefromgif($file);
+        if(!$im)
+                $this->Error('Missing or incorrect image file: '.$file);
+        imageinterlace($im,0);
+        $tmp=tempnam('.','gif');
+        if(!$tmp)
+                $this->Error('Unable to create a temporary file');
+        if(!imagepng($im,$tmp))
+                $this->Error('Error while saving to temporary file');
+        imagedestroy($im);
+        $info=$this->_parsepng($tmp);
+        unlink($tmp);
+        return $info;
+}
+
+function _newobj()
+{
+        //Begin a new object
+        $this->n++;
+        $this->offsets[$this->n]=strlen($this->buffer);
+        $this->_out($this->n.' 0 obj');
+}
+
+function _putstream($s)
+{
+        $this->_out('stream');
+        $this->_out($s);
+        $this->_out('endstream');
+}
+
+function _out($s)
+{
+        //Add a line to the document
+        if($this->state==2)
+                $this->pages[$this->page].=$s."\n";
+        else
+                $this->buffer.=$s."\n";
+}
+
 function _putpages()
 {
@@ -1092 +1385 @@
         if($this->DefOrientation=='P')
         {
-                $wPt=$this->fwPt;
-                $hPt=$this->fhPt;
-        }
-        else
-        {
-                $wPt=$this->fhPt;
-                $hPt=$this->fwPt;
+                $wPt=$this->DefPageFormat[0]*$this->k;
+                $hPt=$this->DefPageFormat[1]*$this->k;
+        }
+        else
+        {
+                $wPt=$this->DefPageFormat[1]*$this->k;
+                $hPt=$this->DefPageFormat[0]*$this->k;
         }
         $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
@@ -1107 +1400 @@
                 $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->PageSizes[$n]))
+                        $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
                 $this->_out('/Resources 2 0 R');
                 if(isset($this->PageLinks[$n]))
@@ -1116 +1409 @@
                         foreach($this->PageLinks[$n] as $pl)
                         {
-                                $rect=sprintf('%.2f %.2f %.2f %.2f',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+                                $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]))
@@ -1123 +1416 @@
                                 {
                                         $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);
+                                        $h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
+                                        $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
                                 }
                         }
@@ -1147 +1440 @@
         $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');
@@ -1162 +1455 @@
                 $this->_out('endobj');
         }
-        $mqr=get_magic_quotes_runtime();
-        @set_magic_quotes_runtime(0);
         foreach($this->FontFiles as $file=>$info)
         {
@@ -1179 +1470 @@
                 if(!$compressed && isset($info['length2']))
                 {
-                        $header=(ord($font{0})==128);
+                        $header=(ord($font[0])==128);
                         if($header)
                         {
@@ -1185 +1476 @@
                                 $font=substr($font,6);
                         }
-                        if($header && ord($font{$info['length1']})==128)
+                        if($header && ord($font[$info['length1']])==128)
                         {
                                 //Strip second binary header
@@ -1201 +1492 @@
                 $this->_out('endobj');
         }
-        @set_magic_quotes_runtime($mqr);
         foreach($this->fonts as $k=>$font)
         {
@@ -1361 +1651 @@
         if(!empty($this->creator))
                 $this->_out('/Creator '.$this->_textstring($this->creator));
-        $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
+        $this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
 }
 
@@ -1430 +1720 @@
         $this->state=3;
 }
-
-function _beginpage($orientation)
-{
-        $this->page++;
-        $this->pages[$this->page]='';
-        $this->state=2;
-        $this->x=$this->lMargin;
-        $this->y=$this->tMargin;
-        $this->FontFamily='';
-        //Page orientation
-        if(!$orientation)
-                $orientation=$this->DefOrientation;
-        else
-        {
-                $orientation=strtoupper($orientation{0});
-                if($orientation!=$this->DefOrientation)
-                        $this->OrientationChanges[$this->page]=true;
-        }
-        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;
-                }
-                else
-                {
-                        $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;
-        }
-}
-
-function _endpage()
-{
-        //End of page contents
-        $this->state=1;
-}
-
-function _newobj()
-{
-        //Begin a new object
-        $this->n++;
-        $this->offsets[$this->n]=strlen($this->buffer);
-        $this->_out($this->n.' 0 obj');
-}
-
-function _dounderline($x,$y,$txt)
-{
-        //Underline text
-        $up=$this->CurrentFont['up'];
-        $ut=$this->CurrentFont['ut'];
-        $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);
-}
-
-function _parsejpg($file)
-{
-        //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';
-        $bpc=isset($a['bits']) ? $a['bits'] : 8;
-        //Read whole file
-        $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);
-}
-
-function _parsepng($file)
-{
-        //Extract info from a PNG file
-        $f=fopen($file,'rb');
-        if(!$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))
-                $this->Error('Not a PNG file: '.$file);
-        //Read header chunk
-        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)
-                $this->Error('16-bit depth not supported: '.$file);
-        $ct=ord(fread($f,1));
-        if($ct==0)
-                $colspace='DeviceGray';
-        elseif($ct==2)
-                $colspace='DeviceRGB';
-        elseif($ct==3)
-                $colspace='Indexed';
-        else
-                $this->Error('Alpha channel not supported: '.$file);
-        if(ord(fread($f,1))!=0)
-                $this->Error('Unknown compression method: '.$file);
-        if(ord(fread($f,1))!=0)
-                $this->Error('Unknown filter method: '.$file);
-        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.'>>';
-        //Scan chunks looking for palette, transparency and image data
-        $pal='';
-        $trns='';
-        $data='';
-        do
-        {
-                $n=$this->_freadint($f);
-                $type=fread($f,4);
-                if($type=='PLTE')
-                {
-                        //Read palette
-                        $pal=fread($f,$n);
-                        fread($f,4);
-                }
-                elseif($type=='tRNS')
-                {
-                        //Read transparency info
-                        $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)));
-                        else
-                        {
-                                $pos=strpos($t,chr(0));
-                                if($pos!==false)
-                                        $trns=array($pos);
-                        }
-                        fread($f,4);
-                }
-                elseif($type=='IDAT')
-                {
-                        //Read image data block
-                        $data.=fread($f,$n);
-                        fread($f,4);
-                }
-                elseif($type=='IEND')
-                        break;
-                else
-                        fread($f,$n+4);
-        }
-        while($n);
-        if($colspace=='Indexed' && empty($pal))
-                $this->Error('Missing palette in '.$file);
-        fclose($f);
-        return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data);
-}
-
-function _freadint($f)
-{
-        //Read a 4-byte integer from file
-        $a=unpack('Ni',fread($f,4));
-        return $a['i'];
-}
-
-function _textstring($s)
-{
-        //Format a text string
-        return '('.$this->_escape($s).')';
-}
-
-function _escape($s)
-{
-        //Add \ before \, ( and )
-        return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s)));
-}
-
-function _putstream($s)
-{
-        $this->_out('stream');
-        $this->_out($s);
-        $this->_out('endstream');
-}
-
-function _out($s)
-{
-        //Add a line to the document
-        if($this->state==2)
-                $this->pages[$this->page].=$s."\n";
-        else
-                $this->buffer.=$s."\n";
-}
 //End of class
 }
@@ -1644 +1730 @@
 }
 
-}
 ?>