Changeset 19716

Timestamp:

2010/12/11 12:15:20 (13 years ago)

Author:

Seasoft

Message:

#403(インクルードしているライブラリ群をバージョンアップする)

• FPDF関連 (PHP4について、動作環境無く未確認)

Location:

branches/version-2_5-dev/data

Files:

• class/SC_Fpdf.php (modified) (1 diff)
• module/fpdf (added)
• module/fpdf/filters (added)
• module/fpdf/filters/FilterASCII85.php (added)
• module/fpdf/filters/FilterASCII85_FPDI.php (added)
• module/fpdf/filters/FilterLZW.php (added)
• module/fpdf/filters/FilterLZW_FPDI.php (added)
• module/fpdf/font (moved) (moved from branches/version-2_5-dev/data/pdf/font)
• module/fpdf/fpdf.php (moved) (moved from branches/version-2_5-dev/data/pdf/fpdf.php) (63 diffs)
• module/fpdf/fpdf_tpl.php (moved) (moved from branches/version-2_5-dev/data/pdf/fpdf_tpl.php) (24 diffs)
• module/fpdf/fpdi.php (moved) (moved from branches/version-2_5-dev/data/pdf/fpdi.php) (22 diffs)
• module/fpdf/fpdi2tcpdf_bridge.php (added)
• module/fpdf/fpdi_pdf_parser.php (moved) (moved from branches/version-2_5-dev/data/pdf/fpdi_pdf_parser.php) (14 diffs)
• module/fpdf/japanese.php (moved) (moved from branches/version-2_5-dev/data/pdf/japanese.php)
• module/fpdf/pdf_context.php (moved) (moved from branches/version-2_5-dev/data/pdf/pdf_context.php) (2 diffs)
• module/fpdf/pdf_parser.php (moved) (moved from branches/version-2_5-dev/data/pdf/pdf_parser.php) (2 diffs)
• pdf/decoders (deleted)
• pdf/wrapper_functions.php (deleted)

branches/version-2_5-dev/data/class/SC_Fpdf.php

@@ -28 +28 @@
  */
 
-require(DATA_PATH . 'pdf/japanese.php');
+require(DATA_PATH . 'module/fpdf/fpdf.php');
+require(DATA_PATH . 'module/fpdf/japanese.php');
 define('PDF_TEMPLATE_DIR', DATA_PATH . 'pdf/');
 

branches/version-2_5-dev/data/module/fpdf/fpdf.php

@@ -1 +1 @@
 <?php
 /*******************************************************************************
-* Software: FPDF                                                               *
-* Version:  1.53                                                               *
-* Date:     2004-12-31                                                         *
-* Author:   Olivier PLATHEY                                                    *
-* License:  Freeware                                                           *
+* FPDF                                                                         *
 *                                                                              *
-* You may use, modify and redistribute 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, $ln = 2)
+function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
     //Output text with automatic or explicit line breaks
@@ -735 +728 @@
     $ns=0;
     $nl=1;
-    $this->rise_h = 0; //‚‚³ŒvŽZ—p
-    
     while($i<$nb)
     {
         //Get next character
-        $c=$s{$i};
+        $c=$s[$i];
         if($c=="\n")
         {
@@ -756 +747 @@
             $ns=0;
             $nl++;
-            $this->rise_h += $h; //‚‚³ŒvŽZ—p
-            
             if($border && $nl==2)
                 $b=$b2;
@@ -788 +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);
                 $i=$sep+1;
             }
-            $this->rise_h += $h; //‚‚³ŒvŽZ—p
             $sep=-1;
             $j=$i;
@@ -813 +801 @@
     if($border && strpos($border,'B')!==false)
         $b.='B';
-    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,$ln,$align,$fill);
-    $this->rise_h += $h; //‘‰Á•ª‚̍‚‚³‚ðŒvŽZ
-    //‰üs‚È‚µÝ’è‚©‚A‚‚³‚ª‹K’è‚̍‚‚³ˆÈã‚Å‚ ‚ê‚ÎYŽ²‚ðÝ’肵‚È‚¨‚·B
-    if($ln == 0 and $h < $this->rise_h) {
-      $this->y = $this->y - $this->rise_h + $h;
-    }
-    
-    //$this->x=$this->lMargin;
-}
-
-function Write($h,$txt,$link='')
+    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+    $this->x=$this->lMargin;
+}
+
+function Write($h, $txt, $link='')
 {
     //Output text in flowing mode
@@ -839 +821 @@
     {
         //Get next character
-        $c=$s{$i};
+        $c=$s[$i];
         if($c=="\n")
         {
@@ -904 +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=='')
         {
@@ -918 +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;
@@ -945 +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;
 }
 
@@ -995 +983 @@
 }
 
-function SetXY($x,$y)
+function SetXY($x, $y)
 {
     //Set x and y positions
@@ -1002 +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=='')
@@ -1026 +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')
             {
                 //We send to a browser
-                if(isset($_SERVER['HTTP_USER_AGENT']) and strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) { header('Pragma:'); }
                 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;
@@ -1042 +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('Pragma:');
-                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;
@@ -1080 +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);
 }
 
@@ -1095 +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()
 {
@@ -1106 +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 ' : '';
@@ -1121 +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]))
@@ -1130 +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]))
@@ -1137 +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);
                 }
             }
@@ -1161 +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');
@@ -1176 +1455 @@
         $this->_out('endobj');
     }
-    $mqr=get_magic_quotes_runtime();
-    set_magic_quotes_runtime(0);
     foreach($this->FontFiles as $file=>$info)
     {
@@ -1193 +1470 @@
         if(!$compressed && isset($info['length2']))
         {
-            $header=(ord($font{0})==128);
+            $header=(ord($font[0])==128);
             if($header)
             {
@@ -1199 +1476 @@
                 $font=substr($font,6);
             }
-            if($header && ord($font{$info['length1']})==128)
+            if($header && ord($font[$info['length1']])==128)
             {
                 //Strip second binary header
@@ -1215 +1492 @@
         $this->_out('endobj');
     }
-    set_magic_quotes_runtime($mqr);
     foreach($this->fonts as $k=>$font)
     {
@@ -1375 +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')));
 }
 
@@ -1444 +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
 }
@@ -1658 +1730 @@
 }
 
-}
 ?>

branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php

@@ -1 +1 @@
 <?php
 //
-//  FPDF_TPL - Version 1.1.1
-//
-//    Copyright 2004-2007 Setasign - Jan Slabon
+//  FPDF_TPL - Version 1.2
+//
+//    Copyright 2004-2010 Setasign - Jan Slabon
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18 +18 @@
 //
 
-require_once("fpdf.php");
-
 class FPDF_TPL extends FPDF {
     /**
@@ -52 +50 @@
     
     /**
-     * Constructor
-     * See FPDF-Documentation
-     * @param string $orientation
-     * @param string $unit
-     * @param mixed $format
-     */
-    function fpdf_tpl($orientation='P',$unit='mm',$format='A4') {
-        parent::fpdf($orientation,$unit,$format);
-    }
+     * Last used Template data
+     *
+     * @var array
+     */
+    var $lastUsedTemplateData = array();
     
     /**
@@ -80 +74 @@
      * @return int The ID of new created Template
      */
-    function beginTemplate($x=null,$y=null,$w=null,$h=null) {
+    function beginTemplate($x = null, $y = null, $w = null, $h = null) {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $this->Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
+            return;
+        }
+        
         if ($this->page <= 0)
             $this->error("You have to add a page to fpdf first!");
@@ -120 +119 @@
 
         $this->_intpl = true;
-        $this->SetXY($x+$this->lMargin,$y+$this->tMargin);
-        $this->SetRightMargin($this->w-$w+$this->rMargin);
+        $this->SetXY($x + $this->lMargin, $y + $this->tMargin);
+        $this->SetRightMargin($this->w - $w + $this->rMargin);
 
         return $this->tpl;
@@ -134 +133 @@
      */
     function endTemplate() {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
+        }
+        
         if ($this->_intpl) {
             $this->_intpl = false; 
@@ -168 +172 @@
      * @retrun array The height and width of the template
      */
-    function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0) {
+    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
         if ($this->page <= 0)
-            $this->error("You have to add a page to fpdf first!");
-
+            $this->error('You have to add a page first!');
+        
         if (!isset($this->tpls[$tplidx]))
-            $this->error("Template does not exist!");
+            $this->error('Template does not exist!');
             
         if ($this->_intpl) {
@@ -180 +184 @@
         
         $tpl =& $this->tpls[$tplidx];
-        $x = $tpl['x'];
-        $y = $tpl['y'];
         $w = $tpl['w'];
         $h = $tpl['h'];
         
         if ($_x == null)
-            $_x = $x;
+            $_x = 0;
         if ($_y == null)
-            $_y = $y;
-        $wh = $this->getTemplateSize($tplidx,$_w,$_h);
+            $_y = 0;
+            
+        $_x += $tpl['x'];
+        $_y += $tpl['y'];
+        
+        $wh = $this->getTemplateSize($tplidx, $_w, $_h);
         $_w = $wh['w'];
         $_h = $wh['h'];
     
-        $this->_out(sprintf("q %.4f 0 0 %.4f %.2f %.2f cm", ($_w/$w), ($_h/$h), $_x*$this->k, ($this->h-($_y+$_h))*$this->k)); // Translate 
-        $this->_out($this->tplprefix.$tplidx." Do Q");
-
-        return array("w" => $_w, "h" => $_h);
+        $tData = array(
+            'x' => $this->x,
+            'y' => $this->y,
+            'w' => $_w,
+            'h' => $_h,
+            'scaleX' => ($_w / $w),
+            'scaleY' => ($_h / $h),
+            'tx' => $_x,
+            'ty' =>  ($this->h - $_y - $_h),
+            'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h)
+        );
+        
+        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate 
+        $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
+
+        // reset font in the outer graphic state
+        if ($this->FontFamily) {
+            $family = $this->FontFamily;
+            $this->FontFamily = '';
+            $this->SetFont($family);
+        }
+        
+        $this->lastUsedTemplateData = $tData;
+        
+        return array('w' => $_w, 'h' => $_h);
     }
     
@@ -209 +236 @@
      * @return array The height and width of the template
      */
-    function getTemplateSize($tplidx, $_w=0, $_h=0) {
+    function getTemplateSize($tplidx, $_w = 0, $_h = 0) {
         if (!$this->tpls[$tplidx])
             return false;
@@ -222 +249 @@
         }
 
-        if($_w==0)
-            $_w=$_h*$w/$h;
-        if($_h==0)
-            $_h=$_w*$h/$w;
+        if($_w == 0)
+            $_w = $_h * $w / $h;
+        if($_h == 0)
+            $_h = $_w * $h / $w;
             
         return array("w" => $_w, "h" => $_h);
@@ -231 +258 @@
     
     /**
-     * See FPDF-Documentation ;-)
-     */
-    function SetFont($family,$style='',$size=0) {
+     * See FPDF/TCPDF-Documentation ;-)
+     */
+    public function SetFont($family, $style = '', $size = 0) {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
+        }
+        
         /**
          * force the resetting of font changes in a template
@@ -242 +274 @@
         parent::SetFont($family, $style, $size);
        
-        $fontkey = $this->FontFamily.$this->FontStyle;
+        $fontkey = $this->FontFamily . $this->FontStyle;
         
         if ($this->_intpl) {
@@ -252 +284 @@
     
     /**
-     * See FPDF-Documentation ;-)
-     */
-    function Image($file,$x,$y,$w=0,$h=0,$type='',$link='') {
-        parent::Image($file,$x,$y,$w,$h,$type,$link);
+     * See FPDF/TCPDF-Documentation ;-)
+     */
+    function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '') {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::Image'), $args);
+        }
+        
+        $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
@@ -261 +298 @@
             $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
         }
+        
+        return $ret;
     }
     
@@ -268 +307 @@
      * AddPage is not available when you're "in" a template.
      */
-    function AddPage($orientation='') {
+    function AddPage($orientation = '', $format = '') {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
+        }
+        
         if ($this->_intpl)
             $this->Error('Adding pages in templates isn\'t possible!');
-        parent::AddPage($orientation);
+            
+        parent::AddPage($orientation, $format);
     }
 
@@ -277 +322 @@
      * Preserve adding Links in Templates ...won't work
      */
-    function Link($x,$y,$w,$h,$link) {
+    function Link($x, $y, $w, $h, $link) {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::Link'), $args);
+        }
+        
         if ($this->_intpl)
             $this->Error('Using links in templates aren\'t possible!');
-        parent::Link($x,$y,$w,$h,$link);
+            
+        parent::Link($x, $y, $w, $h, $link);
     }
     
     function AddLink() {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
+        }
+        
         if ($this->_intpl)
             $this->Error('Adding links in templates aren\'t possible!');
@@ -289 +345 @@
     }
     
-    function SetLink($link,$y=0,$page=-1) {
+    function SetLink($link, $y = 0, $page = -1) {
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
+        }
+        
         if ($this->_intpl)
             $this->Error('Setting links in templates aren\'t possible!');
-        parent::SetLink($link,$y,$page);
+        parent::SetLink($link, $y, $page);
     }
     
@@ -309 +370 @@
             $this->_out('/Subtype /Form');
             $this->_out('/FormType 1');
-            $this->_out(sprintf('/BBox [%.2f %.2f %.2f %.2f]',$tpl['x']*$this->k, ($tpl['h']-$tpl['y'])*$this->k, $tpl['w']*$this->k, ($tpl['h']-$tpl['y']-$tpl['h'])*$this->k));
+            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
+                // llx
+                $tpl['x'] * $this->k,
+                // lly
+                -$tpl['y'] * $this->k,
+                // urx
+                ($tpl['w'] + $tpl['x']) * $this->k,
+                // ury
+                ($tpl['h'] - $tpl['y']) * $this->k
+            ));
+            
+            if ($tpl['x'] != 0 || $tpl['y'] != 0) {
+                $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
+                     -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2
+                ));
+            }
+            
             $this->_out('/Resources ');
 
@@ -316 +393 @@
                 $this->_out('/Font <<');
                 foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                    $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
                 $this->_out('>>');
             }
@@ -325 +402 @@
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
                     foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                        $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+                        $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
                     foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                        $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
+                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
                 }
                 $this->_out('>>');
@@ -335 +412 @@
             $this->_out('>>');
             
-            $this->_out('/Length '.strlen($p).' >>');
+            $this->_out('/Length ' . strlen($p) . ' >>');
             $this->_putstream($p);
             $this->_out('endobj');
@@ -342 +419 @@
     
     /**
-     * Private Method
-     */
-    function _putresources() {
-        $this->_putfonts();
-        $this->_putimages();
-        $this->_putformxobjects();
-        //Resource dictionary
-        $this->offsets[2]=strlen($this->buffer);
-        $this->_out('2 0 obj');
-        $this->_out('<<');
-        $this->_putresourcedict();
-        $this->_out('>>');
-        $this->_out('endobj');
+     * Overwritten to add _putformxobjects() after _putimages()
+     *
+     */
+    function _putimages() {
+        parent::_putimages();
+        $this->_putformxobjects();
     }
     
@@ -362 +432 @@
         if (count($this->tpls)) {
             foreach($this->tpls as $tplidx => $tpl) {
-                $this->_out($this->tplprefix.$tplidx.' '.$tpl['n'].' 0 R');
+                $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
             }
         }
@@ -371 +441 @@
      */
     function _out($s) {
-       //Add a line to the document
-       if ($this->state==2) {
-           if (!$this->_intpl)
-               $this->pages[$this->page].=$s."\n";
-           else
-               $this->tpls[$this->tpl]['buffer'] .= $s."\n";
-       } else {
-           $this->buffer.=$s."\n";
-       }
+        if ($this->state == 2 && $this->_intpl) {
+            $this->tpls[$this->tpl]['buffer'] .= $s . "\n";
+        } else {
+            parent::_out($s);
+        }
     }
 }
-
-?>

branches/version-2_5-dev/data/module/fpdf/fpdi.php

@@ -1 +1 @@
 <?php
 //
-//  FPDI - Version 1.2
+//  FPDI - Version 1.4
 //
-//    Copyright 2004-2007 Setasign - Jan Slabon
+//    Copyright 2004-2010 Setasign - Jan Slabon
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18 +18 @@
 //
 
-define('FPDI_VERSION','1.2');
-
-ini_set('auto_detect_line_endings',1); // Strongly required!
-
-require_once("fpdf_tpl.php");
-require_once("fpdi_pdf_parser.php");
+define('FPDI_VERSION', '1.4');
+
+// Check for TCPDF and remap TCPDF to FPDF
+if (class_exists('TCPDF', false)) {
+    require_once('fpdi2tcpdf_bridge.php');
+}
+
+require_once('fpdf_tpl.php');
+require_once('fpdi_pdf_parser.php');
 
 
@@ -46 +49 @@
     
     /**
-     * Highest version of imported PDF
-     * @var double
-     */
-    var $importVersion = 1.3;
-
-    /**
      * object stack
      * @var array
@@ -76 +73 @@
     
     /**
-     * Constructor
-     * See FPDF-Manual
-     */
-    function FPDI($orientation='P',$unit='mm',$format='A4') {
-        parent::FPDF_TPL($orientation,$unit,$format);
-    }
+     * Cache for imported pages/template ids
+     * @var array
+     */
+    var $_importedPages = array();
     
     /**
@@ -91 +86 @@
     function setSourceFile($filename) {
         $this->current_filename = $filename;
-        $fn =& $this->current_filename;
-
-        if (!isset($this->parsers[$fn]))
-            $this->parsers[$fn] =& new fpdi_pdf_parser($fn,$this);
-        $this->current_parser =& $this->parsers[$fn];
-        
-        return $this->parsers[$fn]->getPageCount();
-    }
-    
+        
+        if (!isset($this->parsers[$filename]))
+            $this->parsers[$filename] = $this->_getPdfParser($filename);
+        $this->current_parser =& $this->parsers[$filename];
+        
+        return $this->parsers[$filename]->getPageCount();
+    }
+    
+    /**
+     * Returns a PDF parser object
+     *
+     * @param string $filename
+     * @return fpdi_pdf_parser
+     */
+    function _getPdfParser($filename) {
+        return new fpdi_pdf_parser($filename, $this);
+    }
+    
+    /**
+     * Get the current PDF version
+     *
+     * @return string
+     */
+    function getPDFVersion() {
+        return $this->PDFVersion;
+    }
+    
+    /**
+     * Set the PDF version
+     *
+     * @return string
+     */
+    function setPDFVersion($version = '1.3') {
+        $this->PDFVersion = $version;
+    }
+    
     /**
      * Import a page
@@ -106 +128 @@
      * @return int Index of imported page - to use with fpdf_tpl::useTemplate()
      */
-    function importPage($pageno, $boxName='/CropBox') {
+    function importPage($pageno, $boxName = '/CropBox') {
         if ($this->_intpl) {
-            return $this->error("Please import the desired pages before creating a new template.");
-        }
-        
-        $fn =& $this->current_filename;
+            return $this->error('Please import the desired pages before creating a new template.');
+        }
+        
+        $fn = $this->current_filename;
+        
+        // check if page already imported
+        $pageKey = $fn . ((int)$pageno) . $boxName;
+        if (isset($this->_importedPages[$pageKey]))
+            return $this->_importedPages[$pageKey];
         
         $parser =& $this->parsers[$fn];
         $parser->setPageno($pageno);
 
-        $this->tpl++;
-        $this->tpls[$this->tpl] = array();
-        $tpl =& $this->tpls[$this->tpl];
-        $tpl['parser'] =& $parser;
-        $tpl['resources'] = $parser->getPageResources();
-        $tpl['buffer'] = $parser->getContent();
-        
         if (!in_array($boxName, $parser->availableBoxes))
-            return $this->Error(sprintf("Unknown box: %s", $boxName));
-        $pageboxes = $parser->getPageBoxes($pageno);
+            return $this->Error(sprintf('Unknown box: %s', $boxName));
+        $pageboxes = $parser->getPageBoxes($pageno, $this->k);
         
         /**
@@ -134 +154 @@
          * ArtBox: Default -> CropBox
          */
-        if (!isset($pageboxes[$boxName]) && ($boxName == "/BleedBox" || $boxName == "/TrimBox" || $boxName == "/ArtBox"))
-            $boxName = "/CropBox";
-        if (!isset($pageboxes[$boxName]) && $boxName == "/CropBox")
-            $boxName = "/MediaBox";
+        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
+            $boxName = '/CropBox';
+        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
+            $boxName = '/MediaBox';
         
         if (!isset($pageboxes[$boxName]))
@@ -144 +164 @@
         
         $box = $pageboxes[$boxName];
+        
+        $this->tpl++;
+        $this->tpls[$this->tpl] = array();
+        $tpl =& $this->tpls[$this->tpl];
+        $tpl['parser'] =& $parser;
+        $tpl['resources'] = $parser->getPageResources();
+        $tpl['buffer'] = $parser->getContent();
         $tpl['box'] = $box;
         
         // To build an array that can be used by PDF_TPL::useTemplate()
-        $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl],$box);
+        $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl], $box);
+        
         // An imported page will start at 0,0 everytime. Translation will be set in _putformxobjects()
         $tpl['x'] = 0;
         $tpl['y'] = 0;
         
-        $page =& $parser->pages[$parser->pageno];
-        
-        // fix for rotated pages
+        // handle rotated pages
         $rotation = $parser->getPageRotation($pageno);
+        $tpl['_rotationAngle'] = 0;
         if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
-            $steps = $angle / 90;
+            $steps = $angle / 90;
                 
             $_w = $tpl['w'];
@@ -164 +191 @@
             $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
             
-            if ($steps % 2 != 0) {
-                $x = $y = ($steps == 1 || $steps == -3) ? $tpl['h'] : $tpl['w'];
-            } else {
-                $x = $tpl['w'];
-                $y = $tpl['h'];
-            }
-            
-            $cx=($x/2+$tpl['box']['x'])*$this->k;
-            $cy=($y/2+$tpl['box']['y'])*$this->k;
-            
-            $angle*=-1; 
-            
-            $angle*=M_PI/180;
-            $c=cos($angle);
-            $s=sin($angle);
-            
-            $tpl['buffer'] = sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm %s Q',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy, $tpl['buffer']);
-        }
+            if ($angle < 0)
+                $angle += 360;
+            
+            $tpl['_rotationAngle'] = $angle * -1;
+        }
+        
+        $this->_importedPages[$pageKey] = $this->tpl;
         
         return $this->tpl;
@@ -190 +206 @@
     }
     
-    function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0) {
-        $this->_out('q 0 J 1 w 0 j 0 G'); // reset standard values
+    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0, $adjustPageSize = false) {
+        if ($adjustPageSize == true && is_null($_x) && is_null($_y)) {
+            $size = $this->getTemplateSize($tplidx, $_w, $_h);
+            $format = array($size['w'], $size['h']);
+            if (is_subclass_of($this, 'TCPDF')) {
+                $this->setPageFormat($format, $format[0] > $format[1] ? 'L' : 'P');
+            } else {
+                if ($format[0] != $this->CurPageFormat[0] || $format[1] != $this->CurPageFormat[1]) {
+                    $this->w = $format[0];
+                    $this->h = $format[1];
+                    $this->wPt = $this->w * $this->k;
+                    $this->hPt = $this->h * $this->k;
+                    $this->PageBreakTrigger = $this->h - $this->bMargin;
+                    $this->CurPageFormat = $format;
+                    $this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+                }
+            } 
+        }
+        
+        $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
         $s = parent::useTemplate($tplidx, $_x, $_y, $_w, $_h);
         $this->_out('Q');
+        
         return $s;
     }
@@ -204 +239 @@
             foreach($this->parsers AS $filename => $p) {
                 $this->current_parser =& $this->parsers[$filename];
-                if (is_array($this->_obj_stack[$filename])) {
-                    while($n = key($this->_obj_stack[$filename])) {
-                        $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c,$this->_obj_stack[$filename][$n][1]);
+                if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
+                    while(($n = key($this->_obj_stack[$filename])) !== null) {
+                        $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c, $this->_obj_stack[$filename][$n][1]);
                         
                         $this->_newobj($this->_obj_stack[$filename][$n][0]);
                         
                         if ($nObj[0] == PDF_TYPE_STREAM) {
-                            $this->pdf_write_value ($nObj);
+                            $this->pdf_write_value($nObj);
                         } else {
-                            $this->pdf_write_value ($nObj[1]);
+                            $this->pdf_write_value($nObj[1]);
                         }
                         
@@ -226 +261 @@
     }
     
-    /**
-     * Sets the PDF Version to the highest of imported documents
-     */
-    function setVersion() {
-        $this->PDFVersion = max($this->importVersion, $this->PDFVersion);
-    }
-    
-    /**
-     * Put resources
-     */
-    function _putresources() {
-        $this->_putfonts();
-        $this->_putimages();
-        $this->_putformxobjects();
-        $this->_putimportedobjects();
-        //Resource dictionary
-        $this->offsets[2]=strlen($this->buffer);
-        $this->_out('2 0 obj');
-        $this->_out('<<');
-        $this->_putresourcedict();
-        $this->_out('>>');
-        $this->_out('endobj');
-    }
     
     /**
@@ -259 +271 @@
             $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
             $this->_newobj();
+            $cN = $this->n; // TCPDF/Protection: rem current "n"
+            
             $this->tpls[$tplidx]['n'] = $this->n;
-            $this->_out('<<'.$filter.'/Type /XObject');
+            $this->_out('<<' . $filter . '/Type /XObject');
             $this->_out('/Subtype /Form');
             $this->_out('/FormType 1');
             
-            $this->_out(sprintf('/BBox [%.2f %.2f %.2f %.2f]',
-                ($tpl['x'] + (isset($tpl['box']['x'])?$tpl['box']['x']:0))*$this->k,
-                ($tpl['h'] + (isset($tpl['box']['y'])?$tpl['box']['y']:0) - $tpl['y'])*$this->k,
-                ($tpl['w'] + (isset($tpl['box']['x'])?$tpl['box']['x']:0))*$this->k,
-                ($tpl['h'] + (isset($tpl['box']['y'])?$tpl['box']['y']:0) - $tpl['y']-$tpl['h'])*$this->k)
-            );
-            
-            if (isset($tpl['box']))
-                $this->_out(sprintf('/Matrix [1 0 0 1 %.5f %.5f]',-$tpl['box']['x']*$this->k, -$tpl['box']['y']*$this->k));
+            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', 
+                (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
+                (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
+                (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
+                (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
+            ));
+            
+            $c = 1;
+            $s = 0;
+            $tx = 0;
+            $ty = 0;
+            
+            if (isset($tpl['box'])) {
+                $tx = -$tpl['box']['llx'];
+                $ty = -$tpl['box']['lly']; 
+                
+                if ($tpl['_rotationAngle'] <> 0) {
+                    $angle = $tpl['_rotationAngle'] * M_PI/180;
+                    $c=cos($angle);
+                    $s=sin($angle);
+                    
+                    switch($tpl['_rotationAngle']) {
+                        case -90:
+                           $tx = -$tpl['box']['lly'];
+                           $ty = $tpl['box']['urx'];
+                           break;
+                        case -180:
+                            $tx = $tpl['box']['urx'];
+                            $ty = $tpl['box']['ury'];
+                            break;
+                        case -270:
+                            $tx = $tpl['box']['ury'];
+                            $ty = -$tpl['box']['llx'];
+                            break;
+                    }
+                }
+            } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
+                $tx = -$tpl['x']*2;
+                $ty = $tpl['y']*2;
+            }
+            
+            $tx *= $this->k;
+            $ty *= $this->k;
+            
+            if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
+                $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
+                    $c, $s, -$s, $c, $tx, $ty
+                ));
+            }
             
             $this->_out('/Resources ');
@@ -278 +332 @@
             if (isset($tpl['resources'])) {
                 $this->current_parser =& $tpl['parser'];
-                $this->pdf_write_value($tpl['resources']);
+                $this->pdf_write_value($tpl['resources']); // "n" will be changed
             } else {
                 $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
@@ -284 +338 @@
                     $this->_out('/Font <<');
                     foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                        $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+                        $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
                     $this->_out('>>');
                 }
@@ -293 +347 @@
                     if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
                         foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                            $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+                            $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                     }
                     if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
                         foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                            $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
+                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
                     }
                     $this->_out('>>');
@@ -304 +358 @@
             }
 
-            $this->_out('/Length '.strlen($p).' >>');
+            $nN = $this->n; // TCPDF: rem new "n"
+            $this->n = $cN; // TCPDF: reset to current "n"
+            $this->_out('/Length ' . strlen($p) . ' >>');
             $this->_putstream($p);
             $this->_out('endobj');
-        }
+            $this->n = $nN; // TCPDF: reset to new "n"
+        }
+        
+        $this->_putimportedobjects();
     }
 
@@ -313 +372 @@
      * Rewritten to handle existing own defined objects
      */
-    function _newobj($obj_id=false,$onlynewobj=false) {
+    function _newobj($obj_id = false, $onlynewobj = false) {
         if (!$obj_id) {
             $obj_id = ++$this->n;
         }
 
-        //Begin a new object
+        //Begin a new object
         if (!$onlynewobj) {
-            $this->offsets[$obj_id] = strlen($this->buffer);
-            $this->_out($obj_id.' 0 obj');
+            $this->offsets[$obj_id] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
+            $this->_out($obj_id . ' 0 obj');
             $this->_current_obj_id = $obj_id; // for later use with encryption
         }
         
+        return $obj_id;
     }
 
@@ -335 +395 @@
     function pdf_write_value(&$value)
     {
-
+        if (is_subclass_of($this, 'TCPDF')) {
+            parent::pdf_write_value($value);
+        }
+        
         switch ($value[0]) {
 
-            case PDF_TYPE_NUMERIC :
-            case PDF_TYPE_TOKEN :
-                // A numeric value or a token.
-                // Simply output them
-                $this->_out($value[1]." ", false);
-                break;
-
-            case PDF_TYPE_ARRAY :
+            case PDF_TYPE_TOKEN:
+                $this->_straightOut($value[1] . ' ');
+                break;
+            case PDF_TYPE_NUMERIC:
+            case PDF_TYPE_REAL:
+                if (is_float($value[1]) && $value[1] != 0) {
+                    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') . ' ');
+                } else {
+                    $this->_straightOut($value[1] . ' ');
+                }
+                break;
+                
+            case PDF_TYPE_ARRAY:
 
                 // An array. Output the proper
                 // structure and move on.
 
-                $this->_out("[",false);
+                $this->_straightOut('[');
                 for ($i = 0; $i < count($value[1]); $i++) {
                     $this->pdf_write_value($value[1][$i]);
                 }
 
-                $this->_out("]");
-                break;
-
-            case PDF_TYPE_DICTIONARY :
+                $this->_out(']');
+                break;
+
+            case PDF_TYPE_DICTIONARY:
 
                 // A dictionary.
-                $this->_out("<<",false);
+                $this->_straightOut('<<');
 
                 reset ($value[1]);
 
                 while (list($k, $v) = each($value[1])) {
-                    $this->_out($k . " ",false);
+                    $this->_straightOut($k . ' ');
                     $this->pdf_write_value($v);
                 }
 
-                $this->_out(">>");
-                break;
-
-            case PDF_TYPE_OBJREF :
+                $this->_straightOut('>>');
+                break;
+
+            case PDF_TYPE_OBJREF:
 
                 // An indirect object reference
                 // Fill the object stack if needed
                 $cpfn =& $this->current_parser->filename;
+                
                 if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
-                    $this->_newobj(false,true);
-                    $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
-                    $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
+                    $this->_newobj(false, true);
+                    $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
+                    $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value); // Value is maybee obsolete!!!
                 }
                 $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
 
-                $this->_out("{$objid} 0 R"); //{$value[2]}
-                break;
-
-            case PDF_TYPE_STRING :
+                $this->_out($objid . ' 0 R');
+                break;
+
+            case PDF_TYPE_STRING:
 
                 // A string.
-                $this->_out('('.$value[1].')');
-
-                break;
-
-            case PDF_TYPE_STREAM :
+                $this->_straightOut('(' . $value[1] . ')');
+
+                break;
+
+            case PDF_TYPE_STREAM:
 
                 // A stream. First, output the
@@ -401 +470 @@
                 // stream data itself.
                 $this->pdf_write_value($value[1]);
-                $this->_out("stream");
+                $this->_out('stream');
                 $this->_out($value[2][1]);
-                $this->_out("endstream");
-                break;
-            case PDF_TYPE_HEX :
-            
-                $this->_out("<".$value[1].">");
+                $this->_out('endstream');
+                break;
+                
+            case PDF_TYPE_HEX:
+                $this->_straightOut('<' . $value[1] . '>');
                 break;
 
-            case PDF_TYPE_NULL :
+            case PDF_TYPE_BOOLEAN:
+                $this->_straightOut($value[1] ? 'true ' : 'false ');
+                break;
+            
+            case PDF_TYPE_NULL:
                 // The null object.
 
-                $this->_out("null");
+                $this->_straightOut('null ');
                 break;
         }
@@ -420 +493 @@
     
     /**
-     * Private Method
-     */
-    function _out($s,$ln=true) {
-       //Add a line to the document
-       if ($this->state==2) {
-           if (!$this->_intpl)
-               $this->pages[$this->page] .= $s.($ln == true ? "\n" : '');
-           else
-               $this->tpls[$this->tpl]['buffer'] .= $s.($ln == true ? "\n" : '');
-       } else {
-           $this->buffer.=$s.($ln == true ? "\n" : '');
-       }
+     * Modified so not each call will add a newline to the output.
+     */
+    function _straightOut($s) {
+        if (!is_subclass_of($this, 'TCPDF')) {
+            if($this->state==2)
+                $this->pages[$this->page] .= $s;
+            else
+                $this->buffer .= $s;
+        } else {
+            if ($this->state == 2) {
+                if (isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
+                    // puts data before page footer
+                    $page = substr($this->getPageBuffer($this->page), 0, -$this->footerlen[$this->page]);
+                    $footer = substr($this->getPageBuffer($this->page), -$this->footerlen[$this->page]);
+                    $this->setPageBuffer($this->page, $page . ' ' . $s . "\n" . $footer);
+                } else {
+                    $this->setPageBuffer($this->page, $s, true);
+                }
+            } else {
+                $this->setBuffer($s);
+            }
+        }
     }
 
@@ -457 +540 @@
         return false;
     }
-
 }
-
-// for PHP5
-if (version_compare("5", PHP_VERSION, "<")) {
-    if (!class_exists('fpdi')) {
-        class fpdi extends FPDI {}
-    }
-}
-?>

branches/version-2_5-dev/data/module/fpdf/fpdi_pdf_parser.php

@@ -1 +1 @@
 <?php
 //
-//  FPDI - Version 1.2
-//
-//    Copyright 2004-2007 Setasign - Jan Slabon
+//  FPDI - Version 1.4
+//
+//    Copyright 2004-2010 Setasign - Jan Slabon
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18 +18 @@
 //
 
-require_once("pdf_parser.php");
+require_once('pdf_parser.php');
 
 class fpdi_pdf_parser extends pdf_parser {
@@ -59 +59 @@
      * @var array
      */
-    var $availableBoxes = array("/MediaBox","/CropBox","/BleedBox","/TrimBox","/ArtBox");
+    var $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
         
     /**
@@ -67 +67 @@
      * @param object $fpdi      Object of type fpdi
      */
-    function fpdi_pdf_parser($filename,&$fpdi) {
+    function fpdi_pdf_parser($filename, &$fpdi) {
         $this->fpdi =& $fpdi;
-        $this->filename = $filename;
         
         parent::pdf_parser($filename);
@@ -111 +110 @@
 
         if ($pageno < 0 || $pageno >= $this->getPageCount()) {
-            $this->fpdi->error("Pagenumber is wrong!");
+            $this->fpdi->error('Pagenumber is wrong!');
         }
 
@@ -164 +163 @@
      */
     function getContent() {
-        $buffer = "";
+        $buffer = '';
         
         if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
             $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
             foreach($contents AS $tmp_content) {
-                $buffer .= $this->_rebuildContentStream($tmp_content).' ';
+                $buffer .= $this->_rebuildContentStream($tmp_content) . ' ';
             }
         }
@@ -215 +214 @@
             $_filter = $obj[1][1]['/Filter'];
 
+            if ($_filter[0] == PDF_TYPE_OBJREF) {
+                $tmpFilter = $this->pdf_resolve_object($this->c, $_filter);
+                $_filter = $tmpFilter[1];
+            }
+            
             if ($_filter[0] == PDF_TYPE_TOKEN) {
                 $filters[] = $_filter;
@@ -226 +230 @@
         foreach ($filters AS $_filter) {
             switch ($_filter[1]) {
-                case "/FlateDecode":
-                    if (function_exists('gzuncompress')) {
-                        $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';                        
+                case '/FlateDecode':
+                    // $stream .= "\x0F\x0D"; // in an errorious stream this suffix could work
+                    if (function_exists('gzuncompress')) {
+                        $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
                     } else {
-                        $this->fpdi->error(sprintf("To handle %s filter, please compile php with zlib support.",$_filter[1]));
+                        $this->error(sprintf('To handle %s filter, please compile php with zlib support.',$_filter[1]));
                     }
+                    
                     if ($stream === false) {
-                        $this->fpdi->error("Error while decompressing stream.");
+                        $this->error('Error while decompressing stream.');
                     }
                 break;
+                case '/LZWDecode':
+                    include_once('filters/FilterLZW_FPDI.php');
+                    $decoder = new FilterLZW_FPDI($this->fpdi);
+                    $stream = $decoder->decode($stream);
+                    break;
+                case '/ASCII85Decode':
+                    include_once('filters/FilterASCII85_FPDI.php');
+                    $decoder = new FilterASCII85_FPDI($this->fpdi);
+                    $stream = $decoder->decode($stream);
+                    break;
                 case null:
                     $stream = $stream;
                 break;
                 default:
-                    if (preg_match("/^\/[a-z85]*$/i", $_filter[1], $filterName) && @include_once('decoders'.$_filter[1].'.php')) {
-                        $filterName = substr($_filter[1],1);
-                        if (class_exists($filterName)) {
-                            $decoder =& new $filterName($this->fpdi);
-                            $stream = $decoder->decode(trim($stream));
-                        } else {
-                            $this->fpdi->error(sprintf("Unsupported Filter: %s",$_filter[1]));
-                        }
-                    } else {
-                        $this->fpdi->error(sprintf("Unsupported Filter: %s",$_filter[1]));
-                    }
+                    $this->error(sprintf('Unsupported Filter: %s',$_filter[1]));
             }
         }
@@ -264 +270 @@
      * @param array $page a /Page
      * @param string $box_index Type of Box @see $availableBoxes
-     * @return array
-     */
-    function getPageBox($page, $box_index) {
-        $page = $this->pdf_resolve_object($this->c,$page);
+     * @param float Scale factor from user space units to points
+     * @return array
+     */
+    function getPageBox($page, $box_index, $k) {
+        $page = $this->pdf_resolve_object($this->c, $page);
         $box = null;
         if (isset($page[1][1][$box_index]))
@@ -273 +280 @@
         
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
-            $tmp_box = $this->pdf_resolve_object($this->c,$box);
+            $tmp_box = $this->pdf_resolve_object($this->c, $box);
             $box = $tmp_box[1];
         }
@@ -279 +286 @@
         if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
             $b =& $box[1];
-            return array("x" => $b[0][1]/$this->fpdi->k,
-                         "y" => $b[1][1]/$this->fpdi->k,
-                         "w" => abs($b[0][1]-$b[2][1])/$this->fpdi->k,
-                         "h" => abs($b[1][1]-$b[3][1])/$this->fpdi->k);
+            return array('x' => $b[0][1]/$k,
+                         'y' => $b[1][1]/$k,
+                         'w' => abs($b[0][1]-$b[2][1])/$k,
+                         'h' => abs($b[1][1]-$b[3][1])/$k,
+                         'llx' => min($b[0][1], $b[2][1])/$k,
+                         'lly' => min($b[1][1], $b[3][1])/$k,
+                         'urx' => max($b[0][1], $b[2][1])/$k,
+                         'ury' => max($b[1][1], $b[3][1])/$k,
+                         );
         } else if (!isset ($page[1][1]['/Parent'])) {
             return false;
         } else {
-            return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index);
-        }
-    }
-
-    function getPageBoxes($pageno) {
-        return $this->_getPageBoxes($this->pages[$pageno-1]);
-    }
-    
-    /**
-     * Get all Boxes from /Page
+            return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index, $k);
+        }
+    }
+
+    /**
+     * Get all page boxes by page no
+     * 
+     * @param int The page number
+     * @param float Scale factor from user space units to points
+     * @return array
+     */
+     function getPageBoxes($pageno, $k) {
+        return $this->_getPageBoxes($this->pages[$pageno-1], $k);
+    }
+    
+    /**
+     * Get all boxes from /Page
      *
      * @param array a /Page
      * @return array
      */
-    function _getPageBoxes($page) {
+    function _getPageBoxes($page, $k) {
         $boxes = array();
 
         foreach($this->availableBoxes AS $box) {
-            if ($_box = $this->getPageBox($page,$box)) {
+            if ($_box = $this->getPageBox($page, $box, $k)) {
                 $boxes[$box] = $_box;
             }
@@ -312 +331 @@
     }
 
+    /**
+     * Get the page rotation by pageno
+     *
+     * @param integer $pageno
+     * @return array
+     */
     function getPageRotation($pageno) {
         return $this->_getPageRotation($this->pages[$pageno-1]);
     }
     
-    function _getPageRotation ($obj) { // $obj = /Page
+    function _getPageRotation($obj) { // $obj = /Page
         $obj = $this->pdf_resolve_object($this->c, $obj);
         if (isset ($obj[1][1]['/Rotate'])) {
@@ -342 +367 @@
      * @param array the result-array
      */
-    function read_pages (&$c, &$pages, &$result) {
+    function read_pages(&$c, &$pages, &$result) {
         // Get the kids dictionary
-        $kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
-
-        if (!is_array($kids))
-            $this->fpdi->Error("Cannot find /Kids in current /Page-Dictionary");
-        foreach ($kids[1] as $v) {
+        $_kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
+        
+        if (!is_array($_kids))
+            $this->error('Cannot find /Kids in current /Page-Dictionary');
+            
+        if ($_kids[1][0] == PDF_TYPE_ARRAY) {
+            $kids = $_kids[1][1];
+        } else {
+            $kids = $_kids[1];
+        }
+        
+        foreach ($kids as $v) {
             $pg = $this->pdf_resolve_object ($c, $v);
             if ($pg[1][1]['/Type'][1] === '/Pages') {
                 // If one of the kids is an embedded
                 // /Pages array, resolve it as well.
-                $this->read_pages ($c, $pg, $result);
+                $this->read_pages($c, $pg, $result);
             } else {
                 $result[] = $pg;
@@ -369 +401 @@
     function getPDFVersion() {
         parent::getPDFVersion();
-        
-        if (isset($this->fpdi->importVersion) && $this->pdfVersion > $this->fpdi->importVersion) {
-            $this->fpdi->importVersion = $this->pdfVersion;
-        }
+        $this->fpdi->setPDFVersion(max($this->fpdi->getPDFVersion(), $this->pdfVersion));
     }
     
 }
-
-?>

branches/version-2_5-dev/data/module/fpdf/pdf_context.php

@@ -1 +1 @@
 <?php
 //
-//  FPDI - Version 1.2
+//  FPDI - Version 1.4
 //
-//    Copyright 2004-2007 Setasign - Jan Slabon
+//    Copyright 2004-2010 Setasign - Jan Slabon
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18 +18 @@
 //
 
-class pdf_context {
-
-    var $file;
-    var $buffer;
-    var $offset;
-    var $length;
-
-    var $stack;
-
-    // Constructor
-
-    function pdf_context($f) {
-        $this->file = $f;
-        $this->reset();
-    }
-
-    // Optionally move the file
-    // pointer to a new location
-    // and reset the buffered data
-
-    function reset($pos = null, $l = 100) {
-        if (!is_null ($pos)) {
-            fseek ($this->file, $pos);
-        }
-
-        $this->buffer = $l > 0 ? fread($this->file, $l) : '';
-        $this->offset = 0;
-        $this->length = strlen($this->buffer);
-        $this->stack = array();
-    }
-
-    // Make sure that there is at least one
-    // character beyond the current offset in
-    // the buffer to prevent the tokenizer
-    // from attempting to access data that does
-    // not exist
-
-    function ensure_content() {
-        if ($this->offset >= $this->length - 1) {
-            return $this->increase_length();
-        } else {
-            return true;
-        }
-    }
-
-    // Forcefully read more data into the buffer
-
-    function increase_length($l=100) {
-        if (feof($this->file)) {
-            return false;
-        } else {
-            $this->buffer .= fread($this->file, $l);
-            $this->length = strlen($this->buffer);
-            return true;
-        }
-    }
-
+if (!class_exists('pdf_context', false)) {
+    
+    class pdf_context {
+    
+        /**
+         * Modi
+         *
+         * @var integer 0 = file | 1 = string
+         */
+        var $_mode = 0;
+        
+        var $file;
+        var $buffer;
+        var $offset;
+        var $length;
+    
+        var $stack;
+    
+        // Constructor
+    
+        function pdf_context(&$f) {
+            $this->file =& $f;
+            if (is_string($this->file))
+                $this->_mode = 1;
+            $this->reset();
+        }
+    
+        // Optionally move the file
+        // pointer to a new location
+        // and reset the buffered data
+    
+        function reset($pos = null, $l = 100) {
+            if ($this->_mode == 0) {
+                if (!is_null ($pos)) {
+                    fseek ($this->file, $pos);
+                }
+        
+                $this->buffer = $l > 0 ? fread($this->file, $l) : '';
+                $this->length = strlen($this->buffer);
+                if ($this->length < $l)
+                    $this->increase_length($l - $this->length);
+            } else {
+                $this->buffer = $this->file;
+                $this->length = strlen($this->buffer);
+            }
+            $this->offset = 0;
+            $this->stack = array();
+        }
+    
+        // Make sure that there is at least one
+        // character beyond the current offset in
+        // the buffer to prevent the tokenizer
+        // from attempting to access data that does
+        // not exist
+    
+        function ensure_content() {
+            if ($this->offset >= $this->length - 1) {
+                return $this->increase_length();
+            } else {
+                return true;
+            }
+        }
+    
+        // Forcefully read more data into the buffer
+    
+        function increase_length($l = 100) {
+            if ($this->_mode == 0 && feof($this->file)) {
+                return false;
+            } else if ($this->_mode == 0) {
+                $totalLength = $this->length + $l;
+                do {
+                    $this->buffer .= fread($this->file, $totalLength-$this->length);
+                } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
+                
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
 }
-?>

branches/version-2_5-dev/data/module/fpdf/pdf_parser.php

@@ -1 +1 @@
 <?php
 //
-//  FPDI - Version 1.2
+//  FPDI - Version 1.4
 //
-//    Copyright 2004-2007 Setasign - Jan Slabon
+//    Copyright 2004-2010 Setasign - Jan Slabon
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -40 +40 @@
 if (!defined ('PDF_TYPE_STREAM'))
     define ('PDF_TYPE_STREAM', 10);
+if (!defined ('PDF_TYPE_BOOLEAN'))
+    define ('PDF_TYPE_BOOLEAN', 11);
+if (!defined ('PDF_TYPE_REAL'))
+    define ('PDF_TYPE_REAL', 12);
+    
+require_once('pdf_context.php');
 
-require_once("pdf_context.php");
-require_once("wrapper_functions.php");
-
-class pdf_parser {
-    
-    /**
-     * Filename
-     * @var string
-     */
-    var $filename;
-    
-    /**
-     * File resource
-     * @var resource
-     */
-    var $f;
-    
-    /**
-     * PDF Context
-     * @var object pdf_context-Instance
-     */
-    var $c;
-    
-    /**
-     * xref-Data
-     * @var array
-     */
-    var $xref;
-
-    /**
-     * root-Object
-     * @var array
-     */
-    var $root;
-    
-    
-    /**
-     * Constructor
-     *
-     * @param string $filename  Source-Filename
-     */
-    function pdf_parser($filename) {
-        $this->filename = $filename;
-        
-        $this->f = @fopen($this->filename, "rb");
-
-        if (!$this->f)
-            $this->error(sprintf("Cannot open %s !", $filename));
-
-        $this->getPDFVersion();
-
-        $this->c =& new pdf_context($this->f);
-        // Read xref-Data
-        $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
-
-        // Check for Encryption
-        $this->getEncryption();
-
-        // Read root
-        $this->pdf_read_root();
-    }
-    
-    /**
-     * Close the opened file
-     */
-    function closeFile() {
-        if (isset($this->f)) {
-            fclose($this->f);   
-            unset($this->f);
-        }   
-    }
-    
-    /**
-     * Print Error and die
-     *
-     * @param string $msg  Error-Message
-     */
-    function error($msg) {
-        die("<b>PDF-Parser Error:</b> ".$msg);  
-    }
-    
-    /**
-     * Check Trailer for Encryption
-     */
-    function getEncryption() {
-        if (isset($this->xref['trailer'][1]['/Encrypt'])) {
-            $this->error("File is encrypted!");
-        }
-    }
-    
-    /**
-     * Find/Return /Root
-     *
-     * @return array
-     */
-    function pdf_find_root() {
-        if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
-            $this->error("Wrong Type of Root-Element! Must be an indirect reference");
-        }
-        return $this->xref['trailer'][1]['/Root'];
-    }
-
-    /**
-     * Read the /Root
-     */
-    function pdf_read_root() {
-        // read root
-        $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
-    }
-    
-    /**
-     * Get PDF-Version
-     *
-     * And reset the PDF Version used in FPDI if needed
-     */
-    function getPDFVersion() {
-        fseek($this->f, 0);
-        preg_match("/\d\.\d/",fread($this->f,16),$m);
-        $this->pdfVersion = $m[0];
-    }
-    
-    /**
-     * Find the xref-Table
-     */
-    function pdf_find_xref() {
-        fseek ($this->f, -min(filesize($this->filename),1500), SEEK_END);
-        $data = fread($this->f, 1500);
-        
-        $pos = strlen($data) - strpos(strrev($data), strrev('startxref')); 
-        $data = substr($data, $pos);
-        
-        if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) {
-            $this->error("Unable to find pointer to xref table");
-        }
-
-        return (int) $matches[1];
-    }
-
-    /**
-     * Read xref-table
-     *
-     * @param array $result Array of xref-table
-     * @param integer $offset of xref-table
-     * @param integer $start start-position in xref-table
-     * @param integer $end end-position in xref-table
-     */
-    function pdf_read_xref(&$result, $offset, $start = null, $end = null) {
-        if (is_null ($start) || is_null ($end)) {
-            fseek($this->f, $o_pos = $offset);
-            $data = trim(fgets($this->f,1024));
-                        
-            if (strlen($data) == 0) 
-                $data = trim(fgets($this->f,1024));
-                    
-            if ($data !== 'xref') {
-                fseek($this->f, $o_pos);
-                $data = trim(_fgets($this->f, true));
-                if ($data !== 'xref') {
-                    if (preg_match('/(.*xref)(.*)/m', $data, $m)) { // xref 0 128 - in one line
-                        fseek($this->f, $o_pos+strlen($m[1]));                      
-                    } elseif (preg_match('/(x|r|e|f)+/', $data, $m)) { // correct invalid xref-pointer
-                        $tmpOffset = $offset-4+strlen($m[0]);
-                        $this->pdf_read_xref($result, $tmpOffset, $start, $end);
-                        return;
-                    } else {
-                        $this->error("Unable to find xref table - Maybe a Problem with 'auto_detect_line_endings'");
-                    }
-                }
-            }
-
-            $o_pos = ftell($this->f);
-            $data = explode(' ', trim(fgets($this->f,1024)));
-            if (count($data) != 2) {
-                fseek($this->f, $o_pos);
-                $data = explode(' ', trim(_fgets($this->f, true)));
-            
-                if (count($data) != 2) {
-                    if (count($data) > 2) { // no lineending
-                        $n_pos = $o_pos+strlen($data[0])+strlen($data[1])+2;
-                        fseek($this->f, $n_pos);
-                    } else {
-                        $this->error("Unexpected header in xref table");
-                    }
-                }
+if (!class_exists('pdf_parser', false)) {
+    
+    class pdf_parser {
+        
+        /**
+         * Filename
+         * @var string
+         */
+        var $filename;
+        
+        /**
+         * File resource
+         * @var resource
+         */
+        var $f;
+        
+        /**
+         * PDF Context
+         * @var object pdf_context-Instance
+         */
+        var $c;
+        
+        /**
+         * xref-Data
+         * @var array
+         */
+        var $xref;
+    
+        /**
+         * root-Object
+         * @var array
+         */
+        var $root;
+        
+        /**
+         * PDF version of the loaded document
+         * @var string
+         */
+        var $pdfVersion;
+        
+        /**
+         * For reading encrypted documents and xref/objectstreams are in use
+         *
+         * @var boolean
+         */
+        var $readPlain = true;
+        
+        /**
+         * Constructor
+         *
+         * @param string $filename  Source-Filename
+         */
+        function pdf_parser($filename) {
+            $this->filename = $filename;
+            
+            $this->f = @fopen($this->filename, 'rb');
+    
+            if (!$this->f)
+                $this->error(sprintf('Cannot open %s !', $filename));
+    
+            $this->getPDFVersion();
+    
+            $this->c = new pdf_context($this->f);
+            
+            // Read xref-Data
+            $this->xref = array();
+            $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
+            
+            // Check for Encryption
+            $this->getEncryption();
+    
+            // Read root
+            $this->pdf_read_root();
+        }
+        
+        /**
+         * Close the opened file
+         */
+        function closeFile() {
+            if (isset($this->f) && is_resource($this->f)) {
+                fclose($this->f);   
+                unset($this->f);
+            }   
+        }
+        
+        /**
+         * Print Error and die
+         *
+         * @param string $msg  Error-Message
+         */
+        function error($msg) {
+            die('<b>PDF-Parser Error:</b> '.$msg);  
+        }
+        
+        /**
+         * Check Trailer for Encryption
+         */
+        function getEncryption() {
+            if (isset($this->xref['trailer'][1]['/Encrypt'])) {
+                $this->error('File is encrypted!');
             }
-            $start = $data[0];
-            $end = $start + $data[1];
-        }
-
-        if (!isset($result['xref_location'])) {
-            $result['xref_location'] = $offset;
-        }
-
-        if (!isset($result['max_object']) || $end > $result['max_object']) {
-            $result['max_object'] = $end;
-        }
-
-        for (; $start < $end; $start++) {
-            $data = ltrim(fread($this->f, 20)); // Spezifications says: 20 bytes including newlines
-            $offset = substr($data, 0, 10);
-            $generation = substr($data, 11, 5);
-
-            if (!isset ($result['xref'][$start][(int) $generation])) {
-                $result['xref'][$start][(int) $generation] = (int) $offset;
-            }
-        }
-
-        $o_pos = ftell($this->f);
-        $data = fgets($this->f,1024);
-        if (strlen(trim($data)) == 0) 
-            $data = fgets($this->f, 1024);
-        
-        if (preg_match("/trailer/",$data)) {
-            if (preg_match("/(.*trailer[ \n\r]*)/",$data,$m)) {
-                fseek($this->f, $o_pos+strlen($m[1]));
-            }
-            
-            $c =&  new pdf_context($this->f);
+        }
+        
+        /**
+         * Find/Return /Root
+         *
+         * @return array
+         */
+        function pdf_find_root() {
+            if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
+                $this->error('Wrong Type of Root-Element! Must be an indirect reference');
+            }
+            
+            return $this->xref['trailer'][1]['/Root'];
+        }
+    
+        /**
+         * Read the /Root
+         */
+        function pdf_read_root() {
+            // read root
+            $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
+        }
+        
+        /**
+         * Get PDF-Version
+         *
+         * And reset the PDF Version used in FPDI if needed
+         */
+        function getPDFVersion() {
+            fseek($this->f, 0);
+            preg_match('/\d\.\d/',fread($this->f,16),$m);
+            if (isset($m[0]))
+                $this->pdfVersion = $m[0];
+            return $this->pdfVersion;
+        }
+        
+        /**
+         * Find the xref-Table
+         */
+        function pdf_find_xref() {
+            $toRead = 1500;
+                    
+            $stat = fseek ($this->f, -$toRead, SEEK_END);
+            if ($stat === -1) {
+                fseek ($this->f, 0);
+            }
+            $data = fread($this->f, $toRead);
+            
+            $pos = strlen($data) - strpos(strrev($data), strrev('startxref')); 
+            $data = substr($data, $pos);
+            
+            if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) {
+                $this->error('Unable to find pointer to xref table');
+            }
+    
+            return (int) $matches[1];
+        }
+    
+        /**
+         * Read xref-table
+         *
+         * @param array $result Array of xref-table
+         * @param integer $offset of xref-table
+         */
+        function pdf_read_xref(&$result, $offset) {
+            $o_pos = $offset-min(20, $offset);
+            fseek($this->f, $o_pos); // set some bytes backwards to fetch errorious docs
+                
+            $data = fread($this->f, 100);
+            
+            $xrefPos = strrpos($data, 'xref');
+    
+            if ($xrefPos === false) {
+                fseek($this->f, $offset);
+                $c = new pdf_context($this->f);
+                $xrefStreamObjDec = $this->pdf_read_value($c);
+                
+                if (is_array($xrefStreamObjDec) && isset($xrefStreamObjDec[0]) && $xrefStreamObjDec[0] == PDF_TYPE_OBJDEC) {
+                    $this->error(sprintf('This document (%s) probably uses a compression technique which is not supported by the free parser shipped with FPDI.', $this->filename));
+                } else {            
+                    $this->error('Unable to find xref table.');
+                }
+            }
+            
+            if (!isset($result['xref_location'])) {
+                $result['xref_location'] = $o_pos+$xrefPos;
+                $result['max_object'] = 0;
+            }
+    
+            $cylces = -1;
+            $bytesPerCycle = 100;
+            
+            fseek($this->f, $o_pos = $o_pos+$xrefPos+4); // set the handle directly after the "xref"-keyword
+            $data = fread($this->f, $bytesPerCycle);
+            
+            while (($trailerPos = strpos($data, 'trailer', max($bytesPerCycle*$cylces++, 0))) === false && !feof($this->f)) {
+                $data .= fread($this->f, $bytesPerCycle);
+            }
+            
+            if ($trailerPos === false) {
+                $this->error('Trailer keyword not found after xref table');
+            }
+            
+            $data = substr($data, 0, $trailerPos);
+            
+            // get Line-Ending
+            preg_match_all("/(\r\n|\n|\r)/", substr($data, 0, 100), $m); // check the first 100 bytes for linebreaks
+    
+            $differentLineEndings = count(array_unique($m[0]));
+            if ($differentLineEndings > 1) {
+                $lines = preg_split("/(\r\n|\n|\r)/", $data, -1, PREG_SPLIT_NO_EMPTY);
+            } else {
+                $lines = explode($m[0][1], $data);
+            }
+            
+            $data = $differentLineEndings = $m = null;
+            unset($data, $differentLineEndings, $m);
+            
+            $linesCount = count($lines);
+            
+            $start = 1;
+            
+            for ($i = 0; $i < $linesCount; $i++) {
+                $line = trim($lines[$i]);
+                if ($line) {
+                    $pieces = explode(' ', $line);
+                    $c = count($pieces);
+                    switch($c) {
+                        case 2:
+                            $start = (int)$pieces[0];
+                            $end   = $start+(int)$pieces[1];
+                            if ($end > $result['max_object'])
+                                $result['max_object'] = $end;
+                            break;
+                        case 3:
+                            if (!isset($result['xref'][$start]))
+                                $result['xref'][$start] = array();
+                            
+                            if (!array_key_exists($gen = (int) $pieces[1], $result['xref'][$start])) {
+                                $result['xref'][$start][$gen] = $pieces[2] == 'n' ? (int) $pieces[0] : null;
+                            }
+                            $start++;
+                            break;
+                        default:
+                            $this->error('Unexpected data in xref table');
+                    }
+                }
+            }
+            
+            $lines = $pieces = $line = $start = $end = $gen = null;
+            unset($lines, $pieces, $line, $start, $end, $gen);
+            
+            fseek($this->f, $o_pos+$trailerPos+7);
+            
+            $c = new pdf_context($this->f);
             $trailer = $this->pdf_read_value($c);
             
+            $c = null;
+            unset($c);
+            
+            if (!isset($result['trailer'])) {
+                $result['trailer'] = $trailer;          
+            }
+            
             if (isset($trailer[1]['/Prev'])) {
-                $this->pdf_read_xref($result, $trailer[1]['/Prev'][1]);
-                $result['trailer'][1] = array_merge($result['trailer'][1], $trailer[1]);
-            } else {
-                $result['trailer'] = $trailer;
-            }
-        } else {
-            $data = explode(' ', trim($data));
-            
-            if (count($data) != 2) {
-                fseek($this->f, $o_pos);
-                $data = explode(' ', trim (_fgets ($this->f, true)));
-
-                if (count($data) != 2) {
-                    $this->error("Unexpected data in xref table");
+                $this->pdf_read_xref($result, $trailer[1]['/Prev'][1]);
+            } 
+            
+            $trailer = null;
+            unset($trailer);
+            
+            return true;
+        }
+        
+        /**
+         * Reads an Value
+         *
+         * @param object $c pdf_context
+         * @param string $token a Token
+         * @return mixed
+         */
+        function pdf_read_value(&$c, $token = null) {
+            if (is_null($token)) {
+                $token = $this->pdf_read_token($c);
+            }
+            
+            if ($token === false) {
+                return false;
+            }
+    
+            switch ($token) {
+                case    '<':
+                    // This is a hex string.
+                    // Read the value, then the terminator
+    
+                    $pos = $c->offset;
+    
+                    while(1) {
+    
+                        $match = strpos ($c->buffer, '>', $pos);
+                    
+                        // If you can't find it, try
+                        // reading more data from the stream
+    
+                        if ($match === false) {
+                            if (!$c->increase_length()) {
+                                return false;
+                            } else {
+                                continue;
+                            }
+                        }
+    
+                        $result = substr ($c->buffer, $c->offset, $match - $c->offset);
+                        $c->offset = $match + 1;
+                        
+                        return array (PDF_TYPE_HEX, $result);
+                    }
+                    
+                    break;
+                case    '<<':
+                    // This is a dictionary.
+    
+                    $result = array();
+    
+                    // Recurse into this function until we reach
+                    // the end of the dictionary.
+                    while (($key = $this->pdf_read_token($c)) !== '>>') {
+                        if ($key === false) {
+                            return false;
+                        }
+                        
+                        if (($value =   $this->pdf_read_value($c)) === false) {
+                            return false;
+                        }
+                        
+                        // Catch missing value
+                        if ($value[0] == PDF_TYPE_TOKEN && $value[1] == '>>') {
+                            $result[$key] = array(PDF_TYPE_NULL);
+                            break;
+                        }
+                        
+                        $result[$key] = $value;
+                    }
+                    
+                    return array (PDF_TYPE_DICTIONARY, $result);
+    
+                case    '[':
+                    // This is an array.
+    
+                    $result = array();
+    
+                    // Recurse into this function until we reach
+                    // the end of the array.
+                    while (($token = $this->pdf_read_token($c)) !== ']') {
+                        if ($token === false) {
+                            return false;
+                        }
+                        
+                        if (($value = $this->pdf_read_value($c, $token)) === false) {
+                            return false;
+                        }
+                        
+                        $result[] = $value;
+                    }
+                    
+                    return array (PDF_TYPE_ARRAY, $result);
+    
+                case    '('     :
+                    // This is a string
+                    $pos = $c->offset;
+                    
+                    $openBrackets = 1;
+                    do {
+                        for (; $openBrackets != 0 && $pos < $c->length; $pos++) {
+                            switch (ord($c->buffer[$pos])) {
+                                case 0x28: // '('
+                                    $openBrackets++;
+                                    break;
+                                case 0x29: // ')'
+                                    $openBrackets--;
+                                    break;
+                                case 0x5C: // backslash
+                                    $pos++;
+                            }
+                        }
+                    } while($openBrackets != 0 && $c->increase_length());
+                    
+                    $result = substr($c->buffer, $c->offset, $pos - $c->offset - 1);
+                    $c->offset = $pos;
+                    
+                    return array (PDF_TYPE_STRING, $result);
+    
+                case 'stream':
+                    $o_pos = ftell($c->file)-strlen($c->buffer);
+                    $o_offset = $c->offset;
+                    
+                    $c->reset($startpos = $o_pos + $o_offset);
+                    
+                    $e = 0; // ensure line breaks in front of the stream
+                    if ($c->buffer[0] == chr(10) || $c->buffer[0] == chr(13))
+                        $e++;
+                    if ($c->buffer[1] == chr(10) && $c->buffer[0] != chr(10))
+                        $e++;
+                    
+                    if ($this->actual_obj[1][1]['/Length'][0] == PDF_TYPE_OBJREF) {
+                        $tmp_c = new pdf_context($this->f);
+                        $tmp_length = $this->pdf_resolve_object($tmp_c, $this->actual_obj[1][1]['/Length']);
+                        $length = $tmp_length[1][1];
+                    } else {
+                        $length = $this->actual_obj[1][1]['/Length'][1];    
+                    }
+                        
+                    if ($length > 0) {
+                        $c->reset($startpos+$e,$length);
+                        $v = $c->buffer;
+                    } else {
+                        $v = '';   
+                    }
+                    $c->reset($startpos+$e+$length+9); // 9 = strlen("endstream")
+                    
+                    return array(PDF_TYPE_STREAM, $v);
+                    
+                default :
+                    if (is_numeric ($token)) {
+                        // A numeric token. Make sure that
+                        // it is not part of something else.
+                        if (($tok2 = $this->pdf_read_token ($c)) !== false) {
+                            if (is_numeric ($tok2)) {
+    
+                                // Two numeric tokens in a row.
+                                // In this case, we're probably in
+                                // front of either an object reference
+                                // or an object specification.
+                                // Determine the case and return the data
+                                if (($tok3 = $this->pdf_read_token ($c)) !== false) {
+                                    switch ($tok3) {
+                                        case    'obj'   :
+                                            return array (PDF_TYPE_OBJDEC, (int) $token, (int) $tok2);
+                                        case    'R'     :
+                                            return array (PDF_TYPE_OBJREF, (int) $token, (int) $tok2);
+                                    }
+                                    // If we get to this point, that numeric value up
+                                    // there was just a numeric value. Push the extra
+                                    // tokens back into the stack and return the value.
+                                    array_push ($c->stack, $tok3);
+                                }
+                            }
+    
+                            array_push ($c->stack, $tok2);
+                        }
+    
+                        if ($token === (string)((int)$token))
+                            return array (PDF_TYPE_NUMERIC, (int)$token);
+                        else 
+                            return array (PDF_TYPE_REAL, (float)$token);
+                    } else if ($token == 'true' || $token == 'false') {
+                        return array (PDF_TYPE_BOOLEAN, $token == 'true');
+                    } else if ($token == 'null') {
+                       return array (PDF_TYPE_NULL);
+                    } else {
+                        // Just a token. Return it.
+                        return array (PDF_TYPE_TOKEN, $token);
+                    }
+             }
+        }
+        
+        /**
+         * Resolve an object
+         *
+         * @param object $c pdf_context
+         * @param array $obj_spec The object-data
+         * @param boolean $encapsulate Must set to true, cause the parsing and fpdi use this method only without this para
+         */
+        function pdf_resolve_object(&$c, $obj_spec, $encapsulate = true) {
+            // Exit if we get invalid data
+            if (!is_array($obj_spec)) {
+                $ret = false;
+                return $ret;
+            }
+    
+            if ($obj_spec[0] == PDF_TYPE_OBJREF) {
+    
+                // This is a reference, resolve it
+                if (isset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]])) {
+    
+                    // Save current file position
+                    // This is needed if you want to resolve
+                    // references while you're reading another object
+                    // (e.g.: if you need to determine the length
+                    // of a stream)
+    
+                    $old_pos = ftell($c->file);
+    
+                    // Reposition the file pointer and
+                    // load the object header.
+                    
+                    $c->reset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]]);
+    
+                    $header = $this->pdf_read_value($c);
+    
+                    if ($header[0] != PDF_TYPE_OBJDEC || $header[1] != $obj_spec[1] || $header[2] != $obj_spec[2]) {
+                        $toSearchFor = $obj_spec[1].' '.$obj_spec[2].' obj';
+                        if (preg_match('/'.$toSearchFor.'/', $c->buffer)) {
+                            $c->offset = strpos($c->buffer, $toSearchFor) + strlen($toSearchFor);
+                            // reset stack
+                            $c->stack = array();
+                        } else {
+                            $this->error("Unable to find object ({$obj_spec[1]}, {$obj_spec[2]}) at expected location");
+                        }
+                    }
+    
+                    // If we're being asked to store all the information
+                    // about the object, we add the object ID and generation
+                    // number for later use
+                    $result = array();
+                    $this->actual_obj =& $result;
+                    if ($encapsulate) {
+                        $result = array (
+                            PDF_TYPE_OBJECT,
+                            'obj' => $obj_spec[1],
+                            'gen' => $obj_spec[2]
+                        );
+                    } 
+    
+                    // Now simply read the object data until
+                    // we encounter an end-of-object marker
+                    while(1) {
+                        $value = $this->pdf_read_value($c);
+                        if ($value === false || count($result) > 4) {
+                            // in this case the parser coudn't find an endobj so we break here
+                            break;
+                        }
+    
+                        if ($value[0] == PDF_TYPE_TOKEN && $value[1] === 'endobj') {
+                            break;
+                        }
+    
+                        $result[] = $value;
+                    }
+    
+                    $c->reset($old_pos);
+    
+                    if (isset($result[2][0]) && $result[2][0] == PDF_TYPE_STREAM) {
+                        $result[0] = PDF_TYPE_STREAM;
+                    }
+    
+                    return $result;
                 }
-            }
-            
-            $this->pdf_read_xref($result, null, (int) $data[0], (int) $data[0] + (int) $data[1]);
-        }
+            } else {
+                return $obj_spec;
+            }
+        }
+    
+        
+        
+        /**
+         * Reads a token from the file
+         *
+         * @param object $c pdf_context
+         * @return mixed
+         */
+        function pdf_read_token(&$c)
+        {
+            // If there is a token available
+            // on the stack, pop it out and
+            // return it.
+    
+            if (count($c->stack)) {
+                return array_pop($c->stack);
+            }
+    
+            // Strip away any whitespace
+    
+            do {
+                if (!$c->ensure_content()) {
+                    return false;
+                }
+                $c->offset += strspn($c->buffer, " \n\r\t", $c->offset);
+            } while ($c->offset >= $c->length - 1);
+    
+            // Get the first character in the stream
+    
+            $char = $c->buffer[$c->offset++];
+    
+            switch ($char) {
+    
+                case '[':
+                case ']':
+                case '(':
+                case ')':
+                
+                    // This is either an array or literal string
+                    // delimiter, Return it
+    
+                    return $char;
+    
+                case '<':
+                case '>':
+    
+                    // This could either be a hex string or
+                    // dictionary delimiter. Determine the
+                    // appropriate case and return the token
+    
+                    if ($c->buffer[$c->offset] == $char) {
+                        if (!$c->ensure_content()) {
+                            return false;
+                        }
+                        $c->offset++;
+                        return $char . $char;
+                    } else {
+                        return $char;
+                    }
+    
+                case '%':
+                    
+                    // This is a comment - jump over it!
+                    
+                    $pos = $c->offset;
+                    while(1) {
+                        $match = preg_match("/(\r\n|\r|\n)/", $c->buffer, $m, PREG_OFFSET_CAPTURE, $pos);
+                        if ($match === 0) {
+                            if (!$c->increase_length()) {
+                                return false;
+                            } else {
+                                continue;
+                            }
+                        }
+    
+                        $c->offset = $m[0][1]+strlen($m[0][0]);
+                        
+                        return $this->pdf_read_token($c);
+                    }
+                    
+                default:
+    
+                    // This is "another" type of token (probably
+                    // a dictionary entry or a numeric value)
+                    // Find the end and return it.
+    
+                    if (!$c->ensure_content()) {
+                        return false;
+                    }
+    
+                    while(1) {
+    
+                        // Determine the length of the token
+    
+                        $pos = strcspn($c->buffer, " %[]<>()\r\n\t/", $c->offset);
+                        
+                        if ($c->offset + $pos <= $c->length - 1) {
+                            break;
+                        } else {
+                            // If the script reaches this point,
+                            // the token may span beyond the end
+                            // of the current buffer. Therefore,
+                            // we increase the size of the buffer
+                            // and try again--just to be safe.
+    
+                            $c->increase_length();
+                        }
+                    }
+    
+                    $result = substr($c->buffer, $c->offset - 1, $pos + 1);
+    
+                    $c->offset += $pos;
+                    return $result;
+            }
+        }
     }
-
-
-    /**
-     * Reads an Value
-     *
-     * @param object $c pdf_context
-     * @param string $token a Token
-     * @return mixed
-     */
-    function pdf_read_value(&$c, $token = null) {
-        if (is_null($token)) {
-            $token = $this->pdf_read_token($c);
-        }
-        
-        if ($token === false) {
-            return false;
-        }
-
-        switch ($token) {
-            case    '<':
-                // This is a hex string.
-                // Read the value, then the terminator
-
-                $pos = $c->offset;
-
-                while(1) {
-
-                    $match = strpos ($c->buffer, '>', $pos);
-                
-                    // If you can't find it, try
-                    // reading more data from the stream
-
-                    if ($match === false) {
-                        if (!$c->increase_length()) {
-                            return false;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    $result = substr ($c->buffer, $c->offset, $match - $c->offset);
-                    $c->offset = $match+1;
-                    
-                    return array (PDF_TYPE_HEX, $result);
-                }
-                
-                break;
-            case    '<<':
-                // This is a dictionary.
-
-                $result = array();
-
-                // Recurse into this function until we reach
-                // the end of the dictionary.
-                while (($key = $this->pdf_read_token($c)) !== '>>') {
-                    if ($key === false) {
-                        return false;
-                    }
-                    
-                    if (($value =   $this->pdf_read_value($c)) === false) {
-                        return false;
-                    }
-                    $result[$key] = $value;
-                }
-                
-                return array (PDF_TYPE_DICTIONARY, $result);
-
-            case    '[':
-                // This is an array.
-
-                $result = array();
-
-                // Recurse into this function until we reach
-                // the end of the array.
-                while (($token = $this->pdf_read_token($c)) !== ']') {
-                    if ($token === false) {
-                        return false;
-                    }
-                    
-                    if (($value = $this->pdf_read_value($c, $token)) === false) {
-                        return false;
-                    }
-                    
-                    $result[] = $value;
-                }
-                
-                return array (PDF_TYPE_ARRAY, $result);
-
-            case    '('     :
-                // This is a string
-
-                $pos = $c->offset;
-
-                while(1) {
-
-                    // Start by finding the next closed
-                    // parenthesis
-
-                    $match = strpos ($c->buffer, ')', $pos);
-
-                    // If you can't find it, try
-                    // reading more data from the stream
-
-                    if ($match === false) {
-                        if (!$c->increase_length()) {
-                            return false;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    // Make sure that there is no backslash
-                    // before the parenthesis. If there is,
-                    // move on. Otherwise, return the string.
-                    $esc = preg_match('/([\\\\]+)$/', $tmpresult = substr($c->buffer, $c->offset, $match - $c->offset), $m);
-                    
-                    if ($esc === 0 || strlen($m[1]) % 2 == 0) {
-                        $result = $tmpresult;
-                        $c->offset = $match + 1;
-                        return array (PDF_TYPE_STRING, $result);
-                    } else {
-                        $pos = $match + 1;
-
-                        if ($pos > $c->offset + $c->length) {
-                            $c->increase_length();
-                        }
-                    }                   
-                }
-
-            case "stream":
-                $o_pos = ftell($c->file)-strlen($c->buffer);
-                $o_offset = $c->offset;
-                
-                $c->reset($startpos = $o_pos + $o_offset);
-                
-                $e = 0; // ensure line breaks in front of the stream
-                if ($c->buffer[0] == chr(10) || $c->buffer[0] == chr(13))
-                    $e++;
-                if ($c->buffer[1] == chr(10) && $c->buffer[0] != chr(10))
-                    $e++;
-                
-                if ($this->actual_obj[1][1]['/Length'][0] == PDF_TYPE_OBJREF) {
-                    $tmp_c =& new pdf_context($this->f);
-                    $tmp_length = $this->pdf_resolve_object($tmp_c,$this->actual_obj[1][1]['/Length']);
-                    $length = $tmp_length[1][1];
-                } else {
-                    $length = $this->actual_obj[1][1]['/Length'][1];    
-                }
-                
-                if ($length > 0) {
-                    $c->reset($startpos+$e,$length);
-                    $v = $c->buffer;
-                } else {
-                    $v = '';   
-                }
-                $c->reset($startpos+$e+$length+9); // 9 = strlen("endstream")
-                
-                return array(PDF_TYPE_STREAM, $v);
-                
-            default :
-                if (is_numeric ($token)) {
-                    // A numeric token. Make sure that
-                    // it is not part of something else.
-                    if (($tok2 = $this->pdf_read_token ($c)) !== false) {
-                        if (is_numeric ($tok2)) {
-
-                            // Two numeric tokens in a row.
-                            // In this case, we're probably in
-                            // front of either an object reference
-                            // or an object specification.
-                            // Determine the case and return the data
-                            if (($tok3 = $this->pdf_read_token ($c)) !== false) {
-                                switch ($tok3) {
-                                    case    'obj'   :
-                                        return array (PDF_TYPE_OBJDEC, (int) $token, (int) $tok2);
-                                    case    'R'     :
-                                        return array (PDF_TYPE_OBJREF, (int) $token, (int) $tok2);
-                                }
-                                // If we get to this point, that numeric value up
-                                // there was just a numeric value. Push the extra
-                                // tokens back into the stack and return the value.
-                                array_push ($c->stack, $tok3);
-                            }
-                        }
-
-                        array_push ($c->stack, $tok2);
-                    }
-
-                    return array (PDF_TYPE_NUMERIC, $token);
-                } else {
-
-                    // Just a token. Return it.
-                    return array (PDF_TYPE_TOKEN, $token);
-                }
-
-         }
-    }
-    
-    /**
-     * Resolve an object
-     *
-     * @param object $c pdf_context
-     * @param array $obj_spec The object-data
-     * @param boolean $encapsulate Must set to true, cause the parsing and fpdi use this method only without this para
-     */
-    function pdf_resolve_object(&$c, $obj_spec, $encapsulate = true) {
-        // Exit if we get invalid data
-        if (!is_array($obj_spec)) {
-            return false;
-        }
-
-        if ($obj_spec[0] == PDF_TYPE_OBJREF) {
-
-            // This is a reference, resolve it
-            if (isset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]])) {
-
-                // Save current file position
-                // This is needed if you want to resolve
-                // references while you're reading another object
-                // (e.g.: if you need to determine the length
-                // of a stream)
-
-                $old_pos = ftell($c->file);
-
-                // Reposition the file pointer and
-                // load the object header.
-                
-                $c->reset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]]);
-
-                $header = $this->pdf_read_value($c,null,true);
-
-                if ($header[0] != PDF_TYPE_OBJDEC || $header[1] != $obj_spec[1] || $header[2] != $obj_spec[2]) {
-                    $this->error("Unable to find object ({$obj_spec[1]}, {$obj_spec[2]}) at expected location");
-                }
-
-                // If we're being asked to store all the information
-                // about the object, we add the object ID and generation
-                // number for later use
-                $this->actual_obj =& $result;
-                if ($encapsulate) {
-                    $result = array (
-                        PDF_TYPE_OBJECT,
-                        'obj' => $obj_spec[1],
-                        'gen' => $obj_spec[2]
-                    );
-                } else {
-                    $result = array();
-                }
-
-                // Now simply read the object data until
-                // we encounter an end-of-object marker
-                while(1) {
-                    $value = $this->pdf_read_value($c);
-                    if ($value === false || count($result) > 4) {
-                        // in this case the parser coudn't find an endobj so we break here
-                        break;
-                    }
-
-                    if ($value[0] == PDF_TYPE_TOKEN && $value[1] === 'endobj') {
-                        break;
-                    }
-
-                    $result[] = $value;
-                }
-
-                $c->reset($old_pos);
-
-                if (isset($result[2][0]) && $result[2][0] == PDF_TYPE_STREAM) {
-                    $result[0] = PDF_TYPE_STREAM;
-                }
-
-                return $result;
-            }
-        } else {
-            return $obj_spec;
-        }
-    }
-
-    
-    
-    /**
-     * Reads a token from the file
-     *
-     * @param object $c pdf_context
-     * @return mixed
-     */
-    function pdf_read_token(&$c)
-    {
-        // If there is a token available
-        // on the stack, pop it out and
-        // return it.
-
-        if (count($c->stack)) {
-            return array_pop($c->stack);
-        }
-
-        // Strip away any whitespace
-
-        do {
-            if (!$c->ensure_content()) {
-                return false;
-            }
-            $c->offset += _strspn($c->buffer, " \n\r\t", $c->offset);
-        } while ($c->offset >= $c->length - 1);
-
-        // Get the first character in the stream
-
-        $char = $c->buffer[$c->offset++];
-
-        switch ($char) {
-
-            case '['    :
-            case ']'    :
-            case '('    :
-            case ')'    :
-
-                // This is either an array or literal string
-                // delimiter, Return it
-
-                return $char;
-
-            case '<'    :
-            case '>'    :
-
-                // This could either be a hex string or
-                // dictionary delimiter. Determine the
-                // appropriate case and return the token
-
-                if ($c->buffer[$c->offset] == $char) {
-                    if (!$c->ensure_content()) {
-                        return false;
-                    }
-                    $c->offset++;
-                    return $char . $char;
-                } else {
-                    return $char;
-                }
-
-            default     :
-
-                // This is "another" type of token (probably
-                // a dictionary entry or a numeric value)
-                // Find the end and return it.
-
-                if (!$c->ensure_content()) {
-                    return false;
-                }
-
-                while(1) {
-
-                    // Determine the length of the token
-
-                    $pos = _strcspn($c->buffer, " []<>()\r\n\t/", $c->offset);
-                    if ($c->offset + $pos <= $c->length - 1) {
-                        break;
-                    } else {
-                        // If the script reaches this point,
-                        // the token may span beyond the end
-                        // of the current buffer. Therefore,
-                        // we increase the size of the buffer
-                        // and try again--just to be safe.
-
-                        $c->increase_length();
-                    }
-                }
-
-                $result = substr($c->buffer, $c->offset - 1, $pos + 1);
-
-                $c->offset += $pos;
-                return $result;
-        }
-    }
-
-    
 }
-
-?>