chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/include/gd_adapter.cls.php

Doc Comments +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
    *
    * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
    * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
-   * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
+   * @param integer  $aa_factor    Anti-aliasing factor, 1 for no AA
    * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
    */
   function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
@@ -536,8 +536,8 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle Text angle
+   * @param integer $adjust word spacing adjustment
+   * @param integer $angle Text angle
    */
   function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
 
@@ -590,7 +590,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    

Switch Indentation +35 added lines, -35 removed lines

@@ -489,21 +489,21 @@ 
   function image($img_url, $img_type, $x, $y, $w, $h) {
 
     switch ($img_type) {
-    case "png":
-      $src = @imagecreatefrompng($img_url);
-      break;
+        case "png":
+          $src = @imagecreatefrompng($img_url);
+          break;
       
-    case "gif":
-      $src = @imagecreatefromgif($img_url);
-      break;
+        case "gif":
+          $src = @imagecreatefromgif($img_url);
+          break;
       
-    case "jpg":
-    case "jpeg":
-      $src = @imagecreatefromjpeg($img_url);
-      break;
+        case "jpg":
+        case "jpeg":
+          $src = @imagecreatefromjpeg($img_url);
+          break;
 
-    default:
-      break;
+        default:
+          break;
       
     }
 
@@ -658,20 +658,20 @@ 
     
     switch ($type) {
 
-    case "jpg":
-    case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+        case "jpg":
+        case "jpeg":
+          if ( !isset($options["quality"]) )
+            $options["quality"] = 75;
       
-      header("Content-type: image/jpeg");
-      imagejpeg($dst, '', $options["quality"]);
-      break;
-
-    case "png":
-    default:
-      header("Content-type: image/png");
-      imagepng($dst);
-      break;
+          header("Content-type: image/jpeg");
+          imagejpeg($dst, '', $options["quality"]);
+          break;
+
+        case "png":
+        default:
+          header("Content-type: image/png");
+          imagepng($dst);
+          break;
     }
 
     if ( $this->_aa_factor != 1 ) 
@@ -706,18 +706,18 @@ 
 
     switch ($type) {
 
-    case "jpg":
-    case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+        case "jpg":
+        case "jpeg":
+          if ( !isset($options["quality"]) )
+            $options["quality"] = 75;
       
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+          imagejpeg($dst, '', $options["quality"]);
+          break;
 
-    case "png":
-    default:
-      imagepng($dst);
-      break;
+        case "png":
+        default:
+          imagepng($dst);
+          break;
     }
 
     $image = ob_get_contents();

Spacing +34 added lines, -34 removed lines

@@ -99,22 +99,22 @@ 
    * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
    * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
    */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1, 1, 1, 0)) {
 
-    if ( !is_array($size) ) {
+    if (!is_array($size)) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+      if (isset(CPDF_Adapter::$PAPER_SIZES[strtolower($size)])) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
       else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
-    if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+    if (strtolower($orientation) === "landscape") {
+      list($size[2], $size[3]) = array($size[3], $size[2]);
     }
 
-    if ( $aa_factor < 1 )
+    if ($aa_factor < 1)
       $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
@@ -127,9 +127,9 @@ 
 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
-    if ( is_null($bg_color) || !is_array($bg_color) ) {
+    if (is_null($bg_color) || !is_array($bg_color)) {
       // Pure white bg
-      $bg_color = array(1,1,1,0);
+      $bg_color = array(1, 1, 1, 0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -197,10 +197,10 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
+    if (!isset($color[3])) 
       $color[3] = 0;
     
-    list($r,$g,$b,$a) = $color;
+    list($r, $g, $b, $a) = $color;
     
     $r *= 255;
     $g *= 255;
@@ -220,10 +220,10 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
+    if (isset($this->_colors[$key]))
       return $this->_colors[$key];
 
-    if ( $a != 0 ) 
+    if ($a != 0) 
       $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
       $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
@@ -259,10 +259,10 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
-      if ( count($style) == 1 ) {
+      if (count($style) == 1) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
           $gd_style[] = $c;
         }
@@ -276,7 +276,7 @@ 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+          if ($i % 2 == 0) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
               $gd_style[] = $c;
@@ -327,7 +327,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -404,7 +404,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -419,7 +419,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
+    if ($fill) 
       imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
       imagepolygon($this->_img, $points, count($points) / 2, $c);
@@ -451,7 +451,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -466,7 +466,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
+    if ($fill)
       imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
       imageellipse($this->_img, $x, $y, $r, $r, $c);
@@ -507,7 +507,7 @@ 
       
     }
 
-    if ( !$src )
+    if (!$src)
       return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
@@ -539,7 +539,7 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle Text angle
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,7 +550,7 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -595,7 +595,7 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -611,11 +611,11 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
-    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
+    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl"); // Test string with ascenders, descenders and caps
     return $y2 - $y1;
   }
 
@@ -638,7 +638,7 @@ 
   function stream($filename, $options = null) {
 
     // Perform any antialiasing
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -649,7 +649,7 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = strtolower($options["type"]);
@@ -660,7 +660,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       header("Content-type: image/jpeg");
@@ -674,7 +674,7 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
+    if ($this->_aa_factor != 1) 
       imagedestroy($dst);
   }
 
@@ -686,7 +686,7 @@ 
    */
   function output($options = null) {
 
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -697,7 +697,7 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = $options["type"];
@@ -708,7 +708,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       imagejpeg($dst, '', $options["quality"]);
@@ -723,7 +723,7 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
+    if ($this->_aa_factor != 1)
       imagedestroy($dst);
     
     return $image;

Braces +69 added lines, -48 removed lines

@@ -103,10 +103,11 @@ 
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
-        $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
-        $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) {
+              $size = CPDF_Adapter::$PAPER_SIZES[$size];
+      } else {
+              $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      }
     
     }
 
@@ -114,8 +115,9 @@ 
       list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
-    if ( $aa_factor < 1 )
-      $aa_factor = 1;
+    if ( $aa_factor < 1 ) {
+          $aa_factor = 1;
+    }
 
     $this->_aa_factor = $aa_factor;
     
@@ -197,8 +199,9 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
-      $color[3] = 0;
+    if ( !isset($color[3]) ) {
+          $color[3] = 0;
+    }
     
     list($r,$g,$b,$a) = $color;
     
@@ -220,13 +223,15 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+    if ( isset($this->_colors[$key]) ) {
+          return $this->_colors[$key];
+    }
 
-    if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
-    else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    if ( $a != 0 ) {
+          $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+    } else {
+          $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    }
       
     return $this->_colors[$key];
     
@@ -278,13 +283,15 @@ 
 
           if ( $i % 2 == 0 ) {
             // 'On' pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $c;
+            }
             
           } else {
             // Off pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $this->_bg_color;
+            }
             
           }
           $i++;
@@ -398,8 +405,9 @@ 
   function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
-    foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+    foreach (array_keys($points) as $i) {
+          $points[$i] *= $this->_aa_factor;
+    }
 
     $c = $this->_allocate_color($color);
 
@@ -419,10 +427,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
-    else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+    if ( $fill ) {
+          imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+    } else {
+          imagepolygon($this->_img, $points, count($points) / 2, $c);
+    }
         
   }
 
@@ -466,10 +475,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
-    else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+    if ( $fill ) {
+          imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+    } else {
+          imageellipse($this->_img, $x, $y, $r, $r, $c);
+    }
         
   }
 
@@ -507,8 +517,10 @@ 
       
     }
 
-    if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+    if ( !$src ) {
+          return;
+    }
+    // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,8 +562,9 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
@@ -595,8 +608,9 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
@@ -611,8 +625,9 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
@@ -649,8 +664,9 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = strtolower($options["type"]);
     
@@ -660,8 +676,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       header("Content-type: image/jpeg");
       imagejpeg($dst, '', $options["quality"]);
@@ -674,8 +691,9 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
   }
 
   /**
@@ -697,8 +715,9 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = $options["type"];
     
@@ -708,8 +727,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       imagejpeg($dst, '', $options["quality"]);
       break;
@@ -723,8 +743,9 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
     
     return $image;
   }

Indentation +413 added lines, -414 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: gd_adapter.cls.php,v $
- * Created on: 2004-06-06
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: gd_adapter.cls.php,v $
+     * Created on: 2004-06-06
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: gd_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -49,73 +48,73 @@ 
  */
 class GD_Adapter implements Canvas {
 
-  /**
-   * Resoure handle for the image
-   *
-   * @var resource
-   */
-  private $_img;
-
-  /**
-   * Image width in pixels
-   *
-   * @var int
-   */
-  private $_width;
-
-  /**
-   * Image height in pixels
-   *
-   * @var int
-   */
-  private $_height;
-
-  /**
-   * Image antialias factor
-   *
-   * @var float
-   */
-  private $_aa_factor;
-
-  /**
-   * Allocated colors
-   *
-   * @var array
-   */
-  private $_colors;
-
-  /**
-   * Background color
-   *
-   * @var int
-   */
-  private $_bg_color;
+    /**
+     * Resoure handle for the image
+     *
+     * @var resource
+     */
+    private $_img;
+
+    /**
+     * Image width in pixels
+     *
+     * @var int
+     */
+    private $_width;
+
+    /**
+     * Image height in pixels
+     *
+     * @var int
+     */
+    private $_height;
+
+    /**
+     * Image antialias factor
+     *
+     * @var float
+     */
+    private $_aa_factor;
+
+    /**
+     * Allocated colors
+     *
+     * @var array
+     */
+    private $_colors;
+
+    /**
+     * Background color
+     *
+     * @var int
+     */
+    private $_bg_color;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
-   * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
-   * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
-   * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
-   */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
+     * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
+     * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
+     * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
+     */
+    function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+        if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
+        else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
     if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+        list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
     if ( $aa_factor < 1 )
-      $aa_factor = 1;
+        $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
     
@@ -128,8 +127,8 @@ 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
     if ( is_null($bg_color) || !is_array($bg_color) ) {
-      // Pure white bg
-      $bg_color = array(1,1,1,0);
+        // Pure white bg
+        $bg_color = array(1,1,1,0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -137,68 +136,68 @@ 
     imagesavealpha($this->_img, true);
     imagefill($this->_img, 0, 0, $this->_bg_color);
         
-  }
-
-  /**
-   * Return the GF image resource
-   *
-   * @return resource
-   */
-  function get_image() { return $this->_img; }
-
-  /**
-   * Return the image's width in pixels
-   *
-   * @return float
-   */
-  function get_width() { return $this->_width / $this->_aa_factor; }
-
-  /**
-   * Return the image's height in pixels
-   *
-   * @return float
-   */
-  function get_height() { return $this->_height / $this->_aa_factor; }
+    }
+
+    /**
+     * Return the GF image resource
+     *
+     * @return resource
+     */
+    function get_image() { return $this->_img; }
+
+    /**
+     * Return the image's width in pixels
+     *
+     * @return float
+     */
+    function get_width() { return $this->_width / $this->_aa_factor; }
+
+    /**
+     * Return the image's height in pixels
+     *
+     * @return float
+     */
+    function get_height() { return $this->_height / $this->_aa_factor; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     // FIXME
-  }
+    }
    
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     // FIXME
-  }    
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }    
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     // FIXME
-  }    
-
-  /**
-   * Allocate a new color.  Allocate with GD as needed and store
-   * previously allocated colors in $this->_colors.
-   *
-   * @param array $color  The new current color
-   * @return int           The allocated color
-   */
-  private function _allocate_color($color) {
+    }    
+
+    /**
+     * Allocate a new color.  Allocate with GD as needed and store
+     * previously allocated colors in $this->_colors.
+     *
+     * @param array $color  The new current color
+     * @return int           The allocated color
+     */
+    private function _allocate_color($color) {
     
     // Full opacity if no alpha set
     if ( !isset($color[3]) ) 
-      $color[3] = 0;
+        $color[3] = 0;
     
     list($r,$g,$b,$a) = $color;
     
@@ -221,33 +220,33 @@ 
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
     if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+        return $this->_colors[$key];
 
     if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+        $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+        $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
       
     return $this->_colors[$key];
     
-  }
+    }
   
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -260,63 +259,63 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      if ( count($style) == 1 ) {
+        if ( count($style) == 1 ) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
         }
 
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $this->_bg_color;
+            $gd_style[] = $this->_bg_color;
         }
 
-      } else {
+        } else {
 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+            if ( $i % 2 == 0 ) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+                $gd_style[] = $c;
             
-          } else {
+            } else {
             // Off pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+                $gd_style[] = $this->_bg_color;
             
-          }
-          $i++;
+            }
+            $i++;
+        }
         }
-      }
       
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
     
     imagesetthickness($this->_img, $width);
 
     imageline($this->_img, $x1, $y1, $x2, $y2, $c);
     
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -328,36 +327,36 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     imagerectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -369,79 +368,79 @@ 
 
     imagefilledrectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
 
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
     foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+        $points[$i] *= $this->_aa_factor;
 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+        imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+        imagepolygon($this->_img, $points, count($points) / 2, $c);
         
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -452,55 +451,55 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+        imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+        imageellipse($this->_img, $x, $y, $r, $r, $c);
         
-  }
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    }
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h) {
 
     switch ($img_type) {
     case "png":
       $src = @imagecreatefrompng($img_url);
-      break;
+        break;
       
     case "gif":
       $src = @imagecreatefromgif($img_url);
-      break;
+        break;
       
     case "jpg":
     case "jpeg":
       $src = @imagecreatefromjpeg($img_url);
-      break;
+        break;
 
     default:
       break;
@@ -508,7 +507,7 @@ 
     }
 
     if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+        return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -523,23 +522,23 @@ 
     
     imagecopyresampled($this->_img, $src, $x, $y, 0, 0, $w, $h, $img_w, $img_h);
     
-  }
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle Text angle
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    }
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle Text angle
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -551,106 +550,106 @@ 
     $c = $this->_allocate_color($color);
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
     
-  }
+    }
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
-
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    }
+
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     // Not implemented
-  }
-
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    }
+
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
     // Not implemented
-  }
-
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0) {    
+    }
+
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0) {    
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
     return $x2 - $x1;
-  }
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size) {
+    }
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size) {
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
     return $y2 - $y1;
-  }
+    }
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page() {
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page() {
     // FIXME
-  }    
+    }    
 
-  /**
-   * Streams the image directly to the browser
-   *
-   * @param string $filename the name of the image file (ignored)
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   */
-  function stream($filename, $options = null) {
+    /**
+     * Streams the image directly to the browser
+     *
+     * @param string $filename the name of the image file (ignored)
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     */
+    function stream($filename, $options = null) {
 
     // Perform any antialiasing
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
 
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = strtolower($options["type"]);
     
@@ -663,42 +662,42 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      header("Content-type: image/jpeg");
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        header("Content-type: image/jpeg");
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       header("Content-type: image/png");
-      imagepng($dst);
-      break;
+        imagepng($dst);
+        break;
     }
 
     if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
-  }
+        imagedestroy($dst);
+    }
 
-  /**
-   * Returns the PNG as a string
-   *
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PNG as a string
+     *
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     * @return string
+     */
+    function output($options = null) {
 
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
     
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = $options["type"];
     
@@ -711,23 +710,23 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       imagepng($dst);
-      break;
+        break;
     }
 
     $image = ob_get_contents();
     ob_end_clean();
 
     if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+        imagedestroy($dst);
     
     return $image;
-  }
+    }
   
   
 }

main/inc/lib/phpdocx/pdf/include/list_bullet_image_frame_decorator.cls.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
   /**
    * Return the bullet's width
    *
-   * @return int
+   * @return double
    */
   function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
@@ -159,7 +159,7 @@ 
   /**
    * Override get_margin_height()
    *
-   * @return int
+   * @return double
    */
   function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box

Spacing +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     // Resample the bullet image to be consistent with 'auto' sized images
     // See also Image_Frame_Reflower::get_min_max_width
     // Tested php ver: value measured in px, suffix "px" not in value: rtrim unnecessary.
-    $this->_width = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-    $this->_height = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+    $this->_width = (((float) rtrim($width, "px")) * 72) / DOMPDF_DPI;
+    $this->_height = (((float) rtrim($height, "px")) * 72) / DOMPDF_DPI;
  
     //If an image is taller as the containing block/box, the box should be extended.
     //Neighbour elements are overwriting the overlapping image areas.
@@ -116,7 +116,7 @@ 
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
-    return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
+    return $this->_frame->get_style()->get_font_size() * List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
   }
 
@@ -145,7 +145,7 @@ 
 
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
-    if ( $this->_frame->get_style()->list_style_position === "outside" ||
+    if ($this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
       return 0;
     //This aligns the "inside" image position with the text.

Braces +3 added lines, -2 removed lines

@@ -146,8 +146,9 @@
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
-         $this->_width == 0) 
-      return 0;
+         $this->_width == 0) {
+          return 0;
+    }
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.

Indentation +110 added lines, -110 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: list_bullet_image_frame_decorator.cls.php,v $
- * Created on: 2005-06-28
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - added comment
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: list_bullet_image_frame_decorator.cls.php,v $
+     * Created on: 2005-06-28
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - added comment
+     */
 
 /* $Id: list_bullet_image_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -52,34 +52,34 @@ 
  */
 class List_Bullet_Image_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * The underlying image frame
-   * 
-   * @var Image_Frame_Decorator
-   */
-  protected $_img;
+    /**
+     * The underlying image frame
+     * 
+     * @var Image_Frame_Decorator
+     */
+    protected $_img;
 
-  /**
-   * The image's width in pixels
-   *
-   * @var int
-   */
-  protected $_width;
+    /**
+     * The image's width in pixels
+     *
+     * @var int
+     */
+    protected $_width;
   
-  /**
-   * The image's height in pixels
-   *
-   * @var int
-   */
-  protected $_height;
+    /**
+     * The image's height in pixels
+     *
+     * @var int
+     */
+    protected $_height;
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the bullet frame to decorate
-   * @param DOMPDF $dompdf the document's dompdf object
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the bullet frame to decorate
+     * @param DOMPDF $dompdf the document's dompdf object
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     $style = $frame->get_style();
     $url = $style->list_style_image;
     $frame->get_node()->setAttribute("src", $url);
@@ -104,38 +104,38 @@ 
     //  $style->min_height = $this->_height;
     //}
     //$style->height = "auto";   
-  }
+    }
 
-  /**
-   * Return the bullet's width
-   *
-   * @return int
-   */
-  function get_width() {
+    /**
+     * Return the bullet's width
+     *
+     * @return int
+     */
+    function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
     return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return the bullet's height
-   *
-   * @return int
-   */
-  function get_height() {
+    /**
+     * Return the bullet's height
+     *
+     * @return int
+     */
+    function get_height() {
     //based on image height
     return $this->_height;
-  }
+    }
   
-  /**
-   * Override get_margin_width
-   *
-   * @return int
-   */
-  function get_margin_width() {
+    /**
+     * Override get_margin_width
+     *
+     * @return int
+     */
+    function get_margin_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the extra indentation of text to make room for the bullet image.
@@ -147,42 +147,42 @@ 
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
-      return 0;
+        return 0;
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.
     //Where this comes from is unknown.
     //The corresponding List_Bullet_Frame_Decorator sets a smaller margin. bullet size?
     return $this->_width + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Override get_margin_height()
-   *
-   * @return int
-   */
-  function get_margin_height() {
+    /**
+     * Override get_margin_height()
+     *
+     * @return int
+     */
+    function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box
     //based on image height
     return $this->_height + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return image url
-   *
-   * @return string
-   */
-  function get_image_url() {
+    /**
+     * Return image url
+     *
+     * @return string
+     */
+    function get_image_url() {
     return $this->_img->get_image_url();
-  }
+    }
 
-  /**
-   * Return the image extension
-   *
-   * @return string
-   */
-  function get_image_ext() {
+    /**
+     * Return the image extension
+     *
+     * @return string
+     */
+    function get_image_ext() {
     return $this->_img->get_image_ext();
-  }
+    }
   
 }

main/inc/lib/phpdocx/pdf/include/page_cache.cls.php

Doc Comments +7 added lines

@@ -70,12 +70,19 @@
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
+  /**
+   * @param string $sql
+   */
   private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
+  /**
+   * @param integer $page_num
+   * @param string|null $data
+   */
   static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
       "page_num=". pg_escape_string($page_num);

Indentation +70 added lines, -71 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_cache.cls.php,v $
- * Created on: 2004-07-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: page_cache.cls.php,v $
+     * Created on: 2004-07-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: page_cache.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -50,59 +49,59 @@ 
  */
 class Page_Cache {
 
-  const DB_USER = "dompdf_page_cache";
-  const DB_PASS = "some meaningful password";
-  const DB_NAME = "dompdf_page_cache";
+    const DB_USER = "dompdf_page_cache";
+    const DB_PASS = "some meaningful password";
+    const DB_NAME = "dompdf_page_cache";
   
-  static private $__connection = null;
+    static private $__connection = null;
   
-  function init() {
+    function init() {
     if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
+        $con_str = "host=" . DB_HOST .
         " dbname=" . self::DB_NAME .
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+        if ( !self::$__connection = pg_connect($con_str) )
         throw new Exception("Database connection failed.");
     }
-  }
+    }
   
-  function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
+    function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
-  private static function __query($sql) {
+    private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+        throw new Exception(pg_last_error(self::$__connection));
     return $res;
-  }
+    }
   
-  static function store_page($id, $page_num, $data) {
+    static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+        "page_num=". pg_escape_string($page_num);
 
     $res = self::__query("SELECT timestamp FROM page_cache ". $where);
 
     $row = pg_fetch_assoc($res);
     
     if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+        self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+        self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+                        pg_escape_string($page_num) . ", ".
+                        "'". pg_escape_string($data) . "')");
 
-  }
+    }
 
-  static function store_fonts($id, $fonts) {
+    static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+        self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
     self::__query("COMMIT");
-  }
+    }
   
 //   static function retrieve_page($id, $page_num) {
 
@@ -115,45 +114,45 @@ 
     
 //   }
 
-  static function get_page_timestamp($id, $page_num) {
+    static function get_page_timestamp($id, $page_num) {
     $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+                            "page_num=". pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
     return $row["timestamp"];
     
-  }
+    }
 
-  // Adds the cached document referenced by $id to the provided pdf
-  static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
+    // Adds the cached document referenced by $id to the provided pdf
+    static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
     $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+        $pdf->get_cpdf()->selectFont($row["font_name"]);
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
     if ( $new_page )
-      $pdf->new_page();
+        $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+        if ( !$first ) 
         $pdf->new_page();
-      else 
+        else 
         $first = false;        
       
-      $page = $pdf->reopen_serialized_object($row["data"]);
-      //$pdf->close_object();
-      $pdf->add_object($page, "add");
+        $page = $pdf->reopen_serialized_object($row["data"]);
+        //$pdf->close_object();
+        $pdf->add_object($page, "add");
 
     }
       
-  }
+    }
 }
 
 Page_Cache::init();

Spacing +24 added lines, -24 removed lines

@@ -57,13 +57,13 @@ 
   static private $__connection = null;
   
   function init() {
-    if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
-        " dbname=" . self::DB_NAME .
-        " user=" . self::DB_USER .
-        " password=" . self::DB_PASS;
+    if (is_null(self::$__connection)) {
+      $con_str = "host=".DB_HOST.
+        " dbname=".self::DB_NAME.
+        " user=".self::DB_USER.
+        " password=".self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+      if (!self::$__connection = pg_connect($con_str))
         throw new Exception("Database connection failed.");
     }
   }
@@ -71,36 +71,36 @@ 
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
+    if (!($res = pg_query(self::$__connection, $sql)))
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
   static function store_page($id, $page_num, $data) {
-    $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+    $where = "WHERE id='".pg_escape_string($id)."' AND ".
+      "page_num=".pg_escape_string($page_num);
 
-    $res = self::__query("SELECT timestamp FROM page_cache ". $where);
+    $res = self::__query("SELECT timestamp FROM page_cache ".$where);
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    if ($row) 
+      self::__query("UPDATE page_cache SET data='".pg_escape_string($data)."' ".$where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('".pg_escape_string($id)."', ".
+                     pg_escape_string($page_num).", ".
+                     "'".pg_escape_string($data)."')");
 
   }
 
   static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
-    self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    self::__query("DELETE FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
-                    pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('".
+                    pg_escape_string($id)."', '".pg_escape_string($font)."')");
     self::__query("COMMIT");
   }
   
@@ -116,8 +116,8 @@ 
 //   }
 
   static function get_page_timestamp($id, $page_num) {
-    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='".pg_escape_string($id)."' AND ".
+                          "page_num=".pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
@@ -127,22 +127,22 @@ 
 
   // Adds the cached document referenced by $id to the provided pdf
   static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
-    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
       $pdf->get_cpdf()->selectFont($row["font_name"]);
     
-    $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT data FROM page_cache WHERE id='".pg_escape_string($id)."'");
 
-    if ( $new_page )
+    if ($new_page)
       $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+      if (!$first) 
         $pdf->new_page();
       else 
         $first = false;        

Braces +25 added lines, -18 removed lines

@@ -63,16 +63,18 @@ 
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
-        throw new Exception("Database connection failed.");
+      if ( !self::$__connection = pg_connect($con_str) ) {
+              throw new Exception("Database connection failed.");
+      }
     }
   }
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+    if ( !($res = pg_query(self::$__connection, $sql)) ) {
+          throw new Exception(pg_last_error(self::$__connection));
+    }
     return $res;
   }
   
@@ -84,12 +86,13 @@ 
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
-    else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+    if ( $row ) {
+          self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    } else {
+          self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
                      pg_escape_string($page_num) . ", ".
                      "'". pg_escape_string($data) . "')");
+    }
 
   }
 
@@ -98,9 +101,10 @@ 
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
-    foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+    foreach (array_keys($fonts) as $font) {
+          self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+    }
     self::__query("COMMIT");
   }
   
@@ -131,21 +135,24 @@ 
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
-    while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+    while ($row = pg_fetch_assoc($res)) {
+          $pdf->get_cpdf()->selectFont($row["font_name"]);
+    }
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
-    if ( $new_page )
-      $pdf->new_page();
+    if ( $new_page ) {
+          $pdf->new_page();
+    }
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
-        $pdf->new_page();
-      else 
-        $first = false;        
+      if ( !$first ) {
+              $pdf->new_page();
+      } else {
+              $first = false;
+      }
       
       $page = $pdf->reopen_serialized_object($row["data"]);
       //$pdf->close_object();

main/inc/lib/phpdocx/pdf/include/page_frame_decorator.cls.php

Doc Comments +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
    * @link http://www.w3.org/TR/CSS21/page.html#forced
    *
    * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
+   * @return null|boolean true if a page break occured
    */
   function check_forced_page_break(Frame $frame) {
 
@@ -426,7 +426,7 @@ 
    * correct location.
    *
    * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
+   * @return boolean the frame following the page break
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already

Indentation +294 added lines, -295 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_frame_decorator.cls.php,v $
- * Created on: 2004-06-15
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: page_frame_decorator.cls.php,v $
+     * Created on: 2004-06-15
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: page_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,137 +46,137 @@ 
  */
 class Page_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * y value of bottom page margin
-   *
-   * @var float
-   */
-  protected $_bottom_page_margin;
-
-  /**
-   * Flag indicating page is full.
-   *
-   * @var bool
-   */
-  protected $_page_full;
-
-  /**
-   * Number of tables currently being reflowed
-   *
-   * @var int
-   */
-  protected $_in_table;
-
-  /**
-   * The pdf renderer
-   *
-   * @var Renderer
-   */
-  protected $_renderer;
-
-  //........................................................................
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * y value of bottom page margin
+     *
+     * @var float
+     */
+    protected $_bottom_page_margin;
+
+    /**
+     * Flag indicating page is full.
+     *
+     * @var bool
+     */
+    protected $_page_full;
+
+    /**
+     * Number of tables currently being reflowed
+     *
+     * @var int
+     */
+    protected $_in_table;
+
+    /**
+     * The pdf renderer
+     *
+     * @var Renderer
+     */
+    protected $_renderer;
+
+    //........................................................................
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_page_full = false;
     $this->_in_table = 0;
     $this->_bottom_page_margin = null;
-  }
+    }
 
 
-  /**
-   * Set the renderer used for this pdf
-   *
-   * @param Renderer $renderer the renderer to use
-   */
-  function set_renderer($renderer) {
+    /**
+     * Set the renderer used for this pdf
+     *
+     * @param Renderer $renderer the renderer to use
+     */
+    function set_renderer($renderer) {
     $this->_renderer = $renderer;
-  }
-
-  /**
-   * Return the renderer used for this pdf
-   *
-   * @return Renderer
-   */
-  function get_renderer() {
+    }
+
+    /**
+     * Return the renderer used for this pdf
+     *
+     * @return Renderer
+     */
+    function get_renderer() {
     return $this->_renderer;
-  }
-
-  /**
-   * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $w
-   * @param float $h
-   */
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    }
+
+    /**
+     * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $w
+     * @param float $h
+     */
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
     if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
-  }
-
-  /**
-   * Returns true if the page is full and is no longer accepting frames.
-   *
-   * @return bool
-   */
-  function is_full() {
+        $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    }
+
+    /**
+     * Returns true if the page is full and is no longer accepting frames.
+     *
+     * @return bool
+     */
+    function is_full() {
     return $this->_page_full;
-  }
+    }
 
-  /**
-   * Start a new page by resetting the full flag.
-   */
-  function next_page() {
+    /**
+     * Start a new page by resetting the full flag.
+     */
+    function next_page() {
     $this->_renderer->new_page();
     $this->_page_full = false;
-  }
+    }
 
-  /**
-   * Indicate to the page that a table is currently being reflowed.
-   */
-  function table_reflow_start() {
+    /**
+     * Indicate to the page that a table is currently being reflowed.
+     */
+    function table_reflow_start() {
     $this->_in_table++;
-  }
+    }
 
-  /**
-   * Indicate to the page that table reflow is finished.
-   */
-  function table_reflow_end() {
+    /**
+     * Indicate to the page that table reflow is finished.
+     */
+    function table_reflow_end() {
     $this->_in_table--;
-  }
-
-  /**
-   * Return whether we are currently in a nested table or not
-   *
-   * @return bool
-   */
-  function in_nested_table() {
+    }
+
+    /**
+     * Return whether we are currently in a nested table or not
+     *
+     * @return bool
+     */
+    function in_nested_table() {
     return $this->_in_table > 1;
-  }
+    }
   
-  /**
-   * Check if a forced page break is required before $frame.  This uses the
-   * frame's page_break_before property as well as the preceeding frame's
-   * page_break_after property.
-   *
-   * @link http://www.w3.org/TR/CSS21/page.html#forced
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
-   */
-  function check_forced_page_break(Frame $frame) {
+    /**
+     * Check if a forced page break is required before $frame.  This uses the
+     * frame's page_break_before property as well as the preceeding frame's
+     * page_break_after property.
+     *
+     * @link http://www.w3.org/TR/CSS21/page.html#forced
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a page break occured
+     */
+    function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
     if ( $this->_page_full )
-      return;
+        return;
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
@@ -185,42 +184,42 @@ 
     $style = $frame->get_style();
 
     if ( !in_array($style->display, $block_types) )
-      return false;
+        return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
     while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+        $prev = $prev->get_prev_sibling();
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
-      // Prevent cascading splits
-      $frame->split();
-      // We have to grab the style again here because split() resets
-      // $frame->style to the frame's orignal style.
-      $frame->get_style()->page_break_before = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        // We have to grab the style again here because split() resets
+        // $frame->style to the frame's orignal style.
+        $frame->get_style()->page_break_before = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
-      // Prevent cascading splits
-      $frame->split();
-      $prev->get_style()->page_break_after = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        $prev->get_style()->page_break_after = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     return false;
-  }
-
-  /**
-   * Determine if a page break is allowed before $frame
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a break is allowed, false otherwise
-   */
-  protected function _page_break_allowed(Frame $frame) {
+    }
+
+    /**
+     * Determine if a page break is allowed before $frame
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a break is allowed, false otherwise
+     */
+    protected function _page_break_allowed(Frame $frame) {
     /**
      *
      * http://www.w3.org/TR/CSS21/page.html#allowed-page-breaks
@@ -276,162 +275,162 @@ 
     // Block Frames (1):
     if ( in_array($display, $block_types) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
         dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rules A & B
+        // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+        if ( $frame->get_style()->page_break_before === "avoid" ) {
         dompdf_debug("page-break", "before: avoid");
         return false;
-      }
+        }
 
-      // Find the preceeding block-level sibling
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+        // Find the preceeding block-level sibling
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && !in_array($prev->get_style()->display, $block_types) )
         $prev = $prev->get_prev_sibling();
 
-      // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+        // Does the previous element allow a page break after?
+        if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
         dompdf_debug("page-break", "after: avoid");
         return false;
-      }
+        }
 
-      // If both $prev & $frame have the same parent, check the parent's
-      // page_break_inside property.
-      $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent inside: avoid");
+        // If both $prev & $frame have the same parent, check the parent's
+        // page_break_inside property.
+        $parent = $frame->get_parent();
+        if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+            dompdf_debug("page-break", "parent inside: avoid");
         return false;
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame is
-      // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame is
+        // on the page before splitting.
+        if ( $parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // If the frame is the first block-level frame, use the value from
-      // $frame's parent instead.
-      if ( !$prev && $parent )
+        // If the frame is the first block-level frame, use the value from
+        // $frame's parent instead.
+        if ( !$prev && $parent )
         return $this->_page_break_allowed( $parent );
 
-      dompdf_debug("page-break", "block: break allowed");
-      return true;
+        dompdf_debug("page-break", "block: break allowed");
+        return true;
 
     }
 
     // Inline frames (2):
     else if ( in_array($display, Style::$INLINE_TYPES) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
+            dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rule C
-      $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
-          dompdf_debug("page-break", "orphans");
+        // Rule C
+        $block_parent = $frame->find_block_parent();
+        if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+            dompdf_debug("page-break", "orphans");
         return false;
-      }
+        }
 
-      // FIXME: Checking widows is tricky without having laid out the
-      // remaining line boxes.  Just ignore it for now...
+        // FIXME: Checking widows is tricky without having laid out the
+        // remaining line boxes.  Just ignore it for now...
 
-      // Rule D
-      $p = $block_parent;
-      while ($p) {
+        // Rule D
+        $p = $block_parent;
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame with
-      // some content is on the page before splitting.
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame with
+        // some content is on the page before splitting.
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+        if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
+        // Skip breaks on empty text nodes
+        if ( $frame->get_node()->nodeName === "#text" &&
            $frame->get_node()->nodeValue == "" )
         return false;
 
-      dompdf_debug("page-break", "inline: break allowed");
-      return true;
+        dompdf_debug("page-break", "inline: break allowed");
+        return true;
 
     // Table-rows
     } else if ( $display === "table-row" ) {
 
-      // Simply check if the parent table's page_break_inside property is
-      // not 'avoid'
-      $p = Table_Frame_Decorator::find_parent_table($frame);
+        // Simply check if the parent table's page_break_inside property is
+        // not 'avoid'
+        $p = Table_Frame_Decorator::find_parent_table($frame);
 
-      while ($p) {
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
-         dompdf_debug("page-break", "table: first-row");
+        // Avoid breaking after the first row of a table
+        if ( $p && $p->get_first_child() === $frame) {
+            dompdf_debug("page-break", "table: first-row");
         return false;
-      }
+        }
 
-      // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+        // If this is a nested table, prevent the page from breaking
+        if ( $this->_in_table > 1 ) {
         dompdf_debug("page-break", "table: nested table");
         return false;
-      }
+        }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
-      return true;
+        dompdf_debug("page-break","table-row/row-groups: break allowed");
+        return true;
 
     } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      // Disallow breaks at row-groups: only split at row boundaries
-      return false;
+        // Disallow breaks at row-groups: only split at row boundaries
+        return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
-      return false;
+        dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+        return false;
+    }
+
     }
 
-  }
-
-  /**
-   * Check if $frame will fit on the page.  If the frame does not fit,
-   * the frame tree is modified so that a page break occurs in the
-   * correct location.
-   *
-   * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
-   */
-  function check_page_break(Frame $frame) {
+    /**
+     * Check if $frame will fit on the page.  If the frame does not fit,
+     * the frame tree is modified so that a page break occurs in the
+     * correct location.
+     *
+     * @param Frame $frame the frame to check
+     * @return Frame the frame following the page break
+     */
+    function check_page_break(Frame $frame) {
     // Do not split if we have already
     if ( $this->_page_full )
-      return false;
+        return false;
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -440,18 +439,18 @@ 
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
     while ( $p ) {
-      $style = $p->get_style();
-      $max_y += $style->length_in_pt(array($style->margin_bottom,
-                                           $style->padding_bottom,
-                                           $style->border_bottom_width));
-      $p = $p->get_parent();
+        $style = $p->get_style();
+        $max_y += $style->length_in_pt(array($style->margin_bottom,
+                                            $style->padding_bottom,
+                                            $style->border_bottom_width));
+        $p = $p->get_parent();
     }
 
 
     // Check if $frame flows off the page
     if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
-      return false;
+        // no: do nothing
+        return false;
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -466,58 +465,58 @@ 
     dompdf_debug("page-break","Starting search");
     while ( $iter ) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
-         dompdf_debug("page-break", "reached root.");
+        if ( $iter === $this ) {
+            dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
-      }
+        }
 
-      if ( $this->_page_break_allowed($iter) ) {
+        if ( $this->_page_break_allowed($iter) ) {
         dompdf_debug("page-break","break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
-      }
+        }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
-         dompdf_debug("page-break", "following last child.");
+        if ( !$flg && $next = $iter->get_last_child() ) {
+            dompdf_debug("page-break", "following last child.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         $iter = $next;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_prev_sibling() ) {
-         dompdf_debug("page-break", "following prev sibling.");
+        if ( $next = $iter->get_prev_sibling() ) {
+            dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
              !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
                   in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = false;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_parent() ) {
-         dompdf_debug("page-break", "following parent.");
+        if ( $next = $iter->get_parent() ) {
+            dompdf_debug("page-break", "following parent.");
 
         if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = true;
         continue;
-      }
+        }
 
-      break;
+        break;
 
     }
 
@@ -528,33 +527,33 @@ 
 
     // If we are in a table, backtrack to the nearest top-level table row
     if ( $this->_in_table ) {
-      $num_tables = $this->_in_table - 1;
+        $num_tables = $this->_in_table - 1;
 
-      $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+        $iter = $frame;
+        while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
         $iter = $iter->get_parent();
         $num_tables--;
-      }
+        }
 
-      $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+        $iter = $frame;
+        while ($iter && $iter->get_style()->display !== "table-row" )
         $iter = $iter->get_parent();
 
-      $iter->split();
-      $this->_page_full = true;
-      return true;
+        $iter->split();
+        $this->_page_full = true;
+        return true;
     }
 
     $frame->split();
     $this->_page_full = true;
     return true;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function split($frame = null) {
+    function split($frame = null) {
     // Do nothing
-  }
+    }
 
 }

Spacing +55 added lines, -55 removed lines

@@ -117,9 +117,9 @@ 
    * @param float $h
    */
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    parent::set_containing_block($x,$y,$w,$h);
+    parent::set_containing_block($x, $y, $w, $h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
+    if (isset($h))
       $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
@@ -176,7 +176,7 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return;
 
     $block_types = array("block", "list-item", "table");
@@ -184,15 +184,15 @@ 
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
+    if (!in_array($style->display, $block_types))
       return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+    while ($prev && !in_array($prev->get_style()->display, $block_types))
       $prev = $prev->get_prev_sibling();
 
-    if ( in_array($style->page_break_before, $page_breaks) ) {
+    if (in_array($style->page_break_before, $page_breaks)) {
 
       // Prevent cascading splits
       $frame->split();
@@ -203,7 +203,7 @@ 
       return true;
     }
 
-    if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
+    if (($prev && in_array($prev->get_style()->page_break_after, $page_breaks))) {
       // Prevent cascading splits
       $frame->split();
       $prev->get_style()->page_break_after = "auto";
@@ -270,32 +270,32 @@ 
      */
 
     $block_types = array("block", "list-item", "table");
-    dompdf_debug("page-break", "_page_break_allowed(" . $frame->get_node()->nodeName. ")");
+    dompdf_debug("page-break", "_page_break_allowed(".$frame->get_node()->nodeName.")");
     $display = $frame->get_style()->display;
 
     // Block Frames (1):
-    if ( in_array($display, $block_types) ) {
+    if (in_array($display, $block_types)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-        dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+        dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+      if ($frame->get_style()->page_break_before === "avoid") {
         dompdf_debug("page-break", "before: avoid");
         return false;
       }
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+      while ($prev && !in_array($prev->get_style()->display, $block_types))
         $prev = $prev->get_prev_sibling();
 
       // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+      if ($prev && $prev->get_style()->page_break_after === "avoid") {
         dompdf_debug("page-break", "after: avoid");
         return false;
       }
@@ -303,7 +303,7 @@ 
       // If both $prev & $frame have the same parent, check the parent's
       // page_break_inside property.
       $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+      if ($prev && $parent && $parent->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent inside: avoid");
         return false;
       }
@@ -311,7 +311,7 @@ 
       // To prevent cascading page breaks when a top-level element has
       // page-break-inside: avoid, ensure that at least one frame is
       // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
@@ -319,8 +319,8 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if (!$prev && $parent)
+        return $this->_page_break_allowed($parent);
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -328,17 +328,17 @@ 
     }
 
     // Inline frames (2):
-    else if ( in_array($display, Style::$INLINE_TYPES) ) {
+    else if (in_array($display, Style::$INLINE_TYPES)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+          dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rule C
       $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+      if (count($block_parent->get_lines()) < $frame->get_style()->orphans) {
           dompdf_debug("page-break", "orphans");
         return false;
       }
@@ -349,7 +349,7 @@ 
       // Rule D
       $p = $block_parent;
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -360,32 +360,32 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+      while ($prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == ""))
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($block_parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
       }
 
       // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
+      if ($frame->get_node()->nodeName === "#text" &&
+           $frame->get_node()->nodeValue == "")
         return false;
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
 
     // Table-rows
-    } else if ( $display === "table-row" ) {
+    } else if ($display === "table-row") {
 
       // Simply check if the parent table's page_break_inside property is
       // not 'avoid'
       $p = Table_Frame_Decorator::find_parent_table($frame);
 
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -393,28 +393,28 @@ 
       }
 
       // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
+      if ($p && $p->get_first_child() === $frame) {
          dompdf_debug("page-break", "table: first-row");
         return false;
       }
 
       // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+      if ($this->_in_table > 1) {
         dompdf_debug("page-break", "table: nested table");
         return false;
       }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
+      dompdf_debug("page-break", "table-row/row-groups: break allowed");
       return true;
 
-    } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+    } else if (in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       // Disallow breaks at row-groups: only split at row boundaries
       return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+      dompdf_debug("page-break", "? ".$frame->get_style()->display."");
       return false;
     }
 
@@ -430,7 +430,7 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return false;
 
     // Determine the frame's maximum y value
@@ -439,7 +439,7 @@ 
     // If a split is to occur here, then the bottom margins & paddings of all
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
-    while ( $p ) {
+    while ($p) {
       $style = $p->get_style();
       $max_y += $style->length_in_pt(array($style->margin_bottom,
                                            $style->padding_bottom,
@@ -449,12 +449,12 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
+    if ($max_y <= $this->_bottom_page_margin)
       // no: do nothing
       return false;
 
     dompdf_debug("page-break", "check_page_break");
-    dompdf_debug("page-break", "in_table: " . $this->_in_table);
+    dompdf_debug("page-break", "in_table: ".$this->_in_table);
 
 
     // yes: determine page break location
@@ -463,42 +463,42 @@ 
 
     $in_table = $this->_in_table;
 
-    dompdf_debug("page-break","Starting search");
-    while ( $iter ) {
+    dompdf_debug("page-break", "Starting search");
+    while ($iter) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
+      if ($iter === $this) {
          dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
       }
 
-      if ( $this->_page_break_allowed($iter) ) {
-        dompdf_debug("page-break","break allowed, splitting.");
+      if ($this->_page_break_allowed($iter)) {
+        dompdf_debug("page-break", "break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
       }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
+      if (!$flg && $next = $iter->get_last_child()) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
         $iter = $next;
         continue;
       }
 
-      if ( $next = $iter->get_prev_sibling() ) {
+      if ($next = $iter->get_prev_sibling()) {
          dompdf_debug("page-break", "following prev sibling.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        else if (!in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -506,10 +506,10 @@ 
         continue;
       }
 
-      if ( $next = $iter->get_parent() ) {
+      if ($next = $iter->get_parent()) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -527,17 +527,17 @@ 
     dompdf_debug("page-break", "no valid break found, just splitting.");
 
     // If we are in a table, backtrack to the nearest top-level table row
-    if ( $this->_in_table ) {
+    if ($this->_in_table) {
       $num_tables = $this->_in_table - 1;
 
       $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+      while ($iter && $num_tables && $iter->get_style->display !== "table") {
         $iter = $iter->get_parent();
         $num_tables--;
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+      while ($iter && $iter->get_style()->display !== "table-row")
         $iter = $iter->get_parent();
 
       $iter->split();

Braces +46 added lines, -32 removed lines

@@ -119,8 +119,10 @@ 
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    if ( isset($h) ) {
+          $this->_bottom_page_margin = $h;
+    }
+    // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
   /**
@@ -176,21 +178,24 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
-      return;
+    if ( $this->_page_full ) {
+          return;
+    }
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
-      return false;
+    if ( !in_array($style->display, $block_types) ) {
+          return false;
+    }
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+    while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+          $prev = $prev->get_prev_sibling();
+    }
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
@@ -291,8 +296,9 @@ 
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       // Does the previous element allow a page break after?
       if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
@@ -319,8 +325,9 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if ( !$prev && $parent ) {
+              return $this->_page_break_allowed( $parent );
+      }
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -360,8 +367,9 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
@@ -371,8 +379,9 @@ 
 
       // Skip breaks on empty text nodes
       if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
-        return false;
+           $frame->get_node()->nodeValue == "" ) {
+              return false;
+      }
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
@@ -430,8 +439,9 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
-      return false;
+    if ( $this->_page_full ) {
+          return false;
+    }
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -449,9 +459,10 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
+    if ( $max_y <= $this->_bottom_page_margin ) {
+          // no: do nothing
       return false;
+    }
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -483,8 +494,9 @@ 
       if ( !$flg && $next = $iter->get_last_child() ) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        }
 
         $iter = $next;
         continue;
@@ -494,12 +506,12 @@ 
          dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
-
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        } else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = false;
@@ -509,8 +521,9 @@ 
       if ( $next = $iter->get_parent() ) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = true;
@@ -537,8 +550,9 @@ 
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
-        $iter = $iter->get_parent();
+      while ($iter && $iter->get_style()->display !== "table-row" ) {
+              $iter = $iter->get_parent();
+      }
 
       $iter->split();
       $this->_page_full = true;

main/inc/lib/phpdocx/pdf/include/pdflib_adapter.cls.php

Doc Comments +5 added lines, -2 removed lines

@@ -442,6 +442,9 @@ 
    * @param string corner
    * @param string join
    * @param array dash
+   * @param double $width
+   * @param string $cap
+   * @param string $join
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
@@ -795,8 +798,8 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
+   * @param integer $adjust word spacing adjustment
+   * @param integer $angle angle to write the text at, measured CW starting from the x-axis
    */
   function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
                      $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {

Indentation +527 added lines, -527 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: pdflib_adapter.cls.php,v $
- * Created on: 2005-02-28
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - Clarify temp file name, optional debug output for temp file tracking
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: pdflib_adapter.cls.php,v $
+     * Created on: 2005-02-28
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - Clarify temp file name, optional debug output for temp file tracking
+     */
 
 /* $Id: pdflib_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -61,170 +61,170 @@ 
  */
 class PDFLib_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
-  /**
-   * Fudge factor to adjust reported font heights
-   *
-   * CPDF reports larger font heights than PDFLib.  This factor
-   * adjusts the height reported by get_font_height().
-   *
-   * @var float
-   */
-  const FONT_HEIGHT_SCALE = 1.2;
-
-  /**
-   * Whether to create PDFs in memory or on disk
-   *
-   * @var bool
-   */
-  static $IN_MEMORY = true;
-
-  /**
-   * Instance of PDFLib class
-   *
-   * @var PDFlib
-   */
-  private $_pdf;
-
-  /**
-   * Name of temporary file used for PDFs created on disk
-   *
-   * @var string
-   */
-  private $_file;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var height
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Cache of image handles
-   *
-   * @var array
-   */
-  private $_imgs;
-
-  /**
-   * Cache of font handles
-   *
-   * @var array
-   */
-  private $_fonts;
-
-  /**
-   * List of objects (templates) to add to multiple pages
-   *
-   * @var array
-   */
-  private $_objs;
-
-  /**
-   * Current page number
-   *
-   * @var int
-   */
-  private $_page_number;
-
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accesing after rendering is initially complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Fudge factor to adjust reported font heights
+     *
+     * CPDF reports larger font heights than PDFLib.  This factor
+     * adjusts the height reported by get_font_height().
+     *
+     * @var float
+     */
+    const FONT_HEIGHT_SCALE = 1.2;
+
+    /**
+     * Whether to create PDFs in memory or on disk
+     *
+     * @var bool
+     */
+    static $IN_MEMORY = true;
+
+    /**
+     * Instance of PDFLib class
+     *
+     * @var PDFlib
+     */
+    private $_pdf;
+
+    /**
+     * Name of temporary file used for PDFs created on disk
+     *
+     * @var string
+     */
+    private $_file;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var height
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Cache of image handles
+     *
+     * @var array
+     */
+    private $_imgs;
+
+    /**
+     * Cache of font handles
+     *
+     * @var array
+     */
+    private $_fonts;
+
+    /**
+     * List of objects (templates) to add to multiple pages
+     *
+     * @var array
+     */
+    private $_objs;
+
+    /**
+     * Current page number
+     *
+     * @var int
+     */
+    private $_page_number;
+
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accesing after rendering is initially complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+        $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
-      $size = self::$PAPER_SIZES["letter"];
+        $size = self::$PAPER_SIZES["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
     $this->_width = $size[2] - $size[0];
     $this->_height= $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+    if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
 
-	$this->_pdf->set_parameter("textformat", "utf8");
+    $this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
     if ( function_exists("date_default_timezone_get") ) {
-      $tz = @date_default_timezone_get();
-      date_default_timezone_set("UTC");
-      $this->_pdf->set_info("Date", date("Y-m-d"));
-      date_default_timezone_set($tz);
+        $tz = @date_default_timezone_get();
+        date_default_timezone_set("UTC");
+        $this->_pdf->set_info("Date", date("Y-m-d"));
+        date_default_timezone_set($tz);
     } else {
-      $this->_pdf->set_info("Date", date("Y-m-d"));
+        $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
     if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+        $this->_pdf->begin_document("","");
     else {
-      $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+        $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
+        $this->_pdf->begin_document($this->_file,"");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -239,155 +239,155 @@ 
     // Set up font paths
     $families = Font_Metrics::get_font_families();
     foreach ($families as $family => $files) {
-      foreach ($files as $style => $file) {
+        foreach ($files as $style => $file) {
         $face = basename($file);
 
         // Prefer ttfs to afms
         if ( file_exists($file.".ttf") ) {
-          $outline = "$file.ttf";
-          $afm = null;
+            $outline = "$file.ttf";
+            $afm = null;
 
         } else if ( file_exists($file .".TTF") ) {
-          $outline = "$file.TTF";
-          $afm = null;
+            $outline = "$file.TTF";
+            $afm = null;
 
         } else if ( file_exists($file . ".pfb") ) {
-          $outline = "$file.pfb";
+            $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+            if ( file_exists($file . ".afm") )
             $afm = "$file.afm";
 
         } else if ( file_exists($file . ".PFB") ) {
-          $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+            $outline = "$file.PFB";
+            if ( file_exists($file . ".AFM") )
             $afm = "$file.AFM";
         } else
-          continue;
+            continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
         if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
-      }
+            $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
+    }
     }
-  }
 
-  /**
-   * Close the pdf
-   */
-  protected function _close() {
+    /**
+     * Close the pdf
+     */
+    protected function _close() {
     $this->_place_objects();
 
     // Close all pages
     $this->_pdf->suspend_page("");
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
-      $this->_pdf->end_page_ext("");
+        $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->end_page_ext("");
     }
 
     $this->_pdf->end_document("");
-  }
-
-
-  /**
-   * Returns the PDFLib instance
-   *
-   * @return PDFLib
-   */
-  function get_pdflib() { return $this->_pdf; }
-
-  /**
-   * Add meta information to the PDF
-   *
-   * @param string $label  label of the value (Creator, Producter, etc.)
-   * @param string $value  the text to set
-   */
-  function add_info($label, $value) {
+    }
+
+
+    /**
+     * Returns the PDFLib instance
+     *
+     * @return PDFLib
+     */
+    function get_pdflib() { return $this->_pdf; }
+
+    /**
+     * Add meta information to the PDF
+     *
+     * @param string $label  label of the value (Creator, Producter, etc.)
+     * @param string $value  the text to set
+     */
+    function add_info($label, $value) {
     $this->_pdf->set_info($label, $value);
-  }
+    }
   
-  /**
-   * Opens a new 'object' (template in PDFLib-speak)
-   *
-   * While an object is open, all drawing actions are recorded to the
-   * object instead of being drawn on the current page.  Objects can
-   * be added later to a specific page or to several pages.
-   *
-   * The return value is an integer ID for the new object.
-   *
-   * @see PDFLib_Adapter::close_object()
-   * @see PDFLib_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    /**
+     * Opens a new 'object' (template in PDFLib-speak)
+     *
+     * While an object is open, all drawing actions are recorded to the
+     * object instead of being drawn on the current page.  Objects can
+     * be added later to a specific page or to several pages.
+     *
+     * The return value is an integer ID for the new object.
+     *
+     * @see PDFLib_Adapter::close_object()
+     * @see PDFLib_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $this->_pdf->suspend_page("");
     $ret = $this->_pdf->begin_template($this->_width, $this->_height);
     $this->_pdf->save();
     $this->_objs[$ret] = array("start_page" => $this->_page_number);
     return $ret;
-  }
-
-  /**
-   * Reopen an existing object (NOT IMPLEMENTED)
-   *
-   * PDFLib does not seem to support reopening templates.
-   *
-   * @param int $object the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopen an existing object (NOT IMPLEMENTED)
+     *
+     * PDFLib does not seem to support reopening templates.
+     *
+     * @param int $object the ID of a previously opened object
+     */
+    function reopen_object($object) {
     throw new DOMPDF_Exception("PDFLib does not support reopening objects.");
-  }
-
-  /**
-   * Close the current template
-   *
-   * @see PDFLib_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Close the current template
+     *
+     * @see PDFLib_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restore();
     $this->_pdf->end_template();
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
-
-  /**
-   * Adds the specified object to the document
-   *
-   * $where can be one of:
-   * - 'add' add to current page only
-   * - 'all' add to every page from the current one onwards
-   * - 'odd' add to all odd numbered pages from now on
-   * - 'even' add to all even numbered pages from now on
-   * - 'next' add the object to the next page only
-   * - 'nextodd' add to all odd numbered pages from the next one
-   * - 'nexteven' add to all even numbered pages from the next one
-   *
-   * @param int $object the object handle returned by open_object()
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds the specified object to the document
+     *
+     * $where can be one of:
+     * - 'add' add to current page only
+     * - 'all' add to every page from the current one onwards
+     * - 'odd' add to all odd numbered pages from now on
+     * - 'even' add to all even numbered pages from now on
+     * - 'next' add the object to the next page only
+     * - 'nextodd' add to all odd numbered pages from the next one
+     * - 'nexteven' add to all even numbered pages from the next one
+     *
+     * @param int $object the object handle returned by open_object()
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
 
     if ( mb_strpos($where, "next") !== false ) {
-      $this->_objs[$object]["start_page"]++;
-      $where = str_replace("next", "", $where);
-      if ( $where == "" )
+        $this->_objs[$object]["start_page"]++;
+        $where = str_replace("next", "", $where);
+        if ( $where == "" )
         $where = "add";
     }
 
     $this->_objs[$object]["where"] = $where;
-  }
-
-  /**
-   * Stops the specified template from appearing in the document.
-   *
-   * The object will stop being displayed on the page following the
-   * current one.
-   *
-   * @param int $object
-   */
-  function stop_object($object) {
+    }
+
+    /**
+     * Stops the specified template from appearing in the document.
+     *
+     * The object will stop being displayed on the page following the
+     * current one.
+     *
+     * @param int $object
+     */
+    function stop_object($object) {
 
     if ( !isset($this->_objs[$object]) )
-      return;
+        return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -397,74 +397,74 @@ 
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
           ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+        $this->_pdf->fit_image($object,0,0,"");
 
     unset($this->_objs[$object]);
-  }
+    }
 
-  /**
-   * Add all active objects to the current page
-   */
-  protected function _place_objects() {
+    /**
+     * Add all active objects to the current page
+     */
+    protected function _place_objects() {
 
     foreach ( $this->_objs as $obj => $props ) {
-      $start = $props["start_page"];
-      $where = $props["where"];
+        $start = $props["start_page"];
+        $where = $props["where"];
 
-      // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+        // Place the object on this page if required
+        if ( $this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
             ($where === "all")) ) {
         $this->_pdf->fit_image($obj,0,0,"");
-      }
+        }
     }
 
-  }
+    }
 
-  function get_width() { return $this->_width; }
+    function get_width() { return $this->_width; }
 
-  function get_height() { return $this->_height; }
+    function get_height() { return $this->_height; }
 
-  function get_page_number() { return $this->_page_number; }
+    function get_page_number() { return $this->_page_number; }
 
-  function get_page_count() { return $this->_page_count; }
+    function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+    function set_page_number($num) { $this->_page_number = (int)$num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+    function set_page_count($count) { $this->_page_count = (int)$count; }
 
 
-  /**
-   * Sets the line style
-   *
-   * @param float width
-   * @param string corner
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    /**
+     * Sets the line style
+     *
+     * @param float width
+     * @param string corner
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
 
     if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+        $dash[] = $dash[0];
 
     if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+        $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
     else
-      $this->_pdf->setdash(0,0);
+        $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
     case "miter":
       $this->_pdf->setlinejoin(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinejoin(1);
-      break;
+        break;
 
     case "bevel":
       $this->_pdf->setlinejoin(2);
-      break;
+        break;
 
     default:
       break;
@@ -473,15 +473,15 @@ 
     switch ( $cap ) {
     case "butt":
       $this->_pdf->setlinecap(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinecap(1);
-      break;
+        break;
 
     case "square":
       $this->_pdf->setlinecap(2);
-      break;
+        break;
 
     default:
       break;
@@ -489,69 +489,69 @@ 
 
     $this->_pdf->setlinewidth($width);
 
-  }
+    }
 
-  /**
-   * Sets the line color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the line color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_stroke_color($color) {
     if($this->_last_stroke_color == $color)
-    	return;
+        return;
 
     $this->_last_stroke_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
-  }
-
-  /**
-   * Sets the fill color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_fill_color($color) {
+    }
+
+    /**
+     * Sets the fill color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_fill_color($color) {
     if($this->_last_fill_color == $color)
-    	return;
+        return;
 
     $this->_last_fill_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
-  }
+    }
 
-  /**
-   * Loads a specific font and stores the corresponding descriptor.
-   *
-   * @param string $font
-   * @return int the font descriptor for the font
-   */
-  protected function _load_font($font, $encoding = null, $options = "") {
+    /**
+     * Loads a specific font and stores the corresponding descriptor.
+     *
+     * @param string $font
+     * @return int the font descriptor for the font
+     */
+    protected function _load_font($font, $encoding = null, $options = "") {
 
     // Check if the font is a native PDF font
     // Embed non-native fonts
     $native_fonts = array("courier", "courier-bold", "courier-oblique", "courier-boldoblique",
-                          "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
-                          "times-roman", "times-bold", "times-italic", "times-bolditalic",
-                          "symbol", "zapfdinbats");
+                            "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
+                            "times-roman", "times-bold", "times-italic", "times-bolditalic",
+                            "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
     if ( in_array($test, $native_fonts) ) {
-      $font = basename($font);
+        $font = basename($font);
 
     } else {
-      // Embed non-native fonts
-      $options .= " embedding=true";
+        // Embed non-native fonts
+        $options .= " embedding=true";
     }
 
     if ( is_null($encoding) ) {
 
-      // Unicode encoding is only available for the commerical
-      // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        // Unicode encoding is only available for the commerical
+        // version of PDFlib and not PDFlib-Lite
+        if ( defined("DOMPDF_PDFLIB_LICENSE") )
         $encoding = "unicode";
-      else
+        else
         $encoding = "auto";
 
     }
@@ -559,28 +559,28 @@ 
     $key = $font .":". $encoding .":". $options;
 
     if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
+        return $this->_fonts[$key];
 
     else {
 
-      $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
-      return $this->_fonts[$key];
+        $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
+        return $this->_fonts[$key];
 
     }
 
-  }
+    }
 
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
 
-  //........................................................................
+    //........................................................................
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
     $this->_set_line_style($width, "butt", "", $style);
     $this->_set_stroke_color($color);
 
@@ -590,11 +590,11 @@ 
     $this->_pdf->moveto($x1,$y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
 
@@ -602,93 +602,93 @@ 
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_set_fill_color($color);
 
     $y1 = $this->y($y1) - $h;
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->fill();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
     $this->_pdf->moveto($x,$y);
 
     while (count($points) > 1) {
-      $y = $this->y(array_pop($points));
-      $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+        $y = $this->y(array_pop($points));
+        $x = array_pop($points);
+        $this->_pdf->lineto($x,$y);
     }
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->closepath_stroke();
-  }
+        $this->_pdf->closepath_stroke();
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->stroke();
+        $this->_pdf->stroke();
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     $w = (int)$w;
     $h = (int)$h;
 
     $img_type = strtolower($img_type);
 
     if ( $img_type === "jpg" )
-      $img_type = "jpeg";
+        $img_type = "jpeg";
 
     if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+        $img = $this->_imgs[$img_url];
 
     else {
 
-      $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
+        $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
 
     $y = $this->y($y) - $h;
     $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -701,72 +701,72 @@ 
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     $this->_pdf->add_nameddest($anchorname,"");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
     if ( strpos($url, '#') === 0 ) {
-      // Local link
-      $name = substr($url,1);
-      if ( $name )
+        // Local link
+        $name = substr($url,1);
+        if ( $name )
         $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
     } else {
 
-      list($proto, $host, $path, $file) = explode_url($url);
+        list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+        if ( $proto == "" || $proto === "file://" )
         return; // Local links are not allowed
-      $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+        $url = build_url($proto, $host, $path, $file);
+        $url = '{' . rawurldecode($url) . '}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
-      $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+        $action = $this->_pdf->create_action("URI", "url=" . $url);
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
     $num_spaces = mb_substr_count($text," ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
 
     $fh = $this->_load_font($font);
 
@@ -777,54 +777,54 @@ 
 
     // $desc is usually < 0,
     return self::FONT_HEIGHT_SCALE * $size * ($asc - $desc);
-  }
-
-  //........................................................................
-
-  /**
-   * Writes text at the specified x and y coordinates on every page
-   *
-   * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
-   * with their current values.
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
-   */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
+    }
+
+    //........................................................................
+
+    /**
+     * Writes text at the specified x and y coordinates on every page
+     *
+     * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
+     * with their current values.
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle angle to write the text at, measured CW starting from the x-axis
+     */
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
+                        $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
-  }
-
-  //........................................................................
-
-  /**
-   * Processes a script on every page
-   *
-   * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
-   *
-   * This function can be used to add page numbers to all pages
-   * after the first one, for example.
-   *
-   * @param string $code the script code
-   * @param string $type the language type for script
-   */
-  function page_script($code, $type = "text/php") {
+    }
+
+    //........................................................................
+
+    /**
+     * Processes a script on every page
+     *
+     * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
+     *
+     * This function can be used to add page numbers to all pages
+     * after the first one, for example.
+     *
+     * @param string $code the script code
+     * @param string $type the language type for script
+     */
+    function page_script($code, $type = "text/php") {
     $_t = "script";
     $this->_page_text[] = compact("_t", "code", "type");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function new_page() {
+    function new_page() {
 
     // Add objects to the current page
     $this->_place_objects();
@@ -833,69 +833,69 @@ 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
     $this->_page_number = ++$this->_page_count;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add text to each page after rendering is complete
-   */
-  protected function _add_page_text() {
+    /**
+     * Add text to each page after rendering is complete
+     */
+    protected function _add_page_text() {
 
     if ( !count($this->_page_text) )
-      return;
+        return;
 
     $this->_pdf->suspend_page("");
 
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->resume_page("pagenumber=$p");
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
 
         case "text":
           $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $this->_page_count), $text);
-          $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+                                array($p, $this->_page_count), $text);
+            $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+            break;
 
         case "script":
           if (!$eval) {
             $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->_pdf->suspend_page("");
+        $this->_pdf->suspend_page("");
     }
 
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function stream($filename, $options = null) {
+    function stream($filename, $options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY ) {
-      $data = $this->_pdf->get_buffer();
-      $size = strlen($data);
+        $data = $this->_pdf->get_buffer();
+        $size = strlen($data);
 
     } else
-      $size = filesize($this->_file);
+        $size = filesize($this->_file);
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -908,63 +908,63 @@ 
     //header("Content-length: " . $size);
 
     if ( self::$IN_MEMORY )
-      echo $data;
+        echo $data;
 
     else {
 
-      // Chunked readfile()
-      $chunk = (1 << 21); // 2 MB
-      $fh = fopen($this->_file, "rb");
-      if ( !$fh )
+        // Chunked readfile()
+        $chunk = (1 << 21); // 2 MB
+        $fh = fopen($this->_file, "rb");
+        if ( !$fh )
         throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
 
-      while ( !feof($fh) )
+        while ( !feof($fh) )
         echo fread($fh,$chunk);
-      fclose($fh);
+        fclose($fh);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     flush();
 
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function output($options = null) {
+    function output($options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
+        $data = $this->_pdf->get_buffer();
 
     else {
-      $data = file_get_contents($this->_file);
+        $data = file_get_contents($this->_file);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     return $data;
-  }
+    }
 }
 
 // Workaround for idiotic limitation on statics...

Switch Indentation +34 added lines, -34 removed lines

@@ -454,37 +454,37 @@ 
       $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
-    case "miter":
-      $this->_pdf->setlinejoin(0);
-      break;
+        case "miter":
+          $this->_pdf->setlinejoin(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinejoin(1);
-      break;
+        case "round":
+          $this->_pdf->setlinejoin(1);
+          break;
 
-    case "bevel":
-      $this->_pdf->setlinejoin(2);
-      break;
+        case "bevel":
+          $this->_pdf->setlinejoin(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     switch ( $cap ) {
-    case "butt":
-      $this->_pdf->setlinecap(0);
-      break;
+        case "butt":
+          $this->_pdf->setlinecap(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinecap(1);
-      break;
+        case "round":
+          $this->_pdf->setlinecap(1);
+          break;
 
-    case "square":
-      $this->_pdf->setlinecap(2);
-      break;
+        case "square":
+          $this->_pdf->setlinecap(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     $this->_pdf->setlinewidth($width);
@@ -855,18 +855,18 @@ 
 
         switch ($_t) {
 
-        case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $this->_page_count), $text);
-          $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
-
-        case "script":
-          if (!$eval) {
-            $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "text":
+              $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                  array($p, $this->_page_count), $text);
+              $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+              break;
+
+            case "script":
+              if (!$eval) {
+                $eval = new PHP_Evaluator($this);
+              }
+              $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

Spacing +82 added lines, -82 removed lines

@@ -185,25 +185,25 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   function __construct($paper = "letter", $orientation = "portrait") {
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
       $size = self::$PAPER_SIZES["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
     }
     $this->_width = $size[2] - $size[0];
-    $this->_height= $size[3] - $size[1];
+    $this->_height = $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if (defined("DOMPDF_PDFLIB_LICENSE"))
+      $this->_pdf->set_parameter("license", DOMPDF_PDFLIB_LICENSE);
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -211,7 +211,7 @@ 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
-    if ( function_exists("date_default_timezone_get") ) {
+    if (function_exists("date_default_timezone_get")) {
       $tz = @date_default_timezone_get();
       date_default_timezone_set("UTC");
       $this->_pdf->set_info("Date", date("Y-m-d"));
@@ -220,11 +220,11 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+    if (self::$IN_MEMORY)
+      $this->_pdf->begin_document("", "");
     else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+      $this->_pdf->begin_document($this->_file, "");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -243,29 +243,29 @@ 
         $face = basename($file);
 
         // Prefer ttfs to afms
-        if ( file_exists($file.".ttf") ) {
+        if (file_exists($file.".ttf")) {
           $outline = "$file.ttf";
           $afm = null;
 
-        } else if ( file_exists($file .".TTF") ) {
+        } else if (file_exists($file.".TTF")) {
           $outline = "$file.TTF";
           $afm = null;
 
-        } else if ( file_exists($file . ".pfb") ) {
+        } else if (file_exists($file.".pfb")) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+          if (file_exists($file.".afm"))
             $afm = "$file.afm";
 
-        } else if ( file_exists($file . ".PFB") ) {
+        } else if (file_exists($file.".PFB")) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+          if (file_exists($file.".AFM"))
             $afm = "$file.AFM";
         } else
           continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
+        if (!is_null($afm))
           $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
       }
     }
@@ -366,10 +366,10 @@ 
    */
   function add_object($object, $where = 'all') {
 
-    if ( mb_strpos($where, "next") !== false ) {
+    if (mb_strpos($where, "next") !== false) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
+      if ($where == "")
         $where = "add";
     }
 
@@ -386,18 +386,18 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
+    if (!isset($this->_objs[$object]))
       return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
 
     // Place the object on this page if required
-    if ( $this->_page_number >= $start &&
+    if ($this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")))
+      $this->_pdf->fit_image($object, 0, 0, "");
 
     unset($this->_objs[$object]);
   }
@@ -407,16 +407,16 @@ 
    */
   protected function _place_objects() {
 
-    foreach ( $this->_objs as $obj => $props ) {
+    foreach ($this->_objs as $obj => $props) {
       $start = $props["start_page"];
       $where = $props["where"];
 
       // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+      if ($this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
-            ($where === "all")) ) {
-        $this->_pdf->fit_image($obj,0,0,"");
+            ($where === "all"))) {
+        $this->_pdf->fit_image($obj, 0, 0, "");
       }
     }
 
@@ -430,9 +430,9 @@ 
 
   function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+  function set_page_number($num) { $this->_page_number = (int) $num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+  function set_page_count($count) { $this->_page_count = (int) $count; }
 
 
   /**
@@ -445,15 +445,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
+    if (count($dash) == 1)
       $dash[] = $dash[0];
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    if (count($dash) > 1)
+      $this->_pdf->setdashpattern("dasharray={".join(" ", $dash)."}");
     else
-      $this->_pdf->setdash(0,0);
+      $this->_pdf->setdash(0, 0);
 
-    switch ( $join ) {
+    switch ($join) {
     case "miter":
       $this->_pdf->setlinejoin(0);
       break;
@@ -470,7 +470,7 @@ 
       break;
     }
 
-    switch ( $cap ) {
+    switch ($cap) {
     case "butt":
       $this->_pdf->setlinecap(0);
       break;
@@ -497,12 +497,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
+    if ($this->_last_stroke_color == $color)
     	return;
 
     $this->_last_stroke_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
   }
 
@@ -512,12 +512,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
+    if ($this->_last_fill_color == $color)
     	return;
 
     $this->_last_fill_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
   }
 
@@ -537,7 +537,7 @@ 
                           "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
-    if ( in_array($test, $native_fonts) ) {
+    if (in_array($test, $native_fonts)) {
       $font = basename($font);
 
     } else {
@@ -545,20 +545,20 @@ 
       $options .= " embedding=true";
     }
 
-    if ( is_null($encoding) ) {
+    if (is_null($encoding)) {
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+      if (defined("DOMPDF_PDFLIB_LICENSE"))
         $encoding = "unicode";
       else
         $encoding = "auto";
 
     }
 
-    $key = $font .":". $encoding .":". $options;
+    $key = $font.":".$encoding.":".$options;
 
-    if ( isset($this->_fonts[$key]) )
+    if (isset($this->_fonts[$key]))
       return $this->_fonts[$key];
 
     else {
@@ -587,7 +587,7 @@ 
     $y1 = $this->y($y1);
     $y2 = $this->y($y2);
 
-    $this->_pdf->moveto($x1,$y1);
+    $this->_pdf->moveto($x1, $y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
   }
@@ -622,20 +622,20 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
-    $this->_pdf->moveto($x,$y);
+    $this->_pdf->moveto($x, $y);
 
     while (count($points) > 1) {
       $y = $this->y(array_pop($points));
       $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+      $this->_pdf->lineto($x, $y);
     }
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->closepath_stroke();
@@ -648,14 +648,14 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->stroke();
@@ -665,15 +665,15 @@ 
   //........................................................................
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
-    $w = (int)$w;
-    $h = (int)$h;
+    $w = (int) $w;
+    $h = (int) $h;
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
+    if ($img_type === "jpg")
       $img_type = "jpeg";
 
-    if ( isset($this->_imgs[$img_url]) )
+    if (isset($this->_imgs[$img_url]))
       $img = $this->_imgs[$img_url];
 
     else {
@@ -682,13 +682,13 @@ 
     }
 
     $y = $this->y($y) - $h;
-    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
+    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'."$w $h".'} fitmethod=entire');
 
   }
 
   //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -696,8 +696,8 @@ 
 
     $y = $this->y($y) - Font_Metrics::get_font_height($font, $size);
 
-    $adjust = (float)$adjust;
-    $angle = -(float)$angle;
+    $adjust = (float) $adjust;
+    $angle = -(float) $angle;
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
@@ -717,7 +717,7 @@ 
    * @param string $anchorname The name of the named destination
    */
   function add_named_dest($anchorname) {
-    $this->_pdf->add_nameddest($anchorname,"");
+    $this->_pdf->add_nameddest($anchorname, "");
   }
 
   //........................................................................
@@ -734,21 +734,21 @@ 
   function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
-    if ( strpos($url, '#') === 0 ) {
+    if (strpos($url, '#') === 0) {
       // Local link
-      $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      $name = substr($url, 1);
+      if ($name)
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=".substr($url, 1)." linewidth=0");
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+      if ($proto == "" || $proto === "file://")
         return; // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+      $url = '{'.rawurldecode($url).'}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
+      $action = $this->_pdf->create_action("URI", "url=".$url);
       $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
     }
   }
@@ -759,7 +759,7 @@ 
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
-    $num_spaces = mb_substr_count($text," ");
+    $num_spaces = mb_substr_count($text, " ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
   }
@@ -798,8 +798,8 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle angle to write the text at, measured CW starting from the x-axis
    */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
+                     $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
   }
@@ -842,7 +842,7 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
+    if (!count($this->_page_text))
       return;
 
     $this->_pdf->suspend_page("");
@@ -856,7 +856,7 @@ 
         switch ($_t) {
 
         case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+          $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"),
                               array($p, $this->_page_count), $text);
           $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
           break;
@@ -883,14 +883,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY ) {
+    if (self::$IN_MEMORY) {
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
@@ -898,7 +898,7 @@ 
       $size = filesize($this->_file);
 
 
-    $filename = str_replace(array("\n","'"),"", $filename);
+    $filename = str_replace(array("\n", "'"), "", $filename);
     $attach = (isset($options["Attachment"]) && $options["Attachment"]) ? "attachment" : "inline";
 
     header("Cache-Control: private");
@@ -907,7 +907,7 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       echo $data;
 
     else {
@@ -915,11 +915,11 @@ 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if (!$fh)
+        throw new DOMPDF_Exception("Unable to load temporary PDF file: ".$this->_file);
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while (!feof($fh))
+        echo fread($fh, $chunk);
       fclose($fh);
 
       //debugpng
@@ -942,14 +942,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       $data = $this->_pdf->get_buffer();
 
     else {

Braces +125 added lines, -95 removed lines

@@ -185,12 +185,13 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   function __construct($paper = "letter", $orientation = "portrait") {
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
-    else
-      $size = self::$PAPER_SIZES["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+    } else {
+          $size = self::$PAPER_SIZES["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];
@@ -202,8 +203,9 @@ 
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+	      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	}
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -220,9 +222,9 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
-    else {
+    if ( self::$IN_MEMORY ) {
+          $this->_pdf->begin_document("","");
+    } else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
       $this->_pdf->begin_document($this->_file,"");
     }
@@ -254,19 +256,23 @@ 
         } else if ( file_exists($file . ".pfb") ) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
-            $afm = "$file.afm";
+          if ( file_exists($file . ".afm") ) {
+                      $afm = "$file.afm";
+          }
 
         } else if ( file_exists($file . ".PFB") ) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
-            $afm = "$file.AFM";
-        } else
-          continue;
+          if ( file_exists($file . ".AFM") ) {
+                      $afm = "$file.AFM";
+          }
+        } else {
+                  continue;
+        }
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        if ( !is_null($afm) ) {
+                  $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
       }
     }
   }
@@ -369,8 +375,9 @@ 
     if ( mb_strpos($where, "next") !== false ) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
-        $where = "add";
+      if ( $where == "" ) {
+              $where = "add";
+      }
     }
 
     $this->_objs[$object]["where"] = $where;
@@ -386,8 +393,9 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
-      return;
+    if ( !isset($this->_objs[$object]) ) {
+          return;
+    }
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -396,8 +404,9 @@ 
     if ( $this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")) ) {
+          $this->_pdf->fit_image($object,0,0,"");
+    }
 
     unset($this->_objs[$object]);
   }
@@ -445,13 +454,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+    if ( count($dash) == 1 ) {
+          $dash[] = $dash[0];
+    }
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
-    else
-      $this->_pdf->setdash(0,0);
+    if ( count($dash) > 1 ) {
+          $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    } else {
+          $this->_pdf->setdash(0,0);
+    }
 
     switch ( $join ) {
     case "miter":
@@ -497,8 +508,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
-    	return;
+    if($this->_last_stroke_color == $color) {
+        	return;
+    }
 
     $this->_last_stroke_color = $color;
 
@@ -512,8 +524,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
-    	return;
+    if($this->_last_fill_color == $color) {
+        	return;
+    }
 
     $this->_last_fill_color = $color;
 
@@ -549,19 +562,19 @@ 
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
-        $encoding = "unicode";
-      else
-        $encoding = "auto";
+      if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+              $encoding = "unicode";
+      } else {
+              $encoding = "auto";
+      }
 
     }
 
     $key = $font .":". $encoding .":". $options;
 
-    if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
-
-    else {
+    if ( isset($this->_fonts[$key]) ) {
+          return $this->_fonts[$key];
+    } else {
 
       $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
       return $this->_fonts[$key];
@@ -622,8 +635,9 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
@@ -635,10 +649,11 @@ 
       $this->_pdf->lineto($x,$y);
     }
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->closepath_stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->closepath_stroke();
+    }
   }
 
   //........................................................................
@@ -648,17 +663,19 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->stroke();
+    }
 
   }
 
@@ -670,13 +687,13 @@ 
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
-      $img_type = "jpeg";
-
-    if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+    if ( $img_type === "jpg" ) {
+          $img_type = "jpeg";
+    }
 
-    else {
+    if ( isset($this->_imgs[$img_url]) ) {
+          $img = $this->_imgs[$img_url];
+    } else {
 
       $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
@@ -737,14 +754,17 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      if ( $name ) {
+              $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      }
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
-        return; // Local links are not allowed
+      if ( $proto == "" || $proto === "file://" ) {
+              return;
+      }
+      // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
       $url = '{' . rawurldecode($url) . '}';
       
@@ -842,8 +862,9 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $this->_pdf->suspend_page("");
 
@@ -883,10 +904,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
@@ -894,8 +916,9 @@ 
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
-    } else
-      $size = filesize($this->_file);
+    } else {
+          $size = filesize($this->_file);
+    }
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -907,26 +930,30 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
-      echo $data;
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          echo $data;
+    } else {
 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if ( !$fh ) {
+              throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      }
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while ( !feof($fh) ) {
+              echo fread($fh,$chunk);
+      }
       fclose($fh);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib stream unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 
@@ -942,24 +969,27 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          $data = $this->_pdf->get_buffer();
+    } else {
       $data = file_get_contents($this->_file);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib output unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 

main/inc/lib/phpdocx/pdf/include/style.cls.php

Doc Comments +27 added lines, -2 removed lines

@@ -742,6 +742,10 @@ 
    * Assume that __set will be also called when this is called, so do not check validity again.
    * Only created, if !important exists -> always set true.
    */
+
+  /**
+   * @param string $prop
+   */
   function important_set($prop) {
       $prop = str_replace("-", "_", $prop);
       $this->_important_props[$prop] = true;
@@ -1276,7 +1280,8 @@ 
   /**
    * Return a single border property
    *
-   * @return mixed
+   * @param string $side
+   * @return string
    */
   protected function _get_border($side) {
     $color = $this->__get("border_" . $side . "_color");
@@ -1363,6 +1368,10 @@ 
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
+
+  /**
+   * @param string $side
+   */
   protected function _set_style_side_type($style,$side,$type,$val,$important) {
     if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
       //see __set and __get, on all assignments clear cache!
@@ -1381,6 +1390,9 @@ 
       $this->_set_style_side_type($style,'left',$type,$left,$important);
   }
 
+  /**
+   * @param boolean $important
+   */
   protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
@@ -1404,6 +1416,10 @@ 
     $this->_props[$style.$type] = $val;
   }
 
+  /**
+   * @param string $style
+   * @param string $type
+   */
   protected function _set_style_type_important($style,$type,$val) {
     $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
   }
@@ -1411,12 +1427,21 @@ 
   /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
+
+  /**
+   * @param string $style
+   * @param string $side
+   */
   protected function _set_style_side_width_important($style,$side,$val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
   }
 
+  /**
+   * @param string $style
+   * @param boolean $important
+   */
   protected function _set_style($style,$val,$important) {
     if ( !isset($this->_important_props[$style]) || $important) {
       if ($important) {
@@ -1505,7 +1530,6 @@ 
    * Set the background image url
    *
    * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
-   * @param string $url
    */
   function set_background_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1769,6 +1793,7 @@ 
    *
    * @param string $side
    * @param string $border_spec  ([width] [style] [color])
+   * @param boolean $important
    */
   protected function _set_border($side, $border_spec, $important) {
     $border_spec = str_replace(",", " ", $border_spec);

Indentation +1142 added lines, -1142 removed lines

@@ -1,74 +1,74 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: style.cls.php,v $
- * Created on: 2004-06-01
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - Fix px to pt conversion according to DOMPDF_DPI
- * - Recognize css styles with !important attribute, and store !important attribute within style
- * - Propagate !important by inherit and sequences of styles with merge.
- * - Add missing style property cache flushes for consistent rendering, e.g. on explicte assignments
- * - Add important set/get for access from outside of class
- * - Fix font_family search path with multiple fonts list in css attribute:
- *   On missing font, do not immediately fall back to default font,
- *   but try subsequent fonts in search chain. Only when none found, explicitely
- *   refer to default font.
- * - Allow read of background individual properties
- * - Add support for individual styles background-position, background-attachment, background-repeat
- * - Complete style components of list-style
- * - Add support for combined styles in addition to individual styles
- *   like {border: red 1px solid;}, { border-width: 1px;}, { border-right-color: red; } ...
- *   for font, background
- * - Propagate attributes including !important from combined style to individual component
- *   for border, background, padding, margin, font, list_style
- * - Refactor common code of border, background, padding, margin, font, list_style
- * - Refactor common code of list-style-image and background-image
- * - special treatment of css images "none" instead of url(...), otherwise would prepend string "none" with path name
- * - Added comments
- * - Added debug output
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version dompdf_trunk_with_helmut_mods.20090524
- * - Allow superflous white space and string delimiter in font search path.
- * - Restore lost change of default font of above
- * @version 20090610
- * - Allow absolute path from web server root as html image reference
- * - More accurate handling of css property cache consistency
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: style.cls.php,v $
+     * Created on: 2004-06-01
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - Fix px to pt conversion according to DOMPDF_DPI
+     * - Recognize css styles with !important attribute, and store !important attribute within style
+     * - Propagate !important by inherit and sequences of styles with merge.
+     * - Add missing style property cache flushes for consistent rendering, e.g. on explicte assignments
+     * - Add important set/get for access from outside of class
+     * - Fix font_family search path with multiple fonts list in css attribute:
+     *   On missing font, do not immediately fall back to default font,
+     *   but try subsequent fonts in search chain. Only when none found, explicitely
+     *   refer to default font.
+     * - Allow read of background individual properties
+     * - Add support for individual styles background-position, background-attachment, background-repeat
+     * - Complete style components of list-style
+     * - Add support for combined styles in addition to individual styles
+     *   like {border: red 1px solid;}, { border-width: 1px;}, { border-right-color: red; } ...
+     *   for font, background
+     * - Propagate attributes including !important from combined style to individual component
+     *   for border, background, padding, margin, font, list_style
+     * - Refactor common code of border, background, padding, margin, font, list_style
+     * - Refactor common code of list-style-image and background-image
+     * - special treatment of css images "none" instead of url(...), otherwise would prepend string "none" with path name
+     * - Added comments
+     * - Added debug output
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Allow superflous white space and string delimiter in font search path.
+     * - Restore lost change of default font of above
+     * @version 20090610
+     * - Allow absolute path from web server root as html image reference
+     * - More accurate handling of css property cache consistency
+     */
 
 /* $Id: style.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -85,114 +85,114 @@ 
  */
 class Style {
 
-  /**
-   * Default font size, in points.
-   *
-   * @var float
-   */
-  static $default_font_size = 12;
-
-  /**
-   * Default line height, as a fraction of the font size.
-   *
-   * @var float
-   */
-  static $default_line_height = 1.2;
-
-  /**
-   * List of all inline types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $INLINE_TYPES = array("inline");
-
-  /**
-   * List of all block types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
-
-  /**
-   * List of all table types.  Should really be a constant.
-   *
-   * @var array;
-   */
-  static $TABLE_TYPES = array("table", "inline-table");
-
-  /**
-   * List of valid border styles.  Should also really be a constant.
-   *
-   * @var array
-   */
-  static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
+    /**
+     * Default font size, in points.
+     *
+     * @var float
+     */
+    static $default_font_size = 12;
+
+    /**
+     * Default line height, as a fraction of the font size.
+     *
+     * @var float
+     */
+    static $default_line_height = 1.2;
+
+    /**
+     * List of all inline types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $INLINE_TYPES = array("inline");
+
+    /**
+     * List of all block types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
+
+    /**
+     * List of all table types.  Should really be a constant.
+     *
+     * @var array;
+     */
+    static $TABLE_TYPES = array("table", "inline-table");
+
+    /**
+     * List of valid border styles.  Should also really be a constant.
+     *
+     * @var array
+     */
+    static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
                                 "double", "groove", "ridge", "inset", "outset");
 
-  /**
-   * Default style values.
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_defaults = null;
-
-  /**
-   * List of inherited properties
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_inherited = null;
-
-  /**
-   * The stylesheet this style belongs to
-   *
-   * @see Stylesheet
-   * @var Stylesheet
-   */
-  protected $_stylesheet; // stylesheet this style is attached to
-
-  /**
-   * Main array of all CSS properties & values
-   *
-   * @var array
-   */
-  protected $_props;
-
-  /* var instead of protected would allow access outside of class */
-  protected $_important_props;
-
-  /**
-   * Cached property values
-   *
-   * @var array
-   */
-  protected $_prop_cache;
+    /**
+     * Default style values.
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_defaults = null;
+
+    /**
+     * List of inherited properties
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_inherited = null;
+
+    /**
+     * The stylesheet this style belongs to
+     *
+     * @see Stylesheet
+     * @var Stylesheet
+     */
+    protected $_stylesheet; // stylesheet this style is attached to
+
+    /**
+     * Main array of all CSS properties & values
+     *
+     * @var array
+     */
+    protected $_props;
+
+    /* var instead of protected would allow access outside of class */
+    protected $_important_props;
+
+    /**
+     * Cached property values
+     *
+     * @var array
+     */
+    protected $_prop_cache;
   
-  /**
-   * Font size of parent element in document tree.  Used for relative font
-   * size resolution.
-   *
-   * @var float
-   */
-  protected $_parent_font_size; // Font size of parent element
+    /**
+     * Font size of parent element in document tree.  Used for relative font
+     * size resolution.
+     *
+     * @var float
+     */
+    protected $_parent_font_size; // Font size of parent element
   
-  // private members
-  /**
-   * True once the font size is resolved absolutely
-   *
-   * @var bool
-   */
-  private $__font_size_calculated; // Cache flag
+    // private members
+    /**
+     * True once the font size is resolved absolutely
+     *
+     * @var bool
+     */
+    private $__font_size_calculated; // Cache flag
   
-  /**
-   * Class constructor
-   *
-   * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
-   */
-  function __construct(Stylesheet $stylesheet) {
+    /**
+     * Class constructor
+     *
+     * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
+     */
+    function __construct(Stylesheet $stylesheet) {
     $this->_props = array();
     $this->_important_props = array();
     $this->_stylesheet = $stylesheet;
@@ -201,330 +201,330 @@ 
     
     if ( !isset(self::$_defaults) ) {
     
-      // Shorthand
-      $d =& self::$_defaults;
+        // Shorthand
+        $d =& self::$_defaults;
     
-      // All CSS 2.1 properties, and their default values
-      $d["azimuth"] = "center";
-      $d["background_attachment"] = "scroll";
-      $d["background_color"] = "transparent";
-      $d["background_image"] = "none";
-      $d["background_position"] = "0% 0%";
-      $d["background_repeat"] = "repeat";
-      $d["background"] = "";
-      $d["border_collapse"] = "separate";
-      $d["border_color"] = "";
-      $d["border_spacing"] = "0";
-      $d["border_style"] = "";
-      $d["border_top"] = "";
-      $d["border_right"] = "";
-      $d["border_bottom"] = "";
-      $d["border_left"] = "";
-      $d["border_top_color"] = "";
-      $d["border_right_color"] = "";
-      $d["border_bottom_color"] = "";
-      $d["border_left_color"] = "";
-      $d["border_top_style"] = "none";
-      $d["border_right_style"] = "none";
-      $d["border_bottom_style"] = "none";
-      $d["border_left_style"] = "none";
-      $d["border_top_width"] = "medium";
-      $d["border_right_width"] = "medium";
-      $d["border_bottom_width"] = "medium";
-      $d["border_left_width"] = "medium";
-      $d["border_width"] = "medium";
-      $d["border"] = "";
-      $d["bottom"] = "auto";
-      $d["caption_side"] = "top";
-      $d["clear"] = "none";
-      $d["clip"] = "auto";
-      $d["color"] = "#000000";
-      $d["content"] = "normal";
-      $d["counter_increment"] = "none";
-      $d["counter_reset"] = "none";
-      $d["cue_after"] = "none";
-      $d["cue_before"] = "none";
-      $d["cue"] = "";
-      $d["cursor"] = "auto";
-      $d["direction"] = "ltr";
-      $d["display"] = "inline";
-      $d["elevation"] = "level";
-      $d["empty_cells"] = "show";
-      $d["float"] = "none";
-      $d["font_family"] = "serif";
-      $d["font_size"] = "medium";
-      $d["font_style"] = "normal";
-      $d["font_variant"] = "normal";
-      $d["font_weight"] = "normal";
-      $d["font"] = "";
-      $d["height"] = "auto";
-      $d["left"] = "auto";
-      $d["letter_spacing"] = "normal";
-      $d["line_height"] = "normal";
-      $d["list_style_image"] = "none";
-      $d["list_style_position"] = "outside";
-      $d["list_style_type"] = "disc";
-      $d["list_style"] = "";
-      $d["margin_right"] = "0";
-      $d["margin_left"] = "0";
-      $d["margin_top"] = "0";
-      $d["margin_bottom"] = "0";
-      $d["margin"] = "";
-      $d["max_height"] = "none";
-      $d["max_width"] = "none";
-      $d["min_height"] = "0";
-      $d["min_width"] = "0";
-      $d["orphans"] = "2";
-      $d["outline_color"] = "invert";
-      $d["outline_style"] = "none";
-      $d["outline_width"] = "medium";
-      $d["outline"] = "";
-      $d["overflow"] = "visible";
-      $d["padding_top"] = "0";
-      $d["padding_right"] = "0";
-      $d["padding_bottom"] = "0";
-      $d["padding_left"] = "0";
-      $d["padding"] = "";
-      $d["page_break_after"] = "auto";
-      $d["page_break_before"] = "auto";
-      $d["page_break_inside"] = "auto";
-      $d["pause_after"] = "0";
-      $d["pause_before"] = "0";
-      $d["pause"] = "";
-      $d["pitch_range"] = "50";
-      $d["pitch"] = "medium";
-      $d["play_during"] = "auto";
-      $d["position"] = "static";
-      $d["quotes"] = "";
-      $d["richness"] = "50";
-      $d["right"] = "auto";
-      $d["speak_header"] = "once";
-      $d["speak_numeral"] = "continuous";
-      $d["speak_punctuation"] = "none";
-      $d["speak"] = "normal";
-      $d["speech_rate"] = "medium";
-      $d["stress"] = "50";
-      $d["table_layout"] = "auto";
-      $d["text_align"] = "left";
-      $d["text_decoration"] = "none";
-      $d["text_indent"] = "0";
-      $d["text_transform"] = "none";
-      $d["top"] = "auto";
-      $d["unicode_bidi"] = "normal";
-      $d["vertical_align"] = "baseline";
-      $d["visibility"] = "visible";
-      $d["voice_family"] = "";
-      $d["volume"] = "medium";
-      $d["white_space"] = "normal";
-      $d["widows"] = "2";
-      $d["width"] = "auto";
-      $d["word_spacing"] = "normal";
-      $d["z_index"] = "auto";
-
-      // Properties that inherit by default
-      self::$_inherited = array("azimuth",
-                                 "border_collapse",
-                                 "border_spacing",
-                                 "caption_side",
-                                 "color",
-                                 "cursor",
-                                 "direction",
-                                 "elevation",
-                                 "empty_cells",
-                                 "font_family",
-                                 "font_size",
-                                 "font_style",
-                                 "font_variant",
-                                 "font_weight",
-                                 "font",
-                                 "letter_spacing",
-                                 "line_height",
-                                 "list_style_image",
-                                 "list_style_position",
-                                 "list_style_type",
-                                 "list_style",
-                                 "orphans",
-                                 "page_break_inside",
-                                 "pitch_range",
-                                 "pitch",
-                                 "quotes",
-                                 "richness",
-                                 "speak_header",
-                                 "speak_numeral",
-                                 "speak_punctuation",
-                                 "speak",
-                                 "speech_rate",
-                                 "stress",
-                                 "text_align",
-                                 "text_indent",
-                                 "text_transform",
-                                 "visibility",
-                                 "voice_family",
-                                 "volume",
-                                 "white_space",
-                                 "widows",
-                                 "word_spacing");
-    }
-
-  }
-
-  /**
-   * "Destructor": forcibly free all references held by this object
-   */
-  function dispose() {
+        // All CSS 2.1 properties, and their default values
+        $d["azimuth"] = "center";
+        $d["background_attachment"] = "scroll";
+        $d["background_color"] = "transparent";
+        $d["background_image"] = "none";
+        $d["background_position"] = "0% 0%";
+        $d["background_repeat"] = "repeat";
+        $d["background"] = "";
+        $d["border_collapse"] = "separate";
+        $d["border_color"] = "";
+        $d["border_spacing"] = "0";
+        $d["border_style"] = "";
+        $d["border_top"] = "";
+        $d["border_right"] = "";
+        $d["border_bottom"] = "";
+        $d["border_left"] = "";
+        $d["border_top_color"] = "";
+        $d["border_right_color"] = "";
+        $d["border_bottom_color"] = "";
+        $d["border_left_color"] = "";
+        $d["border_top_style"] = "none";
+        $d["border_right_style"] = "none";
+        $d["border_bottom_style"] = "none";
+        $d["border_left_style"] = "none";
+        $d["border_top_width"] = "medium";
+        $d["border_right_width"] = "medium";
+        $d["border_bottom_width"] = "medium";
+        $d["border_left_width"] = "medium";
+        $d["border_width"] = "medium";
+        $d["border"] = "";
+        $d["bottom"] = "auto";
+        $d["caption_side"] = "top";
+        $d["clear"] = "none";
+        $d["clip"] = "auto";
+        $d["color"] = "#000000";
+        $d["content"] = "normal";
+        $d["counter_increment"] = "none";
+        $d["counter_reset"] = "none";
+        $d["cue_after"] = "none";
+        $d["cue_before"] = "none";
+        $d["cue"] = "";
+        $d["cursor"] = "auto";
+        $d["direction"] = "ltr";
+        $d["display"] = "inline";
+        $d["elevation"] = "level";
+        $d["empty_cells"] = "show";
+        $d["float"] = "none";
+        $d["font_family"] = "serif";
+        $d["font_size"] = "medium";
+        $d["font_style"] = "normal";
+        $d["font_variant"] = "normal";
+        $d["font_weight"] = "normal";
+        $d["font"] = "";
+        $d["height"] = "auto";
+        $d["left"] = "auto";
+        $d["letter_spacing"] = "normal";
+        $d["line_height"] = "normal";
+        $d["list_style_image"] = "none";
+        $d["list_style_position"] = "outside";
+        $d["list_style_type"] = "disc";
+        $d["list_style"] = "";
+        $d["margin_right"] = "0";
+        $d["margin_left"] = "0";
+        $d["margin_top"] = "0";
+        $d["margin_bottom"] = "0";
+        $d["margin"] = "";
+        $d["max_height"] = "none";
+        $d["max_width"] = "none";
+        $d["min_height"] = "0";
+        $d["min_width"] = "0";
+        $d["orphans"] = "2";
+        $d["outline_color"] = "invert";
+        $d["outline_style"] = "none";
+        $d["outline_width"] = "medium";
+        $d["outline"] = "";
+        $d["overflow"] = "visible";
+        $d["padding_top"] = "0";
+        $d["padding_right"] = "0";
+        $d["padding_bottom"] = "0";
+        $d["padding_left"] = "0";
+        $d["padding"] = "";
+        $d["page_break_after"] = "auto";
+        $d["page_break_before"] = "auto";
+        $d["page_break_inside"] = "auto";
+        $d["pause_after"] = "0";
+        $d["pause_before"] = "0";
+        $d["pause"] = "";
+        $d["pitch_range"] = "50";
+        $d["pitch"] = "medium";
+        $d["play_during"] = "auto";
+        $d["position"] = "static";
+        $d["quotes"] = "";
+        $d["richness"] = "50";
+        $d["right"] = "auto";
+        $d["speak_header"] = "once";
+        $d["speak_numeral"] = "continuous";
+        $d["speak_punctuation"] = "none";
+        $d["speak"] = "normal";
+        $d["speech_rate"] = "medium";
+        $d["stress"] = "50";
+        $d["table_layout"] = "auto";
+        $d["text_align"] = "left";
+        $d["text_decoration"] = "none";
+        $d["text_indent"] = "0";
+        $d["text_transform"] = "none";
+        $d["top"] = "auto";
+        $d["unicode_bidi"] = "normal";
+        $d["vertical_align"] = "baseline";
+        $d["visibility"] = "visible";
+        $d["voice_family"] = "";
+        $d["volume"] = "medium";
+        $d["white_space"] = "normal";
+        $d["widows"] = "2";
+        $d["width"] = "auto";
+        $d["word_spacing"] = "normal";
+        $d["z_index"] = "auto";
+
+        // Properties that inherit by default
+        self::$_inherited = array("azimuth",
+                                    "border_collapse",
+                                    "border_spacing",
+                                    "caption_side",
+                                    "color",
+                                    "cursor",
+                                    "direction",
+                                    "elevation",
+                                    "empty_cells",
+                                    "font_family",
+                                    "font_size",
+                                    "font_style",
+                                    "font_variant",
+                                    "font_weight",
+                                    "font",
+                                    "letter_spacing",
+                                    "line_height",
+                                    "list_style_image",
+                                    "list_style_position",
+                                    "list_style_type",
+                                    "list_style",
+                                    "orphans",
+                                    "page_break_inside",
+                                    "pitch_range",
+                                    "pitch",
+                                    "quotes",
+                                    "richness",
+                                    "speak_header",
+                                    "speak_numeral",
+                                    "speak_punctuation",
+                                    "speak",
+                                    "speech_rate",
+                                    "stress",
+                                    "text_align",
+                                    "text_indent",
+                                    "text_transform",
+                                    "visibility",
+                                    "voice_family",
+                                    "volume",
+                                    "white_space",
+                                    "widows",
+                                    "word_spacing");
+    }
+
+    }
+
+    /**
+     * "Destructor": forcibly free all references held by this object
+     */
+    function dispose() {
     unset($this->_stylesheet);
-  }
+    }
   
-  /**
-   * returns the {@link Stylesheet} this Style is associated with.
-   *
-   * @return Stylesheet
-   */
-  function get_stylesheet() { return $this->_stylesheet; }
+    /**
+     * returns the {@link Stylesheet} this Style is associated with.
+     *
+     * @return Stylesheet
+     */
+    function get_stylesheet() { return $this->_stylesheet; }
   
-  /**
-   * Converts any CSS length value into an absolute length in points.
-   *
-   * length_in_pt() takes a single length (e.g. '1em') or an array of
-   * lengths and returns an absolute length.  If an array is passed, then
-   * the return value is the sum of all elements.
-   *
-   * If a reference size is not provided, the default font size is used
-   * ({@link Style::$default_font_size}).
-   *
-   * @param float|array $length   the length or array of lengths to resolve
-   * @param float       $ref_size  an absolute reference size to resolve percentage lengths
-   * @return float
-   */
-  function length_in_pt($length, $ref_size = null) {
+    /**
+     * Converts any CSS length value into an absolute length in points.
+     *
+     * length_in_pt() takes a single length (e.g. '1em') or an array of
+     * lengths and returns an absolute length.  If an array is passed, then
+     * the return value is the sum of all elements.
+     *
+     * If a reference size is not provided, the default font size is used
+     * ({@link Style::$default_font_size}).
+     *
+     * @param float|array $length   the length or array of lengths to resolve
+     * @param float       $ref_size  an absolute reference size to resolve percentage lengths
+     * @return float
+     */
+    function length_in_pt($length, $ref_size = null) {
 
     if ( !is_array($length) )
-      $length = array($length);
+        $length = array($length);
 
     if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+        $ref_size = self::$default_font_size;
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
+        if ( $l === "auto" )
         return "auto";
       
-      if ( $l === "none" )
+        if ( $l === "none" )
         return "none";
 
-      // Assume numeric values are already in points
-      if ( is_numeric($l) ) {
+        // Assume numeric values are already in points
+        if ( is_numeric($l) ) {
         $ret += $l;
         continue;
-      }
+        }
         
-      if ( $l === "normal" ) {
+        if ( $l === "normal" ) {
         $ret += $ref_size;
         continue;
-      }
+        }
 
-      // Border lengths
-      if ( $l === "thin" ) {
+        // Border lengths
+        if ( $l === "thin" ) {
         $ret += 0.5;
         continue;
-      }
+        }
       
-      if ( $l === "medium" ) {
+        if ( $l === "medium" ) {
         $ret += 1.5;
         continue;
-      }
+        }
     
-      if ( $l === "thick" ) {
+        if ( $l === "thick" ) {
         $ret += 2.5;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "pt"))  !== false ) {
+        if ( ($i = mb_strpos($l, "pt"))  !== false ) {
         $ret += mb_substr($l, 0, $i);
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "px"))  !== false ) {
+        if ( ($i = mb_strpos($l, "px"))  !== false ) {
         $ret += ( mb_substr($l, 0, $i)  * 72 ) / DOMPDF_DPI;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "em"))  !== false ) {
+        if ( ($i = mb_strpos($l, "em"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      // FIXME: em:ex ratio?
-      if ( ($i = mb_strpos($l, "ex"))  !== false ) {
+        // FIXME: em:ex ratio?
+        if ( ($i = mb_strpos($l, "ex"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "%"))  !== false ) {
+        if ( ($i = mb_strpos($l, "%"))  !== false ) {
         $ret += mb_substr($l, 0, $i)/100 * $ref_size;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "in")) !== false ) {
+        if ( ($i = mb_strpos($l, "in")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "cm")) !== false ) {
+        if ( ($i = mb_strpos($l, "cm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 2.54;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "mm")) !== false ) {
+        if ( ($i = mb_strpos($l, "mm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 25.4;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "pc")) !== false ) {
+        if ( ($i = mb_strpos($l, "pc")) !== false ) {
         $ret += mb_substr($l, 0, $i) / 12;
         continue;
-      }
+        }
           
-      // Bogus value
-      $ret += $ref_size;
+        // Bogus value
+        $ret += $ref_size;
     }
 
     return $ret;
-  }
+    }
 
   
-  /**
-   * Set inherited properties in this style using values in $parent
-   *
-   * @param Style $parent
-   */
-  function inherit(Style $parent) {
+    /**
+     * Set inherited properties in this style using values in $parent
+     *
+     * @param Style $parent
+     */
+    function inherit(Style $parent) {
 
     // Set parent font size
     $this->_parent_font_size = $parent->get_font_size();
     
     foreach (self::$_inherited as $prop) {
-      //inherit the !important property also.
-      //if local property is also !important, don't inherit.
-      if ( isset($parent->_props[$prop]) &&
+        //inherit the !important property also.
+        //if local property is also !important, don't inherit.
+        if ( isset($parent->_props[$prop]) &&
            ( !isset($this->_props[$prop]) ||
              ( isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]) )
-           )
-         ) {
+            )
+            ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
-		$this->_props[$prop] = $parent->_props[$prop];
-      }
+        $this->_prop_cache[$prop] = null;
+        $this->_props[$prop] = $parent->_props[$prop];
+        }
     }
       
     foreach (array_keys($this->_props) as $prop) {
-      if ( $this->_props[$prop] === "inherit" ) {
+        if ( $this->_props[$prop] === "inherit" ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //do not assign direct, but
         //implicite assignment through __set, redirect to specialized, get value with __get
@@ -532,58 +532,58 @@ 
         //Therefore do not directly assign the value without __set
         //set _important_props before that to be able to propagate.
         //see __set and __get, on all assignments clear cache!
-		//$this->_prop_cache[$prop] = null;
-		//$this->_props[$prop] = $parent->_props[$prop];
+        //$this->_prop_cache[$prop] = null;
+        //$this->_props[$prop] = $parent->_props[$prop];
         //props_set for more obvious explicite assignment not implemented, because
         //too many implicite uses.
         // $this->props_set($prop, $parent->$prop);
         $this->$prop = $parent->$prop;
-      }
+        }
     }
           
     return $this;
-  }
+    }
 
   
-  /**
-   * Override properties in this style with those in $style
-   *
-   * @param Style $style
-   */
-  function merge(Style $style) {
+    /**
+     * Override properties in this style with those in $style
+     *
+     * @param Style $style
+     */
+    function merge(Style $style) {
     //treat the !important attribute
     //if old rule has !important attribute, override with new rule only if
     //the new rule is also !important
     foreach($style->_props as $prop => $val ) {
-      if (isset($style->_important_props[$prop])) {
- 	    $this->_important_props[$prop] = true;
+        if (isset($style->_important_props[$prop])) {
+            $this->_important_props[$prop] = true;
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  } else if ( !isset($this->_important_props[$prop]) ) {
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        } else if ( !isset($this->_important_props[$prop]) ) {
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  }
- 	}
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        }
+        }
 
     if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
-  }
+        $this->__font_size_calculated = false;
+    }
 
   
-  /**
-   * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
-   * based on the provided CSS colour value.
-   *
-   * @param string $colour
-   * @return array
-   */
-  function munge_colour($colour) {
+    /**
+     * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
+     * based on the provided CSS colour value.
+     *
+     * @param string $colour
+     * @return array
+     */
+    function munge_colour($colour) {
     if ( is_array($colour) )
-      // Assume the array has the right format...
-      // FIXME: should/could verify this.
-      return $colour;
+        // Assume the array has the right format...
+        // FIXME: should/could verify this.
+        return $colour;
     
     $r = 0;
     $g = 0;
@@ -594,78 +594,78 @@ 
 
     case "maroon":
       $r = 0x80;
-      break;
+        break;
 
     case "red":
       $r = 0xff;
-      break;
+        break;
 
     case "orange":
       $r = 0xff;
-      $g = 0xa5;
-      break;
+        $g = 0xa5;
+        break;
 
     case "yellow":
       $r = 0xff;
-      $g = 0xff;
-      break;
+        $g = 0xff;
+        break;
 
     case "olive":
       $r = 0x80;
-      $g = 0x80;
-      break;
+        $g = 0x80;
+        break;
 
     case "purple":
       $r = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "fuchsia":
       $r = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "white":
       $r = $g = $b = 0xff;
-      break;
+        break;
 
     case "lime":
       $g = 0xff;
-      break;
+        break;
 
     case "green":
       $g = 0x80;
-      break;
+        break;
 
     case "navy":
       $b = 0x80;
-      break;
+        break;
 
     case "blue":
       $b = 0xff;
-      break;
+        break;
 
     case "aqua":
       $g = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "teal":
       $g = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "black":
       break;
 
     case "sliver":
       $r = $g = $b = 0xc0;
-      break;
+        break;
 
     case "gray":
     case "grey":
       $r = $g = $b = 0x80;
-      break;
+        break;
 
     case "transparent":
       return "transparent";
@@ -677,177 +677,177 @@ 
         $g = hexdec($colour[2] . $colour[2]);
         $b = hexdec($colour[3] . $colour[3]);
 
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+        } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
         // #rrggbb format
         $r = hexdec(mb_substr($colour, 1, 2));
         $g = hexdec(mb_substr($colour, 3, 2));
         $b = hexdec(mb_substr($colour, 5, 2));
 
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
+        } else if ( mb_strpos($colour, "rgb") !== false ) {
         // rgb( r,g,b ) format
         $i = mb_strpos($colour, "(");
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
         if ($i === false || $j === false)
-          return null;
+            return null;
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
         if (count($triplet) != 3)
-          return null;
+            return null;
         
         foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+            if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
             $triplet[$c] = round($triplet[$c] * 0.255);
         }
 
         list($r, $g, $b) = $triplet;
 
-      } else {
+        } else {
         // Who knows?
         return null;
-      }
+        }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+        // Clip to 0 - 1
+        $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+        $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+        $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+        break;
       
     }
     
     // Form array
     $arr = array(0 => $r / 0xff, 1 => $g / 0xff, 2 => $b / 0xff,
-                 "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
-                 "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
+                    "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
+                    "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
     return $arr;
       
-  }
+    }
 
   
-  /**
-   * Alias for {@link Style::munge_colour()}
-   *
-   * @param string $color
-   * @return array
-   */
-  function munge_color($color) { return CSS_Color::parse($color); }
-
-  /* direct access to _important_props array from outside would work only when declared as
+    /**
+     * Alias for {@link Style::munge_colour()}
+     *
+     * @param string $color
+     * @return array
+     */
+    function munge_color($color) { return CSS_Color::parse($color); }
+
+    /* direct access to _important_props array from outside would work only when declared as
    * 'var $_important_props;' instead of 'protected $_important_props;'
    * Don't call _set/__get on missing attribute. Therefore need a special access.
    * Assume that __set will be also called when this is called, so do not check validity again.
    * Only created, if !important exists -> always set true.
    */
-  function important_set($prop) {
-      $prop = str_replace("-", "_", $prop);
-      $this->_important_props[$prop] = true;
-  }
+    function important_set($prop) {
+        $prop = str_replace("-", "_", $prop);
+        $this->_important_props[$prop] = true;
+    }
 
-  function important_get($prop) {
-      isset($this->_important_props[$prop]);
-  }
+    function important_get($prop) {
+        isset($this->_important_props[$prop]);
+    }
 
-  /**
-   * PHP5 overloaded setter
-   *
-   * This function along with {@link Style::__get()} permit a user of the
-   * Style class to access any (CSS) property using the following syntax:
-   * <code>
-   *  Style->margin_top = "1em";
-   *  echo (Style->margin_top);
-   * </code>
-   *
-   * __set() automatically calls the provided set function, if one exists,
-   * otherwise it sets the property directly.  Typically, __set() is not
-   * called directly from outside of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   * For easier finding all assignments, attempted to allowing only explicite assignment:
-   * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
-   * function __set($prop, $val) {
-   *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
-   * }
-   * function props_set($prop, $val) { ... }
-   *
-   * @param string $prop  the property to set
-   * @param mixed  $val   the value of the property
-   *
-   */
-  function __set($prop, $val) {
+    /**
+     * PHP5 overloaded setter
+     *
+     * This function along with {@link Style::__get()} permit a user of the
+     * Style class to access any (CSS) property using the following syntax:
+     * <code>
+     *  Style->margin_top = "1em";
+     *  echo (Style->margin_top);
+     * </code>
+     *
+     * __set() automatically calls the provided set function, if one exists,
+     * otherwise it sets the property directly.  Typically, __set() is not
+     * called directly from outside of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     * For easier finding all assignments, attempted to allowing only explicite assignment:
+     * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
+     * function __set($prop, $val) {
+     *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
+     * }
+     * function props_set($prop, $val) { ... }
+     *
+     * @param string $prop  the property to set
+     * @param mixed  $val   the value of the property
+     *
+     */
+    function __set($prop, $val) {
     global $_dompdf_warnings;
 
     $prop = str_replace("-", "_", $prop);
     $this->_prop_cache[$prop] = null;
     
     if ( !isset(self::$_defaults[$prop]) ) {
-      $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
-      return;
+        $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
+        return;
     }
     
     if ( $prop !== "content" && is_string($val) && mb_strpos($val, "url") === false ) {
-      $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
-      $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
+        $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
+        $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
     }
     
     $method = "set_$prop";
 
     if ( method_exists($this, $method) )
-      $this->$method($val);
+        $this->$method($val);
     else
-      $this->_props[$prop] = $val;
+        $this->_props[$prop] = $val;
     
-  }
+    }
 
-  /**
-   * PHP5 overloaded getter
-   *
-   * Along with {@link Style::__set()} __get() provides access to all CSS
-   * properties directly.  Typically __get() is not called directly outside
-   * of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   *
-   * @param string $prop
-   * @return mixed
-   */
-  function __get($prop) {
+    /**
+     * PHP5 overloaded getter
+     *
+     * Along with {@link Style::__set()} __get() provides access to all CSS
+     * properties directly.  Typically __get() is not called directly outside
+     * of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     *
+     * @param string $prop
+     * @return mixed
+     */
+    function __get($prop) {
     
     if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+        throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
 
     if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+        return $this->_prop_cache[$prop];
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
     if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+        $this->_props[$prop] = self::$_defaults[$prop];
 
     if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+        return $this->_prop_cache[$prop] = $this->$method();
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
-  }
+    }
 
 
-  /**
-   * Getter for the 'font-family' CSS property.
-   *
-   * Uses the {@link Font_Metrics} class to resolve the font family into an
-   * actual font file.
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
-   * @return string
-   */
-  function get_font_family() {
+    /**
+     * Getter for the 'font-family' CSS property.
+     *
+     * Uses the {@link Font_Metrics} class to resolve the font family into an
+     * actual font file.
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
+     * @return string
+     */
+    function get_font_family() {
   
     $DEBUGCSS=DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
 	
@@ -859,16 +859,16 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
+        if ( $weight < 600 )
         $weight = "normal";
-      else
+        else
         $weight = "bold";
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
-      $weight = "bold";
+        $weight = "bold";
 
     } else {
-      $weight = "normal";
+        $weight = "normal";
 
     }
 
@@ -876,18 +876,18 @@ 
     $font_style = $this->__get("font_style");
 
     if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
+        $subtype = "bold_italic";
     else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
+        $subtype = "bold";
     else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
+        $subtype = "italic";
     else
-      $subtype = "normal";
+        $subtype = "normal";
     
     // Resolve the font family
     if ($DEBUGCSS) {
-      print "<pre>[get_font_family:";
-      print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
+        print "<pre>[get_font_family:";
+        print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
     }
     $families = explode(",", $this->_props["font_family"]);
     $families = array_map('trim',$families);
@@ -895,17 +895,17 @@ 
 
     $font = null;
     while ( current($families) ) {
-      list(,$family) = each($families);
-      //remove leading and trailing string delimiters, e.g. on font names with spaces;
-      //remove leading and trailing whitespace
-      $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
-      $font = Font_Metrics::get_font($family, $subtype);
-
-      if ( $font ) {
+        list(,$family) = each($families);
+        //remove leading and trailing string delimiters, e.g. on font names with spaces;
+        //remove leading and trailing whitespace
+        $family=trim($family," \t\n\r\x0B\"'");
+        if ($DEBUGCSS) print '('.$family.')';
+        $font = Font_Metrics::get_font($family, $subtype);
+
+        if ( $font ) {
         if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
         return $font;
-      }
+        }
     }
 
     $family = null;
@@ -913,63 +913,63 @@ 
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
-      return $font;
+        if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+        return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
     
-  }
+    }
 
-  /**
-   * Returns the resolved font size, in points
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @return float
-   */
-  function get_font_size() {
+    /**
+     * Returns the resolved font size, in points
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @return float
+     */
+    function get_font_size() {
 
     if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+        return $this->_props["font_size"];
     
     if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
+        $fs = self::$_defaults["font_size"];
     else
-      $fs = $this->_props["font_size"];
+        $fs = $this->_props["font_size"];
     
     if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+        $this->_parent_font_size = self::$default_font_size;
     
     switch ($fs) {
       
     case "xx-small":
       $fs = 3/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-small":
       $fs = 3/4 * $this->_parent_font_size;
-      break;
+        break;
 
     case "smaller":
     case "small":
       $fs = 8/9 * $this->_parent_font_size;
-      break;
+        break;
 
     case "medium":
       $fs = $this->_parent_font_size;
-      break;
+        break;
 
     case "larger":
     case "large":
       $fs = 6/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-large":
       $fs = 3/2 * $this->_parent_font_size;
-      break;
+        break;
 
     case "xx-large":
       $fs = 2/1 * $this->_parent_font_size;
-      break;
+        break;
 
     default:
       break;
@@ -977,82 +977,82 @@ 
 
     // Ensure relative sizes resolve to something
     if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else
-      $fs = $this->length_in_pt($fs);
+        $fs = $this->length_in_pt($fs);
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $fs;
     $this->__font_size_calculated = true;
     return $this->_props["font_size"];
 
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
-   * @return float
-   */
-  function get_word_spacing() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
+     * @return float
+     */
+    function get_word_spacing() {
     if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+        return 0;
 
     return $this->_props["word_spacing"];
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
-   * @return float
-   */
-  function get_line_height() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
+     * @return float
+     */
+    function get_line_height() {
     if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+        return self::$default_line_height * $this->get_font_size();
 
     if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+        return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
-  }
+    }
 
-  /**
-   * Returns the colour as an array
-   *
-   * The array has the following format:
-   * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @return array
-   */
-  function get_color() {
+    /**
+     * Returns the colour as an array
+     *
+     * The array has the following format:
+     * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @return array
+     */
+    function get_color() {
     return $this->munge_color( $this->_props["color"] );
-  }
+    }
 
-  /**
-   * Returns the background colour as an array
-   *
-   * The returned array has the same format as {@link Style::get_color()}
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @return array
-   */
-  function get_background_color() {
+    /**
+     * Returns the background colour as an array
+     *
+     * The returned array has the same format as {@link Style::get_color()}
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @return array
+     */
+    function get_background_color() {
     return $this->munge_color( $this->_props["background_color"] );
-  }
+    }
   
-  /**
-   * Returns the background position as an array
-   *
-   * The returned array has the following format:
-   * <code>array(x,y, "x" => x, "y" => y)</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @return array
-   */
-  function get_background_position() {
+    /**
+     * Returns the background position as an array
+     *
+     * The returned array has the following format:
+     * <code>array(x,y, "x" => x, "y" => y)</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @return array
+     */
+    function get_background_position() {
     
     $tmp = explode(" ", $this->_props["background_position"]);
 
@@ -1060,119 +1060,119 @@ 
 
     case "left":
       $x = "0%";
-      break;
+        break;
 
     case "right":
       $x = "100%";
-      break;
+        break;
 
     case "top":
       $y = "0%";
-      break;
+        break;
 
     case "bottom":
       $y = "100%";
-      break;
+        break;
 
     case "center":
       $x = "50%";
-      $y = "50%";
-      break;
+        $y = "50%";
+        break;
 
     default:
       $x = $tmp[0];
-      break;
+        break;
     }
 
     if ( isset($tmp[1]) ) {
 
-      switch ($tmp[1]) {
-      case "left":
+        switch ($tmp[1]) {
+        case "left":
         $x = "0%";
         break;
         
-      case "right":
+        case "right":
         $x = "100%";
         break;
         
-      case "top":
+        case "top":
         $y = "0%";
         break;
         
-      case "bottom":
+        case "bottom":
         $y = "100%";
         break;
         
-      case "center":
+        case "center":
         if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
+            $y = "50%";
         else
-          $x = "50%";
+            $x = "50%";
         break;
         
-      default:
+        default:
         $y = $tmp[1];
         break;
-      }
+        }
 
     } else {
-      $y = "50%";
+        $y = "50%";
     }
 
     if ( !isset($x) )
-      $x = "0%";
+        $x = "0%";
 
     if ( !isset($y) )
-      $y = "0%";
+        $y = "0%";
 
     return array( 0 => $x, "x" => $x,
-                  1 => $y, "y" => $y );
-  }
+                    1 => $y, "y" => $y );
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @return string
-   */
-  function get_background_attachment() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @return string
+     */
+    function get_background_attachment() {
     return $this->_props["background_attachment"];
-  }
+    }
 
 
-  /**
-   * Returns the background_repeat as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @return string
-   */
-  function get_background_repeat() {
+    /**
+     * Returns the background_repeat as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @return string
+     */
+    function get_background_repeat() {
     return $this->_props["background_repeat"];
-  }
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing, but the individual get_background_xxx)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @return string
-   */
-  function get_background() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing, but the individual get_background_xxx)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @return string
+     */
+    function get_background() {
     return $this->_props["background"];
-  }
+    }
 
 
-  /**#@+
+    /**#@+
    * Returns the border colour as an array
    *
    * See {@link Style::get_color()}
@@ -1180,112 +1180,112 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-color-properties
    * @return array
    */
-  function get_border_top_color() {
+    function get_border_top_color() {
     if ( $this->_props["border_top_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_top_color"] = null;
-      $this->_props["border_top_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_top_color"] = null;
+        $this->_props["border_top_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_top_color"]);
-  }
+    }
 
-  function get_border_right_color() {
+    function get_border_right_color() {
     if ( $this->_props["border_right_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_right_color"] = null;
-      $this->_props["border_right_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_right_color"] = null;
+        $this->_props["border_right_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_right_color"]);
-  }
+    }
 
-  function get_border_bottom_color() {
+    function get_border_bottom_color() {
     if ( $this->_props["border_bottom_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_bottom_color"] = null;
-      $this->_props["border_bottom_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_bottom_color"] = null;
+        $this->_props["border_bottom_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_bottom_color"]);;
-  }
+    }
 
-  function get_border_left_color() {
+    function get_border_left_color() {
     if ( $this->_props["border_left_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_left_color"] = null;
-      $this->_props["border_left_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_left_color"] = null;
+        $this->_props["border_left_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_left_color"]);
-  }
+    }
   
-  /**#@-*/
+    /**#@-*/
 
- /**#@+
+    /**#@+
    * Returns the border width, as it is currently stored
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-width-properties
    * @return float|string
    */
-  function get_border_top_width() {
+    function get_border_top_width() {
     $style = $this->__get("border_top_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_top_width"]) : 0;
-  }
+    }
   
-  function get_border_right_width() {
+    function get_border_right_width() {
     $style = $this->__get("border_right_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_right_width"]) : 0;
-  }
+    }
 
-  function get_border_bottom_width() {
+    function get_border_bottom_width() {
     $style = $this->__get("border_bottom_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_bottom_width"]) : 0;
-  }
+    }
 
-  function get_border_left_width() {
+    function get_border_left_width() {
     $style = $this->__get("border_left_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_left_width"]) : 0;
-  }
-  /**#@-*/
-
-  /**
-   * Return an array of all border properties.
-   *
-   * The returned array has the following structure:
-   * <code>
-   * array("top" => array("width" => [border-width],
-   *                      "style" => [border-style],
-   *                      "color" => [border-color (array)]),
-   *       "bottom" ... )
-   * </code>
-   *
-   * @return array
-   */
-  function get_border_properties() {
+    }
+    /**#@-*/
+
+    /**
+     * Return an array of all border properties.
+     *
+     * The returned array has the following structure:
+     * <code>
+     * array("top" => array("width" => [border-width],
+     *                      "style" => [border-style],
+     *                      "color" => [border-color (array)]),
+     *       "bottom" ... )
+     * </code>
+     *
+     * @return array
+     */
+    function get_border_properties() {
     return array("top" => array("width" => $this->__get("border_top_width"),
                                 "style" => $this->__get("border_top_style"),
                                 "color" => $this->__get("border_top_color")),
-                 "bottom" => array("width" => $this->__get("border_bottom_width"),
-                                   "style" => $this->__get("border_bottom_style"),
-                                   "color" => $this->__get("border_bottom_color")),
-                 "right" => array("width" => $this->__get("border_right_width"),
-                                  "style" => $this->__get("border_right_style"),
-                                  "color" => $this->__get("border_right_color")),
-                 "left" => array("width" => $this->__get("border_left_width"),
-                                 "style" => $this->__get("border_left_style"),
-                                 "color" => $this->__get("border_left_color")));
-  }
-
-  /**
-   * Return a single border property
-   *
-   * @return mixed
-   */
-  protected function _get_border($side) {
+                    "bottom" => array("width" => $this->__get("border_bottom_width"),
+                                    "style" => $this->__get("border_bottom_style"),
+                                    "color" => $this->__get("border_bottom_color")),
+                    "right" => array("width" => $this->__get("border_right_width"),
+                                    "style" => $this->__get("border_right_style"),
+                                    "color" => $this->__get("border_right_color")),
+                    "left" => array("width" => $this->__get("border_left_width"),
+                                    "style" => $this->__get("border_left_style"),
+                                    "color" => $this->__get("border_left_color")));
+    }
+
+    /**
+     * Return a single border property
+     *
+     * @return mixed
+     */
+    protected function _get_border($side) {
     $color = $this->__get("border_" . $side . "_color");
     
     return $this->__get("border_" . $side . "_width") . " " .
-      $this->__get("border_" . $side . "_style") . " " . $color["hex"];
-  }
+        $this->__get("border_" . $side . "_style") . " " . $color["hex"];
+    }
 
-  /**#@+
+    /**#@+
    * Return full border properties as a string
    *
    * Border properties are returned just as specified in CSS:
@@ -1295,28 +1295,28 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-shorthand-properties
    * @return string
    */
-  function get_border_top() { return $this->_get_border("top"); }
-  function get_border_right() { return $this->_get_border("right"); }
-  function get_border_bottom() { return $this->_get_border("bottom"); }
-  function get_border_left() { return $this->_get_border("left"); }
-  /**#@-*/
-
-
-  /**
-   * Returns border spacing as an array
-   *
-   * The array has the format (h_space,v_space)
-   *
-   * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
-   * @return array
-   */
-  function get_border_spacing() {
+    function get_border_top() { return $this->_get_border("top"); }
+    function get_border_right() { return $this->_get_border("right"); }
+    function get_border_bottom() { return $this->_get_border("bottom"); }
+    function get_border_left() { return $this->_get_border("left"); }
+    /**#@-*/
+
+
+    /**
+     * Returns border spacing as an array
+     *
+     * The array has the format (h_space,v_space)
+     *
+     * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
+     * @return array
+     */
+    function get_border_spacing() {
     return explode(" ", $this->_props["border_spacing"]);
-  }
+    }
 
 /*==============================*/
 
-  /*
+    /*
    !important attribute
    For basic functionality of the !important attribute with overloading
    of several styles of an element, changes in inherit(), merge() and _parse_properties()
@@ -1358,419 +1358,419 @@ 
    Related functionality for background, padding, margin, font, list_style
   */
 
-  /* Generalized set function for individual attribute of combined style.
+    /* Generalized set function for individual attribute of combined style.
    * With check for !important
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
-  protected function _set_style_side_type($style,$side,$type,$val,$important) {
+    protected function _set_style_side_type($style,$side,$type,$val,$important) {
     if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache[$style.'_'.$side.$type] = null;
-      if ($important) {
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style.'_'.$side.$type] = null;
+        if ($important) {
         $this->_important_props[$style.'_'.$side.$type] = true;
-      }
-      $this->_props[$style.'_'.$side.$type] = $val;
+        }
+        $this->_props[$style.'_'.$side.$type] = $val;
+    }
     }
-  }
 
-  protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
-      $this->_set_style_side_type($style,'top',$type,$top,$important);
-      $this->_set_style_side_type($style,'right',$type,$right,$important);
-      $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
-      $this->_set_style_side_type($style,'left',$type,$left,$important);
-  }
+    protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
+        $this->_set_style_side_type($style,'top',$type,$top,$important);
+        $this->_set_style_side_type($style,'right',$type,$right,$important);
+        $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
+        $this->_set_style_side_type($style,'left',$type,$left,$important);
+    }
 
-  protected function _set_style_type($style,$type,$val,$important) {
+    protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
     case 1:
       $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
+        break;
     case 2:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
+        break;
     case 3:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
+        break;
     case 4:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
+        break;
     default:
       break;
     }
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache[$style.$type] = null;
+    $this->_prop_cache[$style.$type] = null;
     $this->_props[$style.$type] = $val;
-  }
+    }
 
-  protected function _set_style_type_important($style,$type,$val) {
+    protected function _set_style_type_important($style,$type,$val) {
     $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
-  }
+    }
 
-  /* Anyway only called if _important matches and is assigned
+    /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
-  protected function _set_style_side_width_important($style,$side,$val) {
+    protected function _set_style_side_width_important($style,$side,$val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
-  }
+    }
 
-  protected function _set_style($style,$val,$important) {
+    protected function _set_style($style,$val,$important) {
     if ( !isset($this->_important_props[$style]) || $important) {
-      if ($important) {
+        if ($important) {
         $this->_important_props[$style] = true;
-      }
-      //see __set and __get, on all assignments clear cache!
-	  $this->_prop_cache[$style] = null;
-      $this->_props[$style] = $val;
+        }
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style] = null;
+        $this->_props[$style] = $val;
+    }
     }
-  }
 
-  protected function _image($val) {
+    protected function _image($val) {
     $DEBUGCSS=DEBUGCSS;
     
     if ( mb_strpos($val, "url") === false ) {
-      $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
+        $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     } else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+        $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
 
-      // Resolve the url now in the context of the current stylesheet
-      $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
+        // Resolve the url now in the context of the current stylesheet
+        $parsed_url = explode_url($val);
+        if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
         if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
-          $path = $_SERVER["DOCUMENT_ROOT"].'/';
+            $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
-          $path = $this->_stylesheet->get_base_path();
+            $path = $this->_stylesheet->get_base_path();
         }
         $path .= $parsed_url["path"] . $parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
-      } else {
+        } else {
         $path = build_url($this->_stylesheet->get_protocol(),
-                          $this->_stylesheet->get_host(),
-                          $this->_stylesheet->get_base_path(),
-                          $val);
-      }
+                            $this->_stylesheet->get_host(),
+                            $this->_stylesheet->get_base_path(),
+                            $val);
+        }
     }
     if ($DEBUGCSS) {
-      print "<pre>[_image\n";
-      print_r($parsed_url);
-      print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+        print "<pre>[_image\n";
+        print_r($parsed_url);
+        print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
+        print "_image]</pre>";;
     }
     return $path;
-  }
+    }
 
 /*======================*/
 
-  /**
-   * Sets colour
-   *
-   * The colour parameter can be any valid CSS colour value
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @param string $colour
-   */
-  function set_color($colour) {
+    /**
+     * Sets colour
+     *
+     * The colour parameter can be any valid CSS colour value
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @param string $colour
+     */
+    function set_color($colour) {
     $col = $this->munge_colour($colour);
 
     if ( is_null($col) )
-      $col = self::$_defaults["color"];
+        $col = self::$_defaults["color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["color"] = null;
+    $this->_prop_cache["color"] = null;
     $this->_props["color"] = $col["hex"];
-  }
+    }
 
-  /**
-   * Sets the background colour
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @param string $colour
-   */
-  function set_background_color($colour) {
+    /**
+     * Sets the background colour
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @param string $colour
+     */
+    function set_background_color($colour) {
     $col = $this->munge_colour($colour);
     if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+        $col = self::$_defaults["background_color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_color"] = null;
+    $this->_prop_cache["background_color"] = null;
     $this->_props["background_color"] = is_array($col) ? $col["hex"] : $col;
-  }
+    }
 
-  /**
-   * Set the background image url
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
-   * @param string $url
-   */
-  function set_background_image($val) {
+    /**
+     * Set the background image url
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
+     * @param string $url
+     */
+    function set_background_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_image"] = null;
+    $this->_prop_cache["background_image"] = null;
     $this->_props["background_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the background repeat
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @param string $val
-   */
-  function set_background_repeat($val) {
+    /**
+     * Sets the background repeat
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @param string $val
+     */
+    function set_background_repeat($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+        $val = self::$_defaults["background_repeat"];
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background attachment
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @param string $val
-   */
-  function set_background_attachment($val) {
+    /**
+     * Sets the background attachment
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @param string $val
+     */
+    function set_background_attachment($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+        $val = self::$_defaults["background_attachment"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_attachment"] = null;
+    $this->_prop_cache["background_attachment"] = null;
     $this->_props["background_attachment"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background position
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @param string $val
-   */
-  function set_background_position($val) {
+    /**
+     * Sets the background position
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @param string $val
+     */
+    function set_background_position($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+        $val = self::$_defaults["background_position"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_position"] = null;
+    $this->_prop_cache["background_position"] = null;
     $this->_props["background_position"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background - combined options
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @param string $val
-   */
-  function set_background($val) {
+    /**
+     * Sets the background - combined options
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @param string $val
+     */
+    function set_background($val) {
     $col = null;
     $pos = array();
     $tmp = explode(" ", $val);
     $important = isset($this->_important_props["background"]);
     foreach($tmp as $attr) {
-	  if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
-   	    $this->_set_style("background_image", $this->_image($attr), $important);
-  	  } else if ($attr === "fixed" || $attr === "scroll") {
-   	    $this->_set_style("background_attachment", $attr, $important);
-  	  } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
-   	    $this->_set_style("background_repeat", $attr, $important);
-      } else if (($col = $this->munge_color($attr)) != null ) {
-   	    $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
-      } else {
- 		$pos[] = $attr;
- 	  }
- 	}
- 	if (count($pos)) {
- 	  $this->_set_style("background_position",implode(' ',$pos), $important);
- 	}
+        if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
+            $this->_set_style("background_image", $this->_image($attr), $important);
+        } else if ($attr === "fixed" || $attr === "scroll") {
+            $this->_set_style("background_attachment", $attr, $important);
+        } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
+            $this->_set_style("background_repeat", $attr, $important);
+        } else if (($col = $this->munge_color($attr)) != null ) {
+            $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
+        } else {
+            $pos[] = $attr;
+        }
+        }
+        if (count($pos)) {
+        $this->_set_style("background_position",implode(' ',$pos), $important);
+        }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background"] = null;
- 	$this->_props["background"] = $val;
-  }
+    $this->_prop_cache["background"] = null;
+        $this->_props["background"] = $val;
+    }
 
-  /**
-   * Sets the font size
-   *
-   * $size can be any acceptable CSS size
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @param string|float $size
-   */
-  function set_font_size($size) {
+    /**
+     * Sets the font size
+     *
+     * $size can be any acceptable CSS size
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @param string|float $size
+     */
+    function set_font_size($size) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $size;
-  }
+    }
 
-  /**
-   * Sets the font style
-   *
-   * combined attributes
-   * set individual attributes also, respecting !important mark
-   * exactly this order, separate by space. Multiple fonts separated by comma:
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * Other than with border and list, existing partial attributes should
-   * reset when starting here, even when not mentioned.
-   * If individual attribute is !important and explicite or implicite replacement is not,
-   * keep individual attribute
-   *
-   * require whitespace as delimiters for single value attributes
-   * On delimiter "/" treat first as font height, second as line height
-   * treat all remaining at the end of line as font
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * missing font-size and font-family might be not allowed, but accept it here and
-   * use default (medium size, enpty font name)
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_font($val) {
+    /**
+     * Sets the font style
+     *
+     * combined attributes
+     * set individual attributes also, respecting !important mark
+     * exactly this order, separate by space. Multiple fonts separated by comma:
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * Other than with border and list, existing partial attributes should
+     * reset when starting here, even when not mentioned.
+     * If individual attribute is !important and explicite or implicite replacement is not,
+     * keep individual attribute
+     *
+     * require whitespace as delimiters for single value attributes
+     * On delimiter "/" treat first as font height, second as line height
+     * treat all remaining at the end of line as font
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * missing font-size and font-family might be not allowed, but accept it here and
+     * use default (medium size, enpty font name)
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_font($val) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font"] = null;
- 	$this->_props["font"] = $val;
+    $this->_prop_cache["font"] = null;
+        $this->_props["font"] = $val;
 
     $important = isset($this->_important_props["font"]);
 
-	if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_style", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_style", self::$_defaults["font_style"], $important);
-	}
+    if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_style", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_style", self::$_defaults["font_style"], $important);
+    }
 
-	if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_variant", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
-	}
+    if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_variant", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
+    }
 
     //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip!
-	if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
+    if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
          !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/",$match[2])
-	   ) {
-		$this->_set_style("font_weight", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
-	}
-
-	if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_size", $match[1], $important);
-		$val = $match[2];
+        ) {
+        $this->_set_style("font_weight", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
+    }
+
+    if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_size", $match[1], $important);
+        $val = $match[2];
         if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-			$this->_set_style("line_height", $match[1], $important);
-			$val = $match[2];
+            $this->_set_style("line_height", $match[1], $important);
+            $val = $match[2];
         } else {
-			$this->_set_style("line_height", self::$_defaults["line_height"], $important);
+            $this->_set_style("line_height", self::$_defaults["line_height"], $important);
         }
-	} else {
- 		$this->_set_style("font_size", self::$_defaults["font_size"], $important);
-		$this->_set_style("line_height", self::$_defaults["line_height"], $important);
-	}
-
-	if(strlen($val) != 0) {
-	  $this->_set_style("font_family", $val, $important);
-	} else {
-	  $this->_set_style("font_family", self::$_defaults["font_family"], $important);
-	}
-  }
-
-  /**#@+
+    } else {
+            $this->_set_style("font_size", self::$_defaults["font_size"], $important);
+        $this->_set_style("line_height", self::$_defaults["line_height"], $important);
+    }
+
+    if(strlen($val) != 0) {
+        $this->_set_style("font_family", $val, $important);
+    } else {
+        $this->_set_style("font_family", self::$_defaults["font_family"], $important);
+    }
+    }
+
+    /**#@+
    * Sets page break properties
    *
    * @link http://www.w3.org/TR/CSS21/page.html#page-breaks
    * @param string $break
    */
-  function set_page_break_before($break) {
+    function set_page_break_before($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_before"] = null;
+    $this->_prop_cache["page_break_before"] = null;
     $this->_props["page_break_before"] = $break;
-  }
+    }
 
-  function set_page_break_after($break) {
+    function set_page_break_after($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_after"] = null;
+    $this->_prop_cache["page_break_after"] = null;
     $this->_props["page_break_after"] = $break;
-  }
-  /**#@-*/
+    }
+    /**#@-*/
     
-  //........................................................................
+    //........................................................................
 
-  /**#@+
+    /**#@+
    * Sets the margin size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#margin-properties
    * @param $val
    */
-  function set_margin_top($val) {
+    function set_margin_top($val) {
     $this->_set_style_side_width_important('margin','top',$val);
-  }
+    }
 
-  function set_margin_right($val) {
+    function set_margin_right($val) {
     $this->_set_style_side_width_important('margin','right',$val);
-  }
+    }
 
-  function set_margin_bottom($val) {
+    function set_margin_bottom($val) {
     $this->_set_style_side_width_important('margin','bottom',$val);
-  }
+    }
 
-  function set_margin_left($val) {
+    function set_margin_left($val) {
     $this->_set_style_side_width_important('margin','left',$val);
-  }
+    }
   
-  function set_margin($val) {
+    function set_margin($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('margin','',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
-  /**#@+
+    /**#@+
    * Sets the padding size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#padding-properties
    * @param $val
    */
-  function set_padding_top($val) {
+    function set_padding_top($val) {
     $this->_set_style_side_width_important('padding','top',$val);
-  }
+    }
 
-  function set_padding_right($val) {
+    function set_padding_right($val) {
     $this->_set_style_side_width_important('padding','right',$val);
-  }
+    }
 
-  function set_padding_bottom($val) {
+    function set_padding_bottom($val) {
     $this->_set_style_side_width_important('padding','bottom',$val);
-  }
+    }
 
-  function set_padding_left($val) {
+    function set_padding_left($val) {
     $this->_set_style_side_width_important('padding','left',$val);
-  }
+    }
 
-  function set_padding($val) {
+    function set_padding($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('padding','',$val);
-  }
-  /**#@-*/
-
-  /**
-   * Sets a single border
-   *
-   * @param string $side
-   * @param string $border_spec  ([width] [style] [color])
-   */
-  protected function _set_border($side, $border_spec, $important) {
+    }
+    /**#@-*/
+
+    /**
+     * Sets a single border
+     *
+     * @param string $side
+     * @param string $border_spec  ([width] [style] [color])
+     */
+    protected function _set_border($side, $border_spec, $important) {
     $border_spec = str_replace(",", " ", $border_spec);
     $arr = explode(" ", $border_spec);
 
@@ -1783,155 +1783,155 @@ 
     $this->_set_style_side_type('border',$side,'_color',self::$_defaults['border_'.$side.'_color'],$important);
 
     foreach ($arr as $value) {
-      $value = trim($value);
-      if ( in_array($value, self::$BORDER_STYLES) ) {
+        $value = trim($value);
+        if ( in_array($value, self::$BORDER_STYLES) ) {
         $this->_set_style_side_type('border',$side,'_style',$value,$important);
 
-      } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
+        } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
         $this->_set_style_side_type('border',$side,'_width',$value,$important);
 
-      } else {
+        } else {
         // must be colour
         $this->_set_style_side_type('border',$side,'_color',$value,$important);
-      }
+        }
     }
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache['border_'.$side] = null;
+    $this->_prop_cache['border_'.$side] = null;
     $this->_props['border_'.$side] = $border_spec;
-  }
+    }
 
-  /**#@+
+    /**#@+
    * Sets the border styles
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-properties
    * @param string $val
    */
-  function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
-  function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
-  function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
-  function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
+    function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
+    function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
+    function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
+    function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
 
-  function set_border($val) {
+    function set_border($val) {
     $important = isset($this->_important_props["border"]);
     $this->_set_border("top", $val, $important);
     $this->_set_border("right", $val, $important);
     $this->_set_border("bottom", $val, $important);
     $this->_set_border("left", $val, $important);
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border"] = null;
+    $this->_prop_cache["border"] = null;
     $this->_props["border"] = $val;
-  }
+    }
 
-  function set_border_width($val) {
+    function set_border_width($val) {
     $this->_set_style_type_important('border','_width',$val);
-  }
+    }
 
-  function set_border_color($val) {
+    function set_border_color($val) {
     $this->_set_style_type_important('border','_color',$val);
-  }
+    }
 
-  function set_border_style($val) {
+    function set_border_style($val) {
     $this->_set_style_type_important('border','_style',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
 
-  /**
-   * Sets the border spacing
-   *
-   * @link http://www.w3.org/TR/CSS21/box.html#border-properties
-   * @param float $val
-   */
-  function set_border_spacing($val) {
+    /**
+     * Sets the border spacing
+     *
+     * @link http://www.w3.org/TR/CSS21/box.html#border-properties
+     * @param float $val
+     */
+    function set_border_spacing($val) {
 
     $arr = explode(" ", $val);
 
     if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+        $arr[1] = $arr[0];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border_spacing"] = null;
+    $this->_prop_cache["border_spacing"] = null;
     $this->_props["border_spacing"] = $arr[0] . " " . $arr[1];
-  }
+    }
 
-  /**
-   * Sets the list style image
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
-   * @param $val
-   */
-  function set_list_style_image($val) {
+    /**
+     * Sets the list style image
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
+     * @param $val
+     */
+    function set_list_style_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style_image"] = null;
+    $this->_prop_cache["list_style_image"] = null;
     $this->_props["list_style_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the list style
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_list_style($val) {
+    /**
+     * Sets the list style
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_list_style($val) {
     $important = isset($this->_important_props["list_style"]);
     $arr = explode(" ", str_replace(",", " ", $val));
 
     static $types = array("disc", "circle", "square", "decimal",
-                   "decimal-leading-zero", "lower-roman",
-                   "upper-roman", "lower-greek", "lower-latin",
-                   "upper-latin", "armenian", "georgian",
-                   "lower-alpha", "upper-alpha", "hebrew",
-                   "cjk-ideographic", "hiragana", "katakana",
-                   "hiragana-iroha", "katakana-iroha", "none");
+                    "decimal-leading-zero", "lower-roman",
+                    "upper-roman", "lower-greek", "lower-latin",
+                    "upper-latin", "armenian", "georgian",
+                    "lower-alpha", "upper-alpha", "hebrew",
+                    "cjk-ideographic", "hiragana", "katakana",
+                    "hiragana-iroha", "katakana-iroha", "none");
 
     static $positions = array("inside", "outside");
 
     foreach ($arr as $value) {
-      /* http://www.w3.org/TR/CSS21/generate.html#list-style
+        /* http://www.w3.org/TR/CSS21/generate.html#list-style
        * A value of 'none' for the 'list-style' property sets both 'list-style-type' and 'list-style-image' to 'none'
        */
-      if ($value === "none") {
-   	    $this->_set_style("list_style_type", $value, $important);
-   	    $this->_set_style("list_style_image", $value, $important);
+        if ($value === "none") {
+            $this->_set_style("list_style_type", $value, $important);
+            $this->_set_style("list_style_image", $value, $important);
         continue;
-      }
+        }
 
-      //On setting or merging or inheriting list_style_image as well as list_style_type,
-      //and url exists, then url has precedence, otherwise fall back to list_style_type
-      //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
-      //Internet Explorer 7/8 and dompdf is right.
+        //On setting or merging or inheriting list_style_image as well as list_style_type,
+        //and url exists, then url has precedence, otherwise fall back to list_style_type
+        //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
+        //Internet Explorer 7/8 and dompdf is right.
        
-	  if (mb_substr($value, 0, 3) === "url") {
-   	    $this->_set_style("list_style_image", $this->_image($value), $important);
+        if (mb_substr($value, 0, 3) === "url") {
+            $this->_set_style("list_style_image", $this->_image($value), $important);
         continue;
-      }
+        }
 
-      if ( in_array($value, $types) ) {
-   	    $this->_set_style("list_style_type", $value, $important);
-      } else if ( in_array($value, $positions) ) {
-   	    $this->_set_style("list_style_position", $value, $important);
-      }
+        if ( in_array($value, $types) ) {
+            $this->_set_style("list_style_type", $value, $important);
+        } else if ( in_array($value, $positions) ) {
+            $this->_set_style("list_style_position", $value, $important);
+        }
     }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style"] = null;
- 	$this->_props["list_style"] = $val;
-  }
+    $this->_prop_cache["list_style"] = null;
+        $this->_props["list_style"] = $val;
+    }
 
-  /**
-   * Generate a string representation of the Style
-   *
-   * This dumps the entire property array into a string via print_r.  Useful
-   * for debugging.
-   *
-   * @return string
-   */
- /*DEBUGCSS print: see below additional debugging util*/
-  function __toString() {
+    /**
+     * Generate a string representation of the Style
+     *
+     * This dumps the entire property array into a string via print_r.  Useful
+     * for debugging.
+     *
+     * @return string
+     */
+    /*DEBUGCSS print: see below additional debugging util*/
+    function __toString() {
     return print_r(array_merge(array("parent_font_size" => $this->_parent_font_size),
-                               $this->_props), true);
-  }
+                                $this->_props), true);
+    }
 
 /*DEBUGCSS*/  function debug_print()
 /*DEBUGCSS*/  {

Switch Indentation +201 added lines, -201 removed lines

@@ -592,130 +592,130 @@ 
     // Handle colour names
     switch ($colour) {
 
-    case "maroon":
-      $r = 0x80;
-      break;
-
-    case "red":
-      $r = 0xff;
-      break;
-
-    case "orange":
-      $r = 0xff;
-      $g = 0xa5;
-      break;
-
-    case "yellow":
-      $r = 0xff;
-      $g = 0xff;
-      break;
-
-    case "olive":
-      $r = 0x80;
-      $g = 0x80;
-      break;
-
-    case "purple":
-      $r = 0x80;
-      $b = 0x80;
-      break;
-
-    case "fuchsia":
-      $r = 0xff;
-      $b = 0xff;
-      break;
-
-    case "white":
-      $r = $g = $b = 0xff;
-      break;
-
-    case "lime":
-      $g = 0xff;
-      break;
-
-    case "green":
-      $g = 0x80;
-      break;
-
-    case "navy":
-      $b = 0x80;
-      break;
-
-    case "blue":
-      $b = 0xff;
-      break;
-
-    case "aqua":
-      $g = 0xff;
-      $b = 0xff;
-      break;
-
-    case "teal":
-      $g = 0x80;
-      $b = 0x80;
-      break;
-
-    case "black":
-      break;
-
-    case "sliver":
-      $r = $g = $b = 0xc0;
-      break;
-
-    case "gray":
-    case "grey":
-      $r = $g = $b = 0x80;
-      break;
-
-    case "transparent":
-      return "transparent";
+        case "maroon":
+          $r = 0x80;
+          break;
+
+        case "red":
+          $r = 0xff;
+          break;
+
+        case "orange":
+          $r = 0xff;
+          $g = 0xa5;
+          break;
+
+        case "yellow":
+          $r = 0xff;
+          $g = 0xff;
+          break;
+
+        case "olive":
+          $r = 0x80;
+          $g = 0x80;
+          break;
+
+        case "purple":
+          $r = 0x80;
+          $b = 0x80;
+          break;
+
+        case "fuchsia":
+          $r = 0xff;
+          $b = 0xff;
+          break;
+
+        case "white":
+          $r = $g = $b = 0xff;
+          break;
+
+        case "lime":
+          $g = 0xff;
+          break;
+
+        case "green":
+          $g = 0x80;
+          break;
+
+        case "navy":
+          $b = 0x80;
+          break;
+
+        case "blue":
+          $b = 0xff;
+          break;
+
+        case "aqua":
+          $g = 0xff;
+          $b = 0xff;
+          break;
+
+        case "teal":
+          $g = 0x80;
+          $b = 0x80;
+          break;
+
+        case "black":
+          break;
+
+        case "sliver":
+          $r = $g = $b = 0xc0;
+          break;
+
+        case "gray":
+        case "grey":
+          $r = $g = $b = 0x80;
+          break;
+
+        case "transparent":
+          return "transparent";
       
-    default:
-      if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
-        // #rgb format
-        $r = hexdec($colour[1] . $colour[1]);
-        $g = hexdec($colour[2] . $colour[2]);
-        $b = hexdec($colour[3] . $colour[3]);
-
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
-        // #rrggbb format
-        $r = hexdec(mb_substr($colour, 1, 2));
-        $g = hexdec(mb_substr($colour, 3, 2));
-        $b = hexdec(mb_substr($colour, 5, 2));
-
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
-        // rgb( r,g,b ) format
-        $i = mb_strpos($colour, "(");
-        $j = mb_strpos($colour, ")");
+        default:
+          if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
+            // #rgb format
+            $r = hexdec($colour[1] . $colour[1]);
+            $g = hexdec($colour[2] . $colour[2]);
+            $b = hexdec($colour[3] . $colour[3]);
+
+          } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+            // #rrggbb format
+            $r = hexdec(mb_substr($colour, 1, 2));
+            $g = hexdec(mb_substr($colour, 3, 2));
+            $b = hexdec(mb_substr($colour, 5, 2));
+
+          } else if ( mb_strpos($colour, "rgb") !== false ) {
+            // rgb( r,g,b ) format
+            $i = mb_strpos($colour, "(");
+            $j = mb_strpos($colour, ")");
         
-        // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+            // Bad colour value
+            if ($i === false || $j === false)
+              return null;
 
-        $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
+            $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+            if (count($triplet) != 3)
+              return null;
         
-        foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            foreach (array_keys($triplet) as $c) {
+              $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
-        }
+              if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+                $triplet[$c] = round($triplet[$c] * 0.255);
+            }
 
-        list($r, $g, $b) = $triplet;
+            list($r, $g, $b) = $triplet;
 
-      } else {
-        // Who knows?
-        return null;
-      }
+          } else {
+            // Who knows?
+            return null;
+          }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+          // Clip to 0 - 1
+          $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+          $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+          $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+          break;
       
     }
     
@@ -941,38 +941,38 @@ 
     
     switch ($fs) {
       
-    case "xx-small":
-      $fs = 3/5 * $this->_parent_font_size;
-      break;
-
-    case "x-small":
-      $fs = 3/4 * $this->_parent_font_size;
-      break;
-
-    case "smaller":
-    case "small":
-      $fs = 8/9 * $this->_parent_font_size;
-      break;
-
-    case "medium":
-      $fs = $this->_parent_font_size;
-      break;
-
-    case "larger":
-    case "large":
-      $fs = 6/5 * $this->_parent_font_size;
-      break;
-
-    case "x-large":
-      $fs = 3/2 * $this->_parent_font_size;
-      break;
-
-    case "xx-large":
-      $fs = 2/1 * $this->_parent_font_size;
-      break;
-
-    default:
-      break;
+        case "xx-small":
+          $fs = 3/5 * $this->_parent_font_size;
+          break;
+
+        case "x-small":
+          $fs = 3/4 * $this->_parent_font_size;
+          break;
+
+        case "smaller":
+        case "small":
+          $fs = 8/9 * $this->_parent_font_size;
+          break;
+
+        case "medium":
+          $fs = $this->_parent_font_size;
+          break;
+
+        case "larger":
+        case "large":
+          $fs = 6/5 * $this->_parent_font_size;
+          break;
+
+        case "x-large":
+          $fs = 3/2 * $this->_parent_font_size;
+          break;
+
+        case "xx-large":
+          $fs = 2/1 * $this->_parent_font_size;
+          break;
+
+        default:
+          break;
     }
 
     // Ensure relative sizes resolve to something
@@ -1058,61 +1058,61 @@ 
 
     switch ($tmp[0]) {
 
-    case "left":
-      $x = "0%";
-      break;
+        case "left":
+          $x = "0%";
+          break;
 
-    case "right":
-      $x = "100%";
-      break;
+        case "right":
+          $x = "100%";
+          break;
 
-    case "top":
-      $y = "0%";
-      break;
+        case "top":
+          $y = "0%";
+          break;
 
-    case "bottom":
-      $y = "100%";
-      break;
+        case "bottom":
+          $y = "100%";
+          break;
 
-    case "center":
-      $x = "50%";
-      $y = "50%";
-      break;
+        case "center":
+          $x = "50%";
+          $y = "50%";
+          break;
 
-    default:
-      $x = $tmp[0];
-      break;
+        default:
+          $x = $tmp[0];
+          break;
     }
 
     if ( isset($tmp[1]) ) {
 
       switch ($tmp[1]) {
-      case "left":
-        $x = "0%";
-        break;
+          case "left":
+            $x = "0%";
+            break;
         
-      case "right":
-        $x = "100%";
-        break;
+          case "right":
+            $x = "100%";
+            break;
         
-      case "top":
-        $y = "0%";
-        break;
+          case "top":
+            $y = "0%";
+            break;
         
-      case "bottom":
-        $y = "100%";
-        break;
+          case "bottom":
+            $y = "100%";
+            break;
         
-      case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
-        break;
+          case "center":
+            if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
+              $y = "50%";
+            else
+              $x = "50%";
+            break;
         
-      default:
-        $y = $tmp[1];
-        break;
+          default:
+            $y = $tmp[1];
+            break;
       }
 
     } else {
@@ -1384,20 +1384,20 @@ 
   protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
-    case 1:
-      $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
-    case 2:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
-    case 3:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
-    case 4:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
-    default:
-      break;
+        case 1:
+          $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
+          break;
+        case 2:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
+          break;
+        case 3:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
+          break;
+        case 4:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
+          break;
+        default:
+          break;
     }
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache[$style.$type] = null;

Spacing +159 added lines, -159 removed lines

@@ -111,7 +111,7 @@ 
    *
    * @var array
    */
-  static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
+  static $BLOCK_TYPES = array("block", "inline-block", "table-cell", "list-item");
 
   /**
    * List of all table types.  Should really be a constant.
@@ -199,10 +199,10 @@ 
     $this->_parent_font_size = null;
     $this->__font_size_calculated = false;
     
-    if ( !isset(self::$_defaults) ) {
+    if (!isset(self::$_defaults)) {
     
       // Shorthand
-      $d =& self::$_defaults;
+      $d = & self::$_defaults;
     
       // All CSS 2.1 properties, and their default values
       $d["azimuth"] = "center";
@@ -398,90 +398,90 @@ 
    */
   function length_in_pt($length, $ref_size = null) {
 
-    if ( !is_array($length) )
+    if (!is_array($length))
       $length = array($length);
 
-    if ( !isset($ref_size) )
+    if (!isset($ref_size))
       $ref_size = self::$default_font_size;
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
+      if ($l === "auto")
         return "auto";
       
-      if ( $l === "none" )
+      if ($l === "none")
         return "none";
 
       // Assume numeric values are already in points
-      if ( is_numeric($l) ) {
+      if (is_numeric($l)) {
         $ret += $l;
         continue;
       }
         
-      if ( $l === "normal" ) {
+      if ($l === "normal") {
         $ret += $ref_size;
         continue;
       }
 
       // Border lengths
-      if ( $l === "thin" ) {
+      if ($l === "thin") {
         $ret += 0.5;
         continue;
       }
       
-      if ( $l === "medium" ) {
+      if ($l === "medium") {
         $ret += 1.5;
         continue;
       }
     
-      if ( $l === "thick" ) {
+      if ($l === "thick") {
         $ret += 2.5;
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "pt"))  !== false ) {
+      if (($i = mb_strpos($l, "pt")) !== false) {
         $ret += mb_substr($l, 0, $i);
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "px"))  !== false ) {
-        $ret += ( mb_substr($l, 0, $i)  * 72 ) / DOMPDF_DPI;
+      if (($i = mb_strpos($l, "px")) !== false) {
+        $ret += (mb_substr($l, 0, $i) * 72) / DOMPDF_DPI;
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "em"))  !== false ) {
+      if (($i = mb_strpos($l, "em")) !== false) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
       }
       
       // FIXME: em:ex ratio?
-      if ( ($i = mb_strpos($l, "ex"))  !== false ) {
+      if (($i = mb_strpos($l, "ex")) !== false) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "%"))  !== false ) {
-        $ret += mb_substr($l, 0, $i)/100 * $ref_size;
+      if (($i = mb_strpos($l, "%")) !== false) {
+        $ret += mb_substr($l, 0, $i) / 100 * $ref_size;
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "in")) !== false ) {
+      if (($i = mb_strpos($l, "in")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72;
         continue;
       }
           
-      if ( ($i = mb_strpos($l, "cm")) !== false ) {
+      if (($i = mb_strpos($l, "cm")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72 / 2.54;
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "mm")) !== false ) {
+      if (($i = mb_strpos($l, "mm")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72 / 25.4;
         continue;
       }
           
-      if ( ($i = mb_strpos($l, "pc")) !== false ) {
+      if (($i = mb_strpos($l, "pc")) !== false) {
         $ret += mb_substr($l, 0, $i) / 12;
         continue;
       }
@@ -507,12 +507,12 @@ 
     foreach (self::$_inherited as $prop) {
       //inherit the !important property also.
       //if local property is also !important, don't inherit.
-      if ( isset($parent->_props[$prop]) &&
-           ( !isset($this->_props[$prop]) ||
-             ( isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]) )
+      if (isset($parent->_props[$prop]) &&
+           (!isset($this->_props[$prop]) ||
+             (isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]))
            )
          ) {
-        if ( isset($parent->_important_props[$prop]) ) {
+        if (isset($parent->_important_props[$prop])) {
           $this->_important_props[$prop] = true;
         }
         //see __set and __get, on all assignments clear cache!
@@ -522,8 +522,8 @@ 
     }
       
     foreach (array_keys($this->_props) as $prop) {
-      if ( $this->_props[$prop] === "inherit" ) {
-        if ( isset($parent->_important_props[$prop]) ) {
+      if ($this->_props[$prop] === "inherit") {
+        if (isset($parent->_important_props[$prop])) {
           $this->_important_props[$prop] = true;
         }
         //do not assign direct, but
@@ -554,20 +554,20 @@ 
     //treat the !important attribute
     //if old rule has !important attribute, override with new rule only if
     //the new rule is also !important
-    foreach($style->_props as $prop => $val ) {
+    foreach ($style->_props as $prop => $val) {
       if (isset($style->_important_props[$prop])) {
  	    $this->_important_props[$prop] = true;
         //see __set and __get, on all assignments clear cache!
 		$this->_prop_cache[$prop] = null;
  	    $this->_props[$prop] = $val;
- 	  } else if ( !isset($this->_important_props[$prop]) ) {
+ 	  } else if (!isset($this->_important_props[$prop])) {
         //see __set and __get, on all assignments clear cache!
 		$this->_prop_cache[$prop] = null;
  	    $this->_props[$prop] = $val;
  	  }
  	}
 
-    if ( isset($style->_props["font_size"]) )
+    if (isset($style->_props["font_size"]))
       $this->__font_size_calculated = false;
   }
 
@@ -580,7 +580,7 @@ 
    * @return array
    */
   function munge_colour($colour) {
-    if ( is_array($colour) )
+    if (is_array($colour))
       // Assume the array has the right format...
       // FIXME: should/could verify this.
       return $colour;
@@ -671,19 +671,19 @@ 
       return "transparent";
       
     default:
-      if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
+      if (mb_strlen($colour) == 4 && $colour[0] === "#") {
         // #rgb format
-        $r = hexdec($colour[1] . $colour[1]);
-        $g = hexdec($colour[2] . $colour[2]);
-        $b = hexdec($colour[3] . $colour[3]);
+        $r = hexdec($colour[1].$colour[1]);
+        $g = hexdec($colour[2].$colour[2]);
+        $b = hexdec($colour[3].$colour[3]);
 
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+      } else if (mb_strlen($colour) == 7 && $colour[0] === "#") {
         // #rrggbb format
         $r = hexdec(mb_substr($colour, 1, 2));
         $g = hexdec(mb_substr($colour, 3, 2));
         $b = hexdec(mb_substr($colour, 5, 2));
 
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
+      } else if (mb_strpos($colour, "rgb") !== false) {
         // rgb( r,g,b ) format
         $i = mb_strpos($colour, "(");
         $j = mb_strpos($colour, ")");
@@ -692,7 +692,7 @@ 
         if ($i === false || $j === false)
           return null;
 
-        $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
+        $triplet = explode(",", mb_substr($colour, $i + 1, $j - $i - 1));
 
         if (count($triplet) != 3)
           return null;
@@ -700,7 +700,7 @@ 
         foreach (array_keys($triplet) as $c) {
           $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+          if ($triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%")
             $triplet[$c] = round($triplet[$c] * 0.255);
         }
 
@@ -784,19 +784,19 @@ 
     $prop = str_replace("-", "_", $prop);
     $this->_prop_cache[$prop] = null;
     
-    if ( !isset(self::$_defaults[$prop]) ) {
+    if (!isset(self::$_defaults[$prop])) {
       $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
       return;
     }
     
-    if ( $prop !== "content" && is_string($val) && mb_strpos($val, "url") === false ) {
+    if ($prop !== "content" && is_string($val) && mb_strpos($val, "url") === false) {
       $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
       $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
     }
     
     $method = "set_$prop";
 
-    if ( method_exists($this, $method) )
+    if (method_exists($this, $method))
       $this->$method($val);
     else
       $this->_props[$prop] = $val;
@@ -818,19 +818,19 @@ 
    */
   function __get($prop) {
     
-    if ( !isset(self::$_defaults[$prop]) )
+    if (!isset(self::$_defaults[$prop]))
       throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
 
-    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
+    if (isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
       return $this->_prop_cache[$prop];
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
-    if ( !isset($this->_props[$prop]) )
+    if (!isset($this->_props[$prop]))
       $this->_props[$prop] = self::$_defaults[$prop];
 
-    if ( method_exists($this, $method) )
+    if (method_exists($this, $method))
       return $this->_prop_cache[$prop] = $this->$method();
 
 
@@ -849,7 +849,7 @@ 
    */
   function get_font_family() {
   
-    $DEBUGCSS=DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
+    $DEBUGCSS = DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
 	
     // Select the appropriate font.  First determine the subtype, then check
     // the specified font-families for a candidate.
@@ -857,14 +857,14 @@ 
     // Resolve font-weight
     $weight = $this->__get("font_weight");
     
-    if ( is_numeric($weight) ) {
+    if (is_numeric($weight)) {
 
-      if ( $weight < 600 )
+      if ($weight < 600)
         $weight = "normal";
       else
         $weight = "bold";
 
-    } else if ( $weight === "bold" || $weight === "bolder" ) {
+    } else if ($weight === "bold" || $weight === "bolder") {
       $weight = "bold";
 
     } else {
@@ -875,11 +875,11 @@ 
     // Resolve font-style
     $font_style = $this->__get("font_style");
 
-    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
+    if ($weight === "bold" && ($font_style === "italic" || $font_style === "oblique"))
       $subtype = "bold_italic";
-    else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
+    else if ($weight === "bold" && $font_style !== "italic" && $font_style !== "oblique")
       $subtype = "bold";
-    else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
+    else if ($weight !== "bold" && ($font_style === "italic" || $font_style === "oblique"))
       $subtype = "italic";
     else
       $subtype = "normal";
@@ -890,19 +890,19 @@ 
       print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
     }
     $families = explode(",", $this->_props["font_family"]);
-    $families = array_map('trim',$families);
+    $families = array_map('trim', $families);
     reset($families);
 
     $font = null;
-    while ( current($families) ) {
+    while (current($families)) {
       list(,$family) = each($families);
       //remove leading and trailing string delimiters, e.g. on font names with spaces;
       //remove leading and trailing whitespace
-      $family=trim($family," \t\n\r\x0B\"'");
+      $family = trim($family, " \t\n\r\x0B\"'");
       if ($DEBUGCSS) print '('.$family.')';
       $font = Font_Metrics::get_font($family, $subtype);
 
-      if ( $font ) {
+      if ($font) {
         if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
         return $font;
       }
@@ -912,11 +912,11 @@ 
     if ($DEBUGCSS)  print '(default)';
     $font = Font_Metrics::get_font($family, $subtype);
 
-    if ( $font ) {
+    if ($font) {
       if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
       return $font;
     }
-    throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
+    throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '".$this->_props["font_family"]."'");
     
   }
 
@@ -928,30 +928,30 @@ 
    */
   function get_font_size() {
 
-    if ( $this->__font_size_calculated )
+    if ($this->__font_size_calculated)
       return $this->_props["font_size"];
     
-    if ( !isset($this->_props["font_size"]) )
+    if (!isset($this->_props["font_size"]))
       $fs = self::$_defaults["font_size"];
     else
       $fs = $this->_props["font_size"];
     
-    if ( !isset($this->_parent_font_size) )
+    if (!isset($this->_parent_font_size))
       $this->_parent_font_size = self::$default_font_size;
     
     switch ($fs) {
       
     case "xx-small":
-      $fs = 3/5 * $this->_parent_font_size;
+      $fs = 3 / 5 * $this->_parent_font_size;
       break;
 
     case "x-small":
-      $fs = 3/4 * $this->_parent_font_size;
+      $fs = 3 / 4 * $this->_parent_font_size;
       break;
 
     case "smaller":
     case "small":
-      $fs = 8/9 * $this->_parent_font_size;
+      $fs = 8 / 9 * $this->_parent_font_size;
       break;
 
     case "medium":
@@ -960,15 +960,15 @@ 
 
     case "larger":
     case "large":
-      $fs = 6/5 * $this->_parent_font_size;
+      $fs = 6 / 5 * $this->_parent_font_size;
       break;
 
     case "x-large":
-      $fs = 3/2 * $this->_parent_font_size;
+      $fs = 3 / 2 * $this->_parent_font_size;
       break;
 
     case "xx-large":
-      $fs = 2/1 * $this->_parent_font_size;
+      $fs = 2 / 1 * $this->_parent_font_size;
       break;
 
     default:
@@ -976,10 +976,10 @@ 
     }
 
     // Ensure relative sizes resolve to something
-    if ( ($i = mb_strpos($fs, "em")) !== false )
+    if (($i = mb_strpos($fs, "em")) !== false)
       $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
-    else if ( ($i = mb_strpos($fs, "ex")) !== false )
+    else if (($i = mb_strpos($fs, "ex")) !== false)
       $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else
@@ -998,7 +998,7 @@ 
    * @return float
    */
   function get_word_spacing() {
-    if ( $this->_props["word_spacing"] === "normal" )
+    if ($this->_props["word_spacing"] === "normal")
       return 0;
 
     return $this->_props["word_spacing"];
@@ -1009,13 +1009,13 @@ 
    * @return float
    */
   function get_line_height() {
-    if ( $this->_props["line_height"] === "normal" )
+    if ($this->_props["line_height"] === "normal")
       return self::$default_line_height * $this->get_font_size();
 
-    if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    if (is_numeric($this->_props["line_height"]))
+      return $this->length_in_pt($this->_props["line_height"]."%", $this->get_font_size());
     
-    return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
+    return $this->length_in_pt($this->_props["line_height"], $this->get_font_size());
   }
 
   /**
@@ -1028,7 +1028,7 @@ 
    * @return array
    */
   function get_color() {
-    return $this->munge_color( $this->_props["color"] );
+    return $this->munge_color($this->_props["color"]);
   }
 
   /**
@@ -1040,7 +1040,7 @@ 
    * @return array
    */
   function get_background_color() {
-    return $this->munge_color( $this->_props["background_color"] );
+    return $this->munge_color($this->_props["background_color"]);
   }
   
   /**
@@ -1084,7 +1084,7 @@ 
       break;
     }
 
-    if ( isset($tmp[1]) ) {
+    if (isset($tmp[1])) {
 
       switch ($tmp[1]) {
       case "left":
@@ -1104,7 +1104,7 @@ 
         break;
         
       case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
+        if ($tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center")
           $y = "50%";
         else
           $x = "50%";
@@ -1119,14 +1119,14 @@ 
       $y = "50%";
     }
 
-    if ( !isset($x) )
+    if (!isset($x))
       $x = "0%";
 
-    if ( !isset($y) )
+    if (!isset($y))
       $y = "0%";
 
-    return array( 0 => $x, "x" => $x,
-                  1 => $y, "y" => $y );
+    return array(0 => $x, "x" => $x,
+                  1 => $y, "y" => $y);
   }
 
 
@@ -1181,7 +1181,7 @@ 
    * @return array
    */
   function get_border_top_color() {
-    if ( $this->_props["border_top_color"] === "" ) {
+    if ($this->_props["border_top_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_top_color"] = null;
       $this->_props["border_top_color"] = $this->__get("color");
@@ -1190,7 +1190,7 @@ 
   }
 
   function get_border_right_color() {
-    if ( $this->_props["border_right_color"] === "" ) {
+    if ($this->_props["border_right_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_right_color"] = null;
       $this->_props["border_right_color"] = $this->__get("color");
@@ -1199,16 +1199,16 @@ 
   }
 
   function get_border_bottom_color() {
-    if ( $this->_props["border_bottom_color"] === "" ) {
+    if ($this->_props["border_bottom_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_bottom_color"] = null;
       $this->_props["border_bottom_color"] = $this->__get("color");
     }
-    return $this->munge_color($this->_props["border_bottom_color"]);;
+    return $this->munge_color($this->_props["border_bottom_color"]); ;
   }
 
   function get_border_left_color() {
-    if ( $this->_props["border_left_color"] === "" ) {
+    if ($this->_props["border_left_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_left_color"] = null;
       $this->_props["border_left_color"] = $this->__get("color");
@@ -1279,10 +1279,10 @@ 
    * @return mixed
    */
   protected function _get_border($side) {
-    $color = $this->__get("border_" . $side . "_color");
+    $color = $this->__get("border_".$side."_color");
     
-    return $this->__get("border_" . $side . "_width") . " " .
-      $this->__get("border_" . $side . "_style") . " " . $color["hex"];
+    return $this->__get("border_".$side."_width")." ".
+      $this->__get("border_".$side."_style")." ".$color["hex"];
   }
 
   /**#@+
@@ -1363,8 +1363,8 @@ 
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
-  protected function _set_style_side_type($style,$side,$type,$val,$important) {
-    if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
+  protected function _set_style_side_type($style, $side, $type, $val, $important) {
+    if (!isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache[$style.'_'.$side.$type] = null;
       if ($important) {
@@ -1374,27 +1374,27 @@ 
     }
   }
 
-  protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
-      $this->_set_style_side_type($style,'top',$type,$top,$important);
-      $this->_set_style_side_type($style,'right',$type,$right,$important);
-      $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
-      $this->_set_style_side_type($style,'left',$type,$left,$important);
+  protected function _set_style_sides_type($style, $top, $right, $bottom, $left, $type, $important) {
+      $this->_set_style_side_type($style, 'top', $type, $top, $important);
+      $this->_set_style_side_type($style, 'right', $type, $right, $important);
+      $this->_set_style_side_type($style, 'bottom', $type, $bottom, $important);
+      $this->_set_style_side_type($style, 'left', $type, $left, $important);
   }
 
-  protected function _set_style_type($style,$type,$val,$important) {
+  protected function _set_style_type($style, $type, $val, $important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
     case 1:
-      $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[0], $arr[0], $arr[0], $type, $important);
       break;
     case 2:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[0], $arr[1], $type, $important);
       break;
     case 3:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[1], $arr[2], $type, $important);
       break;
     case 4:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[2], $arr[3], $type, $important);
       break;
     default:
       break;
@@ -1404,21 +1404,21 @@ 
     $this->_props[$style.$type] = $val;
   }
 
-  protected function _set_style_type_important($style,$type,$val) {
-    $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
+  protected function _set_style_type_important($style, $type, $val) {
+    $this->_set_style_type($style, $type, $val, isset($this->_important_props[$style.$type]));
   }
 
   /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
-  protected function _set_style_side_width_important($style,$side,$val) {
+  protected function _set_style_side_width_important($style, $side, $val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
   }
 
-  protected function _set_style($style,$val,$important) {
-    if ( !isset($this->_important_props[$style]) || $important) {
+  protected function _set_style($style, $val, $important) {
+    if (!isset($this->_important_props[$style]) || $important) {
       if ($important) {
         $this->_important_props[$style] = true;
       }
@@ -1429,22 +1429,22 @@ 
   }
 
   protected function _image($val) {
-    $DEBUGCSS=DEBUGCSS;
+    $DEBUGCSS = DEBUGCSS;
     
-    if ( mb_strpos($val, "url") === false ) {
+    if (mb_strpos($val, "url") === false) {
       $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     } else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/", "\\1", trim($val));
 
       // Resolve the url now in the context of the current stylesheet
       $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
-        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
+      if ($parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "") {
+        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\') {
           $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
           $path = $this->_stylesheet->get_base_path();
         }
-        $path .= $parsed_url["path"] . $parsed_url["file"];
+        $path .= $parsed_url["path"].$parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
@@ -1459,7 +1459,7 @@ 
       print "<pre>[_image\n";
       print_r($parsed_url);
       print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+      print "_image]</pre>"; ;
     }
     return $path;
   }
@@ -1477,7 +1477,7 @@ 
   function set_color($colour) {
     $col = $this->munge_colour($colour);
 
-    if ( is_null($col) )
+    if (is_null($col))
       $col = self::$_defaults["color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1493,7 +1493,7 @@ 
    */
   function set_background_color($colour) {
     $col = $this->munge_colour($colour);
-    if ( is_null($col) )
+    if (is_null($col))
       $col = self::$_defaults["background_color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1520,7 +1520,7 @@ 
    * @param string $val
    */
   function set_background_repeat($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_repeat"];
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
@@ -1534,7 +1534,7 @@ 
    * @param string $val
    */
   function set_background_attachment($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_attachment"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1549,7 +1549,7 @@ 
    * @param string $val
    */
   function set_background_position($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_position"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1568,21 +1568,21 @@ 
     $pos = array();
     $tmp = explode(" ", $val);
     $important = isset($this->_important_props["background"]);
-    foreach($tmp as $attr) {
+    foreach ($tmp as $attr) {
 	  if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
    	    $this->_set_style("background_image", $this->_image($attr), $important);
   	  } else if ($attr === "fixed" || $attr === "scroll") {
    	    $this->_set_style("background_attachment", $attr, $important);
   	  } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
    	    $this->_set_style("background_repeat", $attr, $important);
-      } else if (($col = $this->munge_color($attr)) != null ) {
+      } else if (($col = $this->munge_color($attr)) != null) {
    	    $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
       } else {
  		$pos[] = $attr;
  	  }
  	}
  	if (count($pos)) {
- 	  $this->_set_style("background_position",implode(' ',$pos), $important);
+ 	  $this->_set_style("background_position", implode(' ', $pos), $important);
  	}
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background"] = null;
@@ -1636,14 +1636,14 @@ 
 
     $important = isset($this->_important_props["font"]);
 
-	if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(italic|oblique|normal)\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_style", $match[1], $important);
 		$val = $match[2];
 	} else {
 		$this->_set_style("font_style", self::$_defaults["font_style"], $important);
 	}
 
-	if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(small-caps|normal)\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_variant", $match[1], $important);
 		$val = $match[2];
 	} else {
@@ -1651,8 +1651,8 @@ 
 	}
 
     //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip!
-	if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
-         !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/",$match[2])
+	if (preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i", $val, $match) &&
+         !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/", $match[2])
 	   ) {
 		$this->_set_style("font_weight", $match[1], $important);
 		$val = $match[2];
@@ -1660,10 +1660,10 @@ 
 		$this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
 	}
 
-	if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_size", $match[1], $important);
 		$val = $match[2];
-        if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+        if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i", $val, $match)) {
 			$this->_set_style("line_height", $match[1], $important);
 			$val = $match[2];
         } else {
@@ -1674,7 +1674,7 @@ 
 		$this->_set_style("line_height", self::$_defaults["line_height"], $important);
 	}
 
-	if(strlen($val) != 0) {
+	if (strlen($val) != 0) {
 	  $this->_set_style("font_family", $val, $important);
 	} else {
 	  $this->_set_style("font_family", self::$_defaults["font_family"], $important);
@@ -1715,24 +1715,24 @@ 
    * @param $val
    */
   function set_margin_top($val) {
-    $this->_set_style_side_width_important('margin','top',$val);
+    $this->_set_style_side_width_important('margin', 'top', $val);
   }
 
   function set_margin_right($val) {
-    $this->_set_style_side_width_important('margin','right',$val);
+    $this->_set_style_side_width_important('margin', 'right', $val);
   }
 
   function set_margin_bottom($val) {
-    $this->_set_style_side_width_important('margin','bottom',$val);
+    $this->_set_style_side_width_important('margin', 'bottom', $val);
   }
 
   function set_margin_left($val) {
-    $this->_set_style_side_width_important('margin','left',$val);
+    $this->_set_style_side_width_important('margin', 'left', $val);
   }
   
   function set_margin($val) {
     $val = str_replace("none", "0px", $val);
-    $this->_set_style_type_important('margin','',$val);
+    $this->_set_style_type_important('margin', '', $val);
   }
   /**#@-*/
 
@@ -1743,24 +1743,24 @@ 
    * @param $val
    */
   function set_padding_top($val) {
-    $this->_set_style_side_width_important('padding','top',$val);
+    $this->_set_style_side_width_important('padding', 'top', $val);
   }
 
   function set_padding_right($val) {
-    $this->_set_style_side_width_important('padding','right',$val);
+    $this->_set_style_side_width_important('padding', 'right', $val);
   }
 
   function set_padding_bottom($val) {
-    $this->_set_style_side_width_important('padding','bottom',$val);
+    $this->_set_style_side_width_important('padding', 'bottom', $val);
   }
 
   function set_padding_left($val) {
-    $this->_set_style_side_width_important('padding','left',$val);
+    $this->_set_style_side_width_important('padding', 'left', $val);
   }
 
   function set_padding($val) {
     $val = str_replace("none", "0px", $val);
-    $this->_set_style_type_important('padding','',$val);
+    $this->_set_style_type_important('padding', '', $val);
   }
   /**#@-*/
 
@@ -1778,21 +1778,21 @@ 
  
     //For consistency of individal and combined properties, and with ie8 and firefox3
     //reset all attributes, even if only partially given
-    $this->_set_style_side_type('border',$side,'_style',self::$_defaults['border_'.$side.'_style'],$important);
-    $this->_set_style_side_type('border',$side,'_width',self::$_defaults['border_'.$side.'_width'],$important);
-    $this->_set_style_side_type('border',$side,'_color',self::$_defaults['border_'.$side.'_color'],$important);
+    $this->_set_style_side_type('border', $side, '_style', self::$_defaults['border_'.$side.'_style'], $important);
+    $this->_set_style_side_type('border', $side, '_width', self::$_defaults['border_'.$side.'_width'], $important);
+    $this->_set_style_side_type('border', $side, '_color', self::$_defaults['border_'.$side.'_color'], $important);
 
     foreach ($arr as $value) {
       $value = trim($value);
-      if ( in_array($value, self::$BORDER_STYLES) ) {
-        $this->_set_style_side_type('border',$side,'_style',$value,$important);
+      if (in_array($value, self::$BORDER_STYLES)) {
+        $this->_set_style_side_type('border', $side, '_style', $value, $important);
 
-      } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
-        $this->_set_style_side_type('border',$side,'_width',$value,$important);
+      } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value)) {
+        $this->_set_style_side_type('border', $side, '_width', $value, $important);
 
       } else {
         // must be colour
-        $this->_set_style_side_type('border',$side,'_color',$value,$important);
+        $this->_set_style_side_type('border', $side, '_color', $value, $important);
       }
     }
 
@@ -1824,15 +1824,15 @@ 
   }
 
   function set_border_width($val) {
-    $this->_set_style_type_important('border','_width',$val);
+    $this->_set_style_type_important('border', '_width', $val);
   }
 
   function set_border_color($val) {
-    $this->_set_style_type_important('border','_color',$val);
+    $this->_set_style_type_important('border', '_color', $val);
   }
 
   function set_border_style($val) {
-    $this->_set_style_type_important('border','_style',$val);
+    $this->_set_style_type_important('border', '_style', $val);
   }
   /**#@-*/
 
@@ -1847,12 +1847,12 @@ 
 
     $arr = explode(" ", $val);
 
-    if ( count($arr) == 1 )
+    if (count($arr) == 1)
       $arr[1] = $arr[0];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["border_spacing"] = null;
-    $this->_props["border_spacing"] = $arr[0] . " " . $arr[1];
+    $this->_props["border_spacing"] = $arr[0]." ".$arr[1];
   }
 
   /**
@@ -1907,9 +1907,9 @@ 
         continue;
       }
 
-      if ( in_array($value, $types) ) {
+      if (in_array($value, $types)) {
    	    $this->_set_style("list_style_type", $value, $important);
-      } else if ( in_array($value, $positions) ) {
+      } else if (in_array($value, $positions)) {
    	    $this->_set_style("list_style_position", $value, $important);
       }
     }
@@ -1935,8 +1935,8 @@ 
 
 /*DEBUGCSS*/  function debug_print()
 /*DEBUGCSS*/  {
-/*DEBUGCSS*/    print "parent_font_size:".$this->_parent_font_size . ";\n";
-/*DEBUGCSS*/    foreach($this->_props as $prop => $val ) {
+/*DEBUGCSS*/    print "parent_font_size:".$this->_parent_font_size.";\n";
+/*DEBUGCSS*/    foreach ($this->_props as $prop => $val) {
 /*DEBUGCSS*/      print $prop.':'.$val;
 /*DEBUGCSS*/      if (isset($this->_important_props[$prop])) {
 /*DEBUGCSS*/      	print '!important';

Braces +132 added lines, -92 removed lines

@@ -398,20 +398,24 @@ 
    */
   function length_in_pt($length, $ref_size = null) {
 
-    if ( !is_array($length) )
-      $length = array($length);
+    if ( !is_array($length) ) {
+          $length = array($length);
+    }
 
-    if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+    if ( !isset($ref_size) ) {
+          $ref_size = self::$default_font_size;
+    }
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
-        return "auto";
+      if ( $l === "auto" ) {
+              return "auto";
+      }
       
-      if ( $l === "none" )
-        return "none";
+      if ( $l === "none" ) {
+              return "none";
+      }
 
       // Assume numeric values are already in points
       if ( is_numeric($l) ) {
@@ -567,8 +571,9 @@ 
  	  }
  	}
 
-    if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
+    if ( isset($style->_props["font_size"]) ) {
+          $this->__font_size_calculated = false;
+    }
   }
 
   
@@ -580,10 +585,11 @@ 
    * @return array
    */
   function munge_colour($colour) {
-    if ( is_array($colour) )
-      // Assume the array has the right format...
+    if ( is_array($colour) ) {
+          // Assume the array has the right format...
       // FIXME: should/could verify this.
       return $colour;
+    }
     
     $r = 0;
     $g = 0;
@@ -689,19 +695,22 @@ 
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+        if ($i === false || $j === false) {
+                  return null;
+        }
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+        if (count($triplet) != 3) {
+                  return null;
+        }
         
         foreach (array_keys($triplet) as $c) {
           $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
+          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" ) {
+                      $triplet[$c] = round($triplet[$c] * 0.255);
+          }
         }
 
         list($r, $g, $b) = $triplet;
@@ -796,10 +805,11 @@ 
     
     $method = "set_$prop";
 
-    if ( method_exists($this, $method) )
-      $this->$method($val);
-    else
-      $this->_props[$prop] = $val;
+    if ( method_exists($this, $method) ) {
+          $this->$method($val);
+    } else {
+          $this->_props[$prop] = $val;
+    }
     
   }
 
@@ -818,20 +828,24 @@ 
    */
   function __get($prop) {
     
-    if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    if ( !isset(self::$_defaults[$prop]) ) {
+          throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    }
 
-    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null) {
+          return $this->_prop_cache[$prop];
+    }
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
-    if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+    if ( !isset($this->_props[$prop]) ) {
+          $this->_props[$prop] = self::$_defaults[$prop];
+    }
 
-    if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+    if ( method_exists($this, $method) ) {
+          return $this->_prop_cache[$prop] = $this->$method();
+    }
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
@@ -859,10 +873,11 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
-        $weight = "normal";
-      else
-        $weight = "bold";
+      if ( $weight < 600 ) {
+              $weight = "normal";
+      } else {
+              $weight = "bold";
+      }
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
       $weight = "bold";
@@ -875,14 +890,15 @@ 
     // Resolve font-style
     $font_style = $this->__get("font_style");
 
-    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
-    else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
-    else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
-    else
-      $subtype = "normal";
+    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "bold_italic";
+    } else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" ) {
+          $subtype = "bold";
+    } else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "italic";
+    } else {
+          $subtype = "normal";
+    }
     
     // Resolve the font family
     if ($DEBUGCSS) {
@@ -899,21 +915,29 @@ 
       //remove leading and trailing string delimiters, e.g. on font names with spaces;
       //remove leading and trailing whitespace
       $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
+      if ($DEBUGCSS) {
+          print '('.$family.')';
+      }
       $font = Font_Metrics::get_font($family, $subtype);
 
       if ( $font ) {
-        if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
+        if ($DEBUGCSS) {
+            print '('.$font.")get_font_family]\n</pre>";
+        }
         return $font;
       }
     }
 
     $family = null;
-    if ($DEBUGCSS)  print '(default)';
+    if ($DEBUGCSS) {
+        print '(default)';
+    }
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+      if ($DEBUGCSS) {
+          print '('.$font.")get_font_family]\n</pre>";
+      }
       return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
@@ -928,16 +952,19 @@ 
    */
   function get_font_size() {
 
-    if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+    if ( $this->__font_size_calculated ) {
+          return $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
-    else
-      $fs = $this->_props["font_size"];
+    if ( !isset($this->_props["font_size"]) ) {
+          $fs = self::$_defaults["font_size"];
+    } else {
+          $fs = $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+    if ( !isset($this->_parent_font_size) ) {
+          $this->_parent_font_size = self::$default_font_size;
+    }
     
     switch ($fs) {
       
@@ -976,14 +1003,13 @@ 
     }
 
     // Ensure relative sizes resolve to something
-    if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else
-      $fs = $this->length_in_pt($fs);
+    if ( ($i = mb_strpos($fs, "em")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else if ( ($i = mb_strpos($fs, "ex")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else {
+          $fs = $this->length_in_pt($fs);
+    }
 
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache["font_size"] = null;
@@ -998,8 +1024,9 @@ 
    * @return float
    */
   function get_word_spacing() {
-    if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+    if ( $this->_props["word_spacing"] === "normal" ) {
+          return 0;
+    }
 
     return $this->_props["word_spacing"];
   }
@@ -1009,11 +1036,13 @@ 
    * @return float
    */
   function get_line_height() {
-    if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+    if ( $this->_props["line_height"] === "normal" ) {
+          return self::$default_line_height * $this->get_font_size();
+    }
 
-    if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    if ( is_numeric($this->_props["line_height"]) ) {
+          return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    }
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
   }
@@ -1104,10 +1133,11 @@ 
         break;
         
       case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
+        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" ) {
+                  $y = "50%";
+        } else {
+                  $x = "50%";
+        }
         break;
         
       default:
@@ -1119,11 +1149,13 @@ 
       $y = "50%";
     }
 
-    if ( !isset($x) )
-      $x = "0%";
+    if ( !isset($x) ) {
+          $x = "0%";
+    }
 
-    if ( !isset($y) )
-      $y = "0%";
+    if ( !isset($y) ) {
+          $y = "0%";
+    }
 
     return array( 0 => $x, "x" => $x,
                   1 => $y, "y" => $y );
@@ -1477,8 +1509,9 @@ 
   function set_color($colour) {
     $col = $this->munge_colour($colour);
 
-    if ( is_null($col) )
-      $col = self::$_defaults["color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["color"] = null;
@@ -1493,8 +1526,9 @@ 
    */
   function set_background_color($colour) {
     $col = $this->munge_colour($colour);
-    if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["background_color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_color"] = null;
@@ -1520,8 +1554,9 @@ 
    * @param string $val
    */
   function set_background_repeat($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_repeat"];
+    }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
@@ -1534,8 +1569,9 @@ 
    * @param string $val
    */
   function set_background_attachment($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_attachment"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_attachment"] = null;
@@ -1549,8 +1585,9 @@ 
    * @param string $val
    */
   function set_background_position($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_position"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_position"] = null;
@@ -1688,8 +1725,9 @@ 
    * @param string $break
    */
   function set_page_break_before($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_before"] = null;
@@ -1697,8 +1735,9 @@ 
   }
 
   function set_page_break_after($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_after"] = null;
@@ -1847,8 +1886,9 @@ 
 
     $arr = explode(" ", $val);
 
-    if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+    if ( count($arr) == 1 ) {
+          $arr[1] = $arr[0];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["border_spacing"] = null;

main/inc/lib/phpdocx/pdf/include/table_frame_decorator.cls.php

Doc Comments -1 removed lines

@@ -129,7 +129,6 @@
    * added to the clone.  This method is overidden in order to remove
    * frames from the cellmap properly.
    *
-   * @param Frame $row
    */
   function split($child = null) {
 

Indentation +188 added lines, -189 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,73 +45,73 @@ 
  * @package dompdf
  */
 class Table_Frame_Decorator extends Frame_Decorator {
-  static $VALID_CHILDREN = array("table-row-group",
-                                 "table-row",
-                                 "table-header-group",
-                                 "table-footer-group",
-                                 "table-column",
-                                 "table-column-group",
-                                 "table-caption",
-                                 "table-cell");
-
-  static $ROW_GROUPS = array('table-row-group',
-                             'table-header-group',
-                             'table-footer-group');
-
-  /**
-   * The Cellmap object for this table.  The cellmap maps table cells
-   * to rows and columns, and aids in calculating column widths.
-   *
-   * @var Cellmap
-   */
-  protected $_cellmap;
-
-  /**
-   * The minimum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_min_width;
-
-  /**
-   * The maximum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_max_width;
-
-  /**
-   * Table header rows.  Each table header is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_headers;
-
-  /**
-   * Table footer rows.  Each table footer is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_footers;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    static $VALID_CHILDREN = array("table-row-group",
+                                    "table-row",
+                                    "table-header-group",
+                                    "table-footer-group",
+                                    "table-column",
+                                    "table-column-group",
+                                    "table-caption",
+                                    "table-cell");
+
+    static $ROW_GROUPS = array('table-row-group',
+                                'table-header-group',
+                                'table-footer-group');
+
+    /**
+     * The Cellmap object for this table.  The cellmap maps table cells
+     * to rows and columns, and aids in calculating column widths.
+     *
+     * @var Cellmap
+     */
+    protected $_cellmap;
+
+    /**
+     * The minimum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_min_width;
+
+    /**
+     * The maximum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_max_width;
+
+    /**
+     * Table header rows.  Each table header is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_headers;
+
+    /**
+     * Table footer rows.  Each table footer is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_footers;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_cellmap = new Cellmap($this);
     $this->_min_width = null;
     $this->_max_width = null;
     $this->_headers = array();
     $this->_footers = array();
-  }
+    }
 
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_cellmap->reset();
     $this->_min_width = null;
@@ -120,22 +119,22 @@ 
     $this->_headers = array();
     $this->_footers = array();
     $this->_reflower->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split the table at $row.  $row and all subsequent rows will be
-   * added to the clone.  This method is overidden in order to remove
-   * frames from the cellmap properly.
-   *
-   * @param Frame $row
-   */
-  function split($child = null) {
+    /**
+     * split the table at $row.  $row and all subsequent rows will be
+     * added to the clone.  This method is overidden in order to remove
+     * frames from the cellmap properly.
+     *
+     * @param Frame $row
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
     // If $child is a header or if it is the first non-header row, do
@@ -143,200 +142,200 @@ 
     if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
          !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
 
-      $first_header = null;
+        $first_header = null;
 
-      // Insert copies of the table headers before $child
-      foreach ($this->_headers as $header) {
+        // Insert copies of the table headers before $child
+        foreach ($this->_headers as $header) {
 
         $new_header = $header->deep_copy();
 
         if ( is_null($first_header) )
-          $first_header = $new_header;
+            $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
-      }
+        }
 
-      parent::split($first_header);
+        parent::split($first_header);
 
     } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
 
-      // Individual rows should have already been handled
-      parent::split($child);
+        // Individual rows should have already been handled
+        parent::split($child);
 
     } else {
 
-      $iter = $child;
+        $iter = $child;
 
-      while ($iter) {
+        while ($iter) {
         $this->_cellmap->remove_row($iter);
         $iter = $iter->get_next_sibling();
-      }
+        }
 
-      parent::split($child);
+        parent::split($child);
+    }
     }
-  }
 
-  /**
-   * Static function to locate the parent table of a frame
-   *
-   * @param Frame $frame
-   * @return Frame the table that is an ancestor of $frame
-   */
-  static function find_parent_table(Frame $frame) {
+    /**
+     * Static function to locate the parent table of a frame
+     *
+     * @param Frame $frame
+     * @return Frame the table that is an ancestor of $frame
+     */
+    static function find_parent_table(Frame $frame) {
 
     while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+        if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
 
     return $frame;
-  }
-
-  /**
-   * Return this table's Cellmap
-   *
-   * @return Cellmap
-   */
-  function get_cellmap() { return $this->_cellmap; }
-
-  /**
-   * Return the minimum width of this table
-   *
-   * @return float
-   */
-  function get_min_width() { return $this->_min_width; }
-
-  /**
-   * Return the maximum width of this table
-   *
-   * @return float
-   */
-  function get_max_width() { return $this->_max_width; }
-
-  /**
-   * Set the minimum width of the table
-   *
-   * @param float $width the new minimum width
-   */
-  function set_min_width($width) { $this->_min_width = $width; }
-
-  /**
-   * Set the maximum width of the table
-   *
-   * @param float $width the new maximum width
-   */
-  function set_max_width($width) { $this->_max_width = $width; }
-
-  /**
-   * Restructure tree so that the table has the correct structure.
-   * Invalid children (i.e. all non-table-rows) are moved below the
-   * table.
-   */
-  function normalise() {
+    }
+
+    /**
+     * Return this table's Cellmap
+     *
+     * @return Cellmap
+     */
+    function get_cellmap() { return $this->_cellmap; }
+
+    /**
+     * Return the minimum width of this table
+     *
+     * @return float
+     */
+    function get_min_width() { return $this->_min_width; }
+
+    /**
+     * Return the maximum width of this table
+     *
+     * @return float
+     */
+    function get_max_width() { return $this->_max_width; }
+
+    /**
+     * Set the minimum width of the table
+     *
+     * @param float $width the new minimum width
+     */
+    function set_min_width($width) { $this->_min_width = $width; }
+
+    /**
+     * Set the maximum width of the table
+     *
+     * @param float $width the new maximum width
+     */
+    function set_max_width($width) { $this->_max_width = $width; }
+
+    /**
+     * Restructure tree so that the table has the correct structure.
+     * Invalid children (i.e. all non-table-rows) are moved below the
+     * table.
+     */
+    function normalise() {
 
     // Store frames generated by invalid tags and move them outside the table
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
     while ( $iter ) {
-      $child = $iter;
-      $iter = $iter->get_next_sibling();
+        $child = $iter;
+        $iter = $iter->get_next_sibling();
 
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+        if ( $anon_row ) {
 
         if ( $display === "table-row" ) {
-          // Add the previous anonymous row
-          $this->insert_child_before($table_row, $child);
+            // Add the previous anonymous row
+            $this->insert_child_before($table_row, $child);
 
-          $table_row->normalise();
-          $child->normalise();
-          $anon_row = false;
-          continue;
+            $table_row->normalise();
+            $child->normalise();
+            $anon_row = false;
+            continue;
         }
 
         // add the child to the anonymous row
         $table_row->append_child($child);
         continue;
 
-      } else {
+        } else {
 
         if ( $display === "table-row" ) {
-          $child->normalise();
-          continue;
+            $child->normalise();
+            continue;
         }
 
         if ( $display === "table-cell") {
-          // Create an anonymous table row
-          $tr = $this->get_node()->ownerDocument->createElement("tr");
+            // Create an anonymous table row
+            $tr = $this->get_node()->ownerDocument->createElement("tr");
 
-          $frame = new Frame($tr);
+            $frame = new Frame($tr);
 
-          $css = $this->get_style()->get_stylesheet();
-          $style = $css->create_style();
-          $style->inherit($this->get_style());
+            $css = $this->get_style()->get_stylesheet();
+            $style = $css->create_style();
+            $style->inherit($this->get_style());
 
-          // Lookup styles for tr tags.  If the user wants styles to work
-          // better, they should make the tr explicit... I'm not going to
-          // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+            // Lookup styles for tr tags.  If the user wants styles to work
+            // better, they should make the tr explicit... I'm not going to
+            // try to guess what they intended.
+            if ( $tr_style = $css->lookup("tr") )
             $style->merge($tr_style);
 
-          // Okay, I have absolutely no idea why I need this clone here, but
-          // if it's omitted, php (as of 2004-07-28) segfaults.
-          $frame->set_style(clone $style);
-          $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
-          $table_row->set_root($this->_root);
+            // Okay, I have absolutely no idea why I need this clone here, but
+            // if it's omitted, php (as of 2004-07-28) segfaults.
+            $frame->set_style(clone $style);
+            $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
+            $table_row->set_root($this->_root);
 
-          // Add the cell to the row
-          $table_row->append_child($child);
+            // Add the cell to the row
+            $table_row->append_child($child);
 
-          $anon_row = true;
-          continue;
+            $anon_row = true;
+            continue;
         }
 
         if ( !in_array($display, self::$VALID_CHILDREN) ) {
-          $erroneous_frames[] = $child;
-          continue;
+            $erroneous_frames[] = $child;
+            continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+            if ( $grandchild->get_style()->display === "table-row" )
             $grandchild->normalise();
         }
 
         // Add headers and footers
         if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
+            $this->_headers[] = $child;
 
         else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
-      }
+            $this->_footers[] = $child;
+        }
     }
 
     if ( $anon_row ) {
-      // Add the row to the table
-      $this->_frame->append_child($table_row);
-      $table_row->normalise();
-      $this->_cellmap->add_row();
+        // Add the row to the table
+        $this->_frame->append_child($table_row);
+        $table_row->normalise();
+        $this->_cellmap->add_row();
     }
 
     foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+        $this->move_after($frame);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Moves the specified frame and it's corresponding node outside of
-   * the table.
-   *
-   * @param Frame $frame the frame to move
-   */
-  function move_after(Frame $frame) {
+    /**
+     * Moves the specified frame and it's corresponding node outside of
+     * the table.
+     *
+     * @param Frame $frame the frame to move
+     */
+    function move_after(Frame $frame) {
     $this->get_parent()->insert_child_after($frame, $this);
-  }
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -133,15 +133,15 @@ 
    */
   function split($child = null) {
 
-    if ( is_null($child) ) {
+    if (is_null($child)) {
       parent::split();
       return;
     }
 
     // If $child is a header or if it is the first non-header row, do
     // not duplicate headers, simply move the table to the next page.
-    if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
-         !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
+    if (count($this->_headers) && !in_array($child, $this->_headers, true) &&
+         !in_array($child->get_prev_sibling(), $this->_headers, true)) {
 
       $first_header = null;
 
@@ -150,7 +150,7 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
+        if (is_null($first_header))
           $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
@@ -158,7 +158,7 @@ 
 
       parent::split($first_header);
 
-    } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
+    } else if (in_array($child->get_style()->display, self::$ROW_GROUPS)) {
 
       // Individual rows should have already been handled
       parent::split($child);
@@ -184,8 +184,8 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ($frame = $frame->get_parent())
+      if (in_array($frame->get_style()->display, Style::$TABLE_TYPES))
         break;
 
     return $frame;
@@ -237,15 +237,15 @@ 
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
-    while ( $iter ) {
+    while ($iter) {
       $child = $iter;
       $iter = $iter->get_next_sibling();
 
       $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+      if ($anon_row) {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           // Add the previous anonymous row
           $this->insert_child_before($table_row, $child);
 
@@ -261,12 +261,12 @@ 
 
       } else {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           $child->normalise();
           continue;
         }
 
-        if ( $display === "table-cell") {
+        if ($display === "table-cell") {
           // Create an anonymous table row
           $tr = $this->get_node()->ownerDocument->createElement("tr");
 
@@ -279,7 +279,7 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+          if ($tr_style = $css->lookup("tr"))
             $style->merge($tr_style);
 
           // Okay, I have absolutely no idea why I need this clone here, but
@@ -295,27 +295,27 @@ 
           continue;
         }
 
-        if ( !in_array($display, self::$VALID_CHILDREN) ) {
+        if (!in_array($display, self::$VALID_CHILDREN)) {
           $erroneous_frames[] = $child;
           continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+          if ($grandchild->get_style()->display === "table-row")
             $grandchild->normalise();
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
+        if ($display === "table-header-group")
           $this->_headers[] = $child;
 
-        else if ( $display === "table-footer-group" )
+        else if ($display === "table-footer-group")
           $this->_footers[] = $child;
       }
     }
 
-    if ( $anon_row ) {
+    if ($anon_row) {
       // Add the row to the table
       $this->_frame->append_child($table_row);
       $table_row->normalise();

Braces +20 added lines, -15 removed lines

@@ -150,8 +150,9 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
-          $first_header = $new_header;
+        if ( is_null($first_header) ) {
+                  $first_header = $new_header;
+        }
 
         $this->insert_child_before($new_header, $child);
       }
@@ -184,9 +185,10 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ( $frame = $frame->get_parent() ) {
+          if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
+    }
 
     return $frame;
   }
@@ -279,8 +281,9 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
-            $style->merge($tr_style);
+          if ( $tr_style = $css->lookup("tr") ) {
+                      $style->merge($tr_style);
+          }
 
           // Okay, I have absolutely no idea why I need this clone here, but
           // if it's omitted, php (as of 2004-07-28) segfaults.
@@ -302,16 +305,17 @@ 
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
-            $grandchild->normalise();
+          if ( $grandchild->get_style()->display === "table-row" ) {
+                      $grandchild->normalise();
+          }
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
-
-        else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
+        if ( $display === "table-header-group" ) {
+                  $this->_headers[] = $child;
+        } else if ( $display === "table-footer-group" ) {
+                  $this->_footers[] = $child;
+        }
       }
     }
 
@@ -322,8 +326,9 @@ 
       $this->_cellmap->add_row();
     }
 
-    foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+    foreach ($erroneous_frames as $frame) {
+          $this->move_after($frame);
+    }
 
   }
 

main/inc/lib/phpdocx/pdf/include/tcpdf_adapter.cls.php

Doc Comments +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
   /**
    * Sets the stroke colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -196,7 +196,7 @@ 
   /**
    * Sets the fill colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -391,7 +391,7 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
+   * @param integer $adjust word spacing adjustment
    */
   function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
 
@@ -421,7 +421,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   function get_text_width($text, $font, $size, $spacing = 0){}

Indentation +328 added lines, -329 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -57,98 +56,98 @@ 
  */
 class TCPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
 
-  /**
-   * Instance of the TCPDF class
-   *
-   * @var TCPDF
-   */
-  private $_pdf;
-
-  /**
-   * PDF width in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height in points
-   *
-   * @var float
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Last line width used
-   *
-   * @var float
-   */
-  private $_last_line_width;
+    /**
+     * Instance of the TCPDF class
+     *
+     * @var TCPDF
+     */
+    private $_pdf;
+
+    /**
+     * PDF width in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height in points
+     *
+     * @var float
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Last line width used
+     *
+     * @var float
+     */
+    private $_last_line_width;
   
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accessing after initial rendering is complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accessing after initial rendering is complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
    
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZE[$paper];
+        $size = self::$PAPER_SIZE[$paper];
     else
-      $size = self::$PAPER_SIZE["letter"];
+        $size = self::$PAPER_SIZE["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
 
     $this->_width = $size[2] - $size[0];
@@ -163,135 +162,135 @@ 
     $this->_page_text = array();
 
     $this->_last_fill_color     =
-      $this->_last_stroke_color =
-      $this->_last_line_width   = null;
+        $this->_last_stroke_color =
+        $this->_last_line_width   = null;
 
-  }  
+    }  
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
-
-  /**
-   * Sets the stroke colour
-   *
-   * @param array $color
-   */
-  protected function _set_stroke_colour($colour) {
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
+
+    /**
+     * Sets the stroke colour
+     *
+     * @param array $color
+     */
+    protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_stroke_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_stroke_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Sets the fill colour
-   *
-   * @param array $color
-   */
-  protected function _set_fill_colour($colour) {
+    /**
+     * Sets the fill colour
+     *
+     * @param array $color
+     */
+    protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_fill_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_fill_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Return the TCPDF instance
-   *
-   * @return TCPDF
-   */
-  function get_tcpdf() { return $this->_pdf; }
+    /**
+     * Return the TCPDF instance
+     *
+     * @return TCPDF
+     */
+    function get_tcpdf() { return $this->_pdf; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     return $this->_page_number;
-  }
-
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    }
+
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     return $this->_page_count;
-  }
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     $this->_page_count = (int)$count;
-  }
-
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
 
     // FIXME: ugh, need to handle different styles here
     $this->_pdf->line($x1, $y1, $x2, $y2);
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
@@ -299,165 +298,165 @@ 
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     $this->_set_fill_colour($color);
     
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h, "F");
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
     // FIXME: FPDF sucks
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
-
-  function javascript($code){}
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h){}
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+
+    function javascript($code){}
   
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname){}
-
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height){}
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname){}
+
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height){}
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0){}
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size){}
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0){}
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size){}
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page(){}
-
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null){}
-
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($options = null){}
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page(){}
+
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null){}
+
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null){}
   
 }
     

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,7 @@ 
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . '/tcpdf/tcpdf.php');
+require_once(DOMPDF_LIB_DIR.'/tcpdf/tcpdf.php');
 
 /**
  * TCPDF PDF Rendering interface
@@ -138,14 +138,14 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
    
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZE[$paper];
     else
       $size = self::$PAPER_SIZE["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -186,8 +186,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_stroke_color = $color;
     }
 
@@ -203,8 +203,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_fill_color) || $color != $this->_last_fill_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_fill_color = $color;
     }
 
@@ -241,7 +241,7 @@ 
    * @param int $count
    */
   function set_page_count($count) {
-    $this->_page_count = (int)$count;
+    $this->_page_count = (int) $count;
   }
 
   /**
@@ -261,7 +261,7 @@ 
    */
   function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -289,7 +289,7 @@ 
    */   
   function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -363,7 +363,7 @@ 
    * @param array $style
    * @param bool $fill Fills the circle if true   
    */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {}
 
   /**
    * Add an image to the pdf.
@@ -378,7 +378,7 @@ 
    * @param int $w width (in pixels)
    * @param int $h height (in pixels)
    */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
+  function image($img_url, $img_type, $x, $y, $w, $h) {}
 
   /**
    * Writes text at the specified x and y coordinates
@@ -393,16 +393,16 @@ 
    * @param array $color
    * @param float $adjust word spacing adjustment
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0) {}
 
-  function javascript($code){}
+  function javascript($code) {}
   
   /**
    * Add a named destination (similar to <a name="foo">...</a> in html)
    *
    * @param string $anchorname The name of the named destination
    */
-  function add_named_dest($anchorname){}
+  function add_named_dest($anchorname) {}
 
   /**
    * Add a link to the pdf
@@ -413,7 +413,7 @@ 
    * @param float  $width   The width of the link
    * @param float  $height   The height of the link
    */
-  function add_link($url, $x, $y, $width, $height){}
+  function add_link($url, $x, $y, $width, $height) {}
   
   /**
    * Calculates text size, in points
@@ -424,7 +424,7 @@ 
    * @param float  $spacing word spacing, if any
    * @return float
    */
-  function get_text_width($text, $font, $size, $spacing = 0){}
+  function get_text_width($text, $font, $size, $spacing = 0) {}
 
   /**
    * Calculates font height, in points
@@ -433,7 +433,7 @@ 
    * @param float $size
    * @return float
    */
-  function get_font_height($font, $size){}
+  function get_font_height($font, $size) {}
 
   
   /**
@@ -441,7 +441,7 @@ 
    *
    * Subsequent drawing operations will appear on the new page.
    */
-  function new_page(){}
+  function new_page() {}
 
   /**
    * Streams the PDF directly to the browser
@@ -449,7 +449,7 @@ 
    * @param string $filename the name of the PDF file
    * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
    */
-  function stream($filename, $options = null){}
+  function stream($filename, $options = null) {}
 
   /**
    * Returns the PDF as a string
@@ -457,7 +457,7 @@ 
    * @param array  $options associative array: 'compress' => 1 or 0
    * @return string
    */
-  function output($options = null){}
+  function output($options = null) {}
   
 }
     

Braces +7 added lines, -6 removed lines

@@ -138,12 +138,13 @@
    */
   function __construct($paper = "letter", $orientation = "portrait") {
    
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZE[$paper];
-    else
-      $size = self::$PAPER_SIZE["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZE[$paper];
+    } else {
+          $size = self::$PAPER_SIZE["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];

main/inc/lib/phpdocx/pdf/lib/class.pdf.php

Doc Comments +90 added lines

@@ -347,6 +347,8 @@ 
 
   /**
    *destination object, used to specify the location for the user to jump to, presently on opening
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_destination($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -384,6 +386,7 @@ 
 
   /**
    * set the viewer preferences
+   * @param string $action
    */
   protected function  o_viewerPreferences($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -424,6 +427,7 @@ 
 
   /**
    * define the document catalog, the overall controller for the document
+   * @param string $action
    */
   protected function  o_catalog($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -490,6 +494,8 @@ 
 
   /**
    * object which is a parent to the pages in the document
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_pages($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -623,6 +629,8 @@ 
 
   /**
    * define the outlines in the doc, empty for now
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_outlines($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -658,6 +666,8 @@ 
 
   /**
    * an object to hold the font description
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_font($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -827,6 +837,8 @@ 
 
   /**
    * a font descriptor, needed for including additional fonts
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_fontDescriptor($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -885,6 +897,8 @@ 
 
   /**
    * the font encoding
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_fontEncoding($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -930,6 +944,7 @@ 
 
   /**
    * a descendent cid font,  needed for unicode fonts
+   * @param string $action
    */
   protected function  o_fontDescendentCID($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1019,6 +1034,7 @@ 
 
   /**
    * a font glyph to character map,  needed for unicode fonts
+   * @param string $action
    */
   protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1061,6 +1077,7 @@ 
 
   /**
    * the document procset, solves some problems with printing to old PS printers
+   * @param string $action
    */
   protected function  o_procset($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1099,6 +1116,7 @@ 
 
   /**
    * define the document information
+   * @param integer $id
    */
   protected function  o_info($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1151,6 +1169,8 @@ 
 
   /**
    * an action object, used to link to URLS initially
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_action($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1200,6 +1220,8 @@ 
   /**
    * an annotation object, this will add an annotation to the current page.
    * initially will support just link annotations
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_annotation($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1258,6 +1280,7 @@ 
 
   /**
    * a page object, it also creates a contents object to hold its contents
+   * @param string $action
    */
   protected function  o_page($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1342,6 +1365,8 @@ 
 
   /**
    * the contents objects hold all of the content which appears on pages
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_contents($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1397,6 +1422,10 @@ 
     }
   }
 
+  /**
+   * @param integer $id
+   * @param string $action
+   */
   protected function  o_embedjs($id, $action, $code = '') {
     if  ($action !== 'new') {
       $o = & $this->objects[$id];
@@ -1419,6 +1448,10 @@ 
     }
   }
   
+  /**
+   * @param integer $id
+   * @param string $action
+   */
   protected function  o_javascript($id, $action, $code = '') {
     if  ($action !== 'new') {
       $o = & $this->objects[$id];
@@ -1444,6 +1477,8 @@ 
 
   /**
    * an image object, will be an XObject in the document, includes description and data
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_image($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1561,6 +1596,8 @@ 
 
   /**
    * graphics state object
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_extGState($id,  $action,  $options = "") {
     static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
@@ -1604,6 +1641,8 @@ 
 
   /**
    * encryption object.
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_encryption($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1679,6 +1718,7 @@ 
 
   /**
    * calculate the 16 byte version of the 128 bit md5 digest of the string
+   * @param string $string
    */
   function  md5_16($string) {
     $tmp =  md5($string);
@@ -1765,6 +1805,11 @@ 
 
   /**
    * add a link in the document to an external URL
+   * @param string $url
+   * @param double $x0
+   * @param double $y0
+   * @param double $x1
+   * @param double $y1
    */
   function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
@@ -1775,6 +1820,11 @@ 
 
   /**
    * add a link in the document to an internal destination (ie. within the document)
+   * @param string $label
+   * @param double $x0
+   * @param double $y0
+   * @param double $x1
+   * @param double $y1
    */
   function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
@@ -2561,6 +2611,10 @@ 
 
   /**
    * draw a line from one set of coordinates to another
+   * @param double $x1
+   * @param double $y1
+   * @param double $x2
+   * @param double $y2
    */
   function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
@@ -2735,6 +2789,7 @@ 
 
   /**
    * draw a polygon, the syntax for this is similar to the GD polygon command
+   * @param integer $np
    */
   function  polygon($p, $np, $f =  0) {
     $this->objects[$this->currentContents]['c'].=  "\n";
@@ -2755,6 +2810,10 @@ 
   /**
    * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
    * the coordinates of the upper-right corner
+   * @param double $x1
+   * @param double $y1
+   * @param double $width
+   * @param double $height
    */
   function  filledRectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
@@ -2764,6 +2823,10 @@ 
   /**
    * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
    * the coordinates of the upper-right corner
+   * @param double $x1
+   * @param double $y1
+   * @param double $width
+   * @param double $height
    */
   function  rectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
@@ -2875,6 +2938,7 @@ 
 
   /**
    * return the height in units of the current font in the given size
+   * @param double $size
    */
   function  getFontHeight($size) {
     if  (!$this->numFonts) {
@@ -3064,6 +3128,8 @@ 
    * on the page the text will end
    *
    * @access private
+   * @param integer $angle
+   * @param integer $wa
    */
   function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
@@ -3468,6 +3534,8 @@ 
    * do a part of the calculation for sorting out the justification of the text
    *
    * @access private
+   * @param integer $adjust
+   * @param string $justification
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
@@ -3717,6 +3785,7 @@ 
 
   /**
    * open an existing object for editing
+   * @param integer $id
    */
   function  reopenObject($id) {
     $this->nStack++;
@@ -3748,6 +3817,7 @@ 
 
   /**
    * stop an object from appearing on pages from this point on
+   * @param integer $id
    */
   function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
@@ -3760,6 +3830,7 @@ 
 
   /**
    * after an object has been created, it wil only show if it has been added, using this function.
+   * @param integer $id
    */
   function  addObject($id, $options =  'add') {
     // add the specified object to the page
@@ -3835,6 +3906,7 @@ 
 
   /**
    * add content to the documents info object
+   * @param string $label
    */
   function  addInfo($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
@@ -3870,6 +3942,8 @@ 
    * extract an integer from a position in a byte stream
    *
    * @access private
+   * @param integer $pos
+   * @param integer $num
    */
   function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
@@ -3936,6 +4010,9 @@ 
   /**
    * add a PNG image into the document, from a file
    * this should work with remote files
+   * @param string $file
+   * @param double $x
+   * @param double $y
    */
   function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
     //if already cached, need not to read again
@@ -3978,6 +4055,7 @@ 
 
   /**
    * add a PNG image into the document, from a memory buffer of the file
+   * @param null|string $data
    */
   function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
 	if ( isset($this->imagelist[$file]) ) {
@@ -4231,6 +4309,9 @@ 
 
   /**
    * add a JPEG image into the document, from a file
+   * @param string $img
+   * @param double $x
+   * @param double $y
    */
   function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
@@ -4336,6 +4417,10 @@ 
   /* Check if image already added to pdf image directory.
    * If yes, need not to create again (pass empty data)
    */
+
+  /**
+   * @param string $imgname
+   */
   function  image_iscached($imgname) {
     return isset($this->imagelist[$imgname]);
   }
@@ -4345,6 +4430,7 @@ 
    * common code used by the two JPEG adding functions
    *
    * @access private
+   * @param null|string $data
    */
   function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
     if ( isset($this->imagelist[$imgname]) ) {
@@ -4377,6 +4463,7 @@ 
 
   /**
    * specify where the document should open when it first starts
+   * @param string $style
    */
   function  openHere($style, $a =  0, $b =  0, $c =  0) {
     // this function will open the document at a specified page, in a specified style
@@ -4402,6 +4489,8 @@ 
 
   /**
    * create a labelled destination within the document
+   * @param string $label
+   * @param string $style
    */
   function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
@@ -4420,6 +4509,7 @@ 
    * define font families, this is used to initialize the font families for the default fonts
    * and for the user to add new ones for their fonts. The default bahavious can be overridden should
    * that be desired.
+   * @param string $family
    */
   function  setFontFamily($family, $options =  '') {
     if  (!is_array($options)) {

Indentation +2039 added lines, -2039 removed lines

@@ -1,324 +1,324 @@ 
 <?php
-  /**
-   * Cpdf
-   *
-   * http://www.ros.co.nz/pdf
-   *
-   * A PHP class to provide the basic functionality to create a pdf document without
-   * any requirement for additional modules.
-   *
-   * Note that the companion class CezPdf can be used to extend this class and dramatically
-   * simplify the creation of documents.
-   *
-   * Extended by Orion Richardson to support Unicode / UTF-8 characters using
-   * TCPDF and others as a guide.
-   *
-   * IMPORTANT NOTE
-   * there is no warranty, implied or otherwise with this software.
-   *
-   * LICENCE
-   * This code has been placed in the Public Domain for all to enjoy.
-   *
-   * @author       Wayne Munro <pdf@ros.co.nz>
-   * @contributor  Orion Richardson <orionr@yahoo.com>
-   * @contributor  Helmut Tischer <htischer@weihenstephan.org>
-   * @contributor  Ryan H. Masten <ryan.masten@gmail.com>
-   * @version  009
-   * @package  Cpdf
-   *
-   * Changes
-   * @contributor Helmut Tischer <htischer@weihenstephan.org>
-   * @version 0.5.1.htischer.20090507
-   * - On multiple identical png and jpg images, put only one copy into the pdf file and refer to it.
-   *   This reduces file size and rendering time.
-   * - Allow font metrics cache to be a different folder as the font metrics. This allows a read only installation.
-   * - Allow adding images directly from a gd object. This increases performance by avoiding temporary files.
-   * - On png image files remove alpa channel to allow display of typical png files in pdf.
-   * - On addImage avoid temporary file. Todo: Duplicate Image (currently not used)
-   * - Add a check function, whether image is already cached, This avoids double creation by caller which saves
-   *   CPU time and memory.
-   * @contributor Helmut Tischer <htischer@weihenstephan.org>
-   * @version dompdf_trunk_with_helmut_mods.20090524
-   * - Allow temp and fontcache folders to be passed in by class creator
-   * @version dompdf_trunk_with_helmut_mods.20090528
-   * - typo 'decent' instead of 'descent' at various locations made getFontDescender worthless
-   */
+    /**
+     * Cpdf
+     *
+     * http://www.ros.co.nz/pdf
+     *
+     * A PHP class to provide the basic functionality to create a pdf document without
+     * any requirement for additional modules.
+     *
+     * Note that the companion class CezPdf can be used to extend this class and dramatically
+     * simplify the creation of documents.
+     *
+     * Extended by Orion Richardson to support Unicode / UTF-8 characters using
+     * TCPDF and others as a guide.
+     *
+     * IMPORTANT NOTE
+     * there is no warranty, implied or otherwise with this software.
+     *
+     * LICENCE
+     * This code has been placed in the Public Domain for all to enjoy.
+     *
+     * @author       Wayne Munro <pdf@ros.co.nz>
+     * @contributor  Orion Richardson <orionr@yahoo.com>
+     * @contributor  Helmut Tischer <htischer@weihenstephan.org>
+     * @contributor  Ryan H. Masten <ryan.masten@gmail.com>
+     * @version  009
+     * @package  Cpdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - On multiple identical png and jpg images, put only one copy into the pdf file and refer to it.
+     *   This reduces file size and rendering time.
+     * - Allow font metrics cache to be a different folder as the font metrics. This allows a read only installation.
+     * - Allow adding images directly from a gd object. This increases performance by avoiding temporary files.
+     * - On png image files remove alpa channel to allow display of typical png files in pdf.
+     * - On addImage avoid temporary file. Todo: Duplicate Image (currently not used)
+     * - Add a check function, whether image is already cached, This avoids double creation by caller which saves
+     *   CPU time and memory.
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Allow temp and fontcache folders to be passed in by class creator
+     * @version dompdf_trunk_with_helmut_mods.20090528
+     * - typo 'decent' instead of 'descent' at various locations made getFontDescender worthless
+     */
 
 /* $Id: class.pdf.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
 class  Cpdf {
 
 
-  /**
-   * the current number of pdf objects in the document
-   */
-  public  $numObj = 0;
+    /**
+     * the current number of pdf objects in the document
+     */
+    public  $numObj = 0;
 
-  /**
-   * this array contains all of the pdf objects, ready for final assembly
-   */
-  public  $objects =  array();
+    /**
+     * this array contains all of the pdf objects, ready for final assembly
+     */
+    public  $objects =  array();
 
-  /**
-   * the objectId (number within the objects array) of the document catalog
-   */
-  public  $catalogId;
+    /**
+     * the objectId (number within the objects array) of the document catalog
+     */
+    public  $catalogId;
 
-  /**
-   * array carrying information about the fonts that the system currently knows about
-   * used to ensure that a font is not loaded twice, among other things
-   */
-  public  $fonts = array();
+    /**
+     * array carrying information about the fonts that the system currently knows about
+     * used to ensure that a font is not loaded twice, among other things
+     */
+    public  $fonts = array();
   
-  /**
-   * the default font metrics file to use if no other font has been loaded
-   * the path to the directory containing the font metrics should be included
-   */
-  public  $defaultFont = './fonts/Helvetica.afm';
+    /**
+     * the default font metrics file to use if no other font has been loaded
+     * the path to the directory containing the font metrics should be included
+     */
+    public  $defaultFont = './fonts/Helvetica.afm';
   
-  /**
-   * a record of the current font
-   */
-  public  $currentFont = '';
+    /**
+     * a record of the current font
+     */
+    public  $currentFont = '';
 
-  /**
-   * the current base font
-   */
-  public  $currentBaseFont = '';
+    /**
+     * the current base font
+     */
+    public  $currentBaseFont = '';
 
-  /**
-   * the number of the current font within the font array
-   */
-  public  $currentFontNum = 0;
+    /**
+     * the number of the current font within the font array
+     */
+    public  $currentFontNum = 0;
 
-  /**
-   *
-   */
-  public  $currentNode;
+    /**
+     *
+     */
+    public  $currentNode;
 
-  /**
-   * object number of the current page
-   */
-  public  $currentPage;
+    /**
+     * object number of the current page
+     */
+    public  $currentPage;
 
-  /**
-   * object number of the currently active contents block
-   */
-  public  $currentContents;
+    /**
+     * object number of the currently active contents block
+     */
+    public  $currentContents;
 
-  /**
-   * number of fonts within the system
-   */
-  public  $numFonts = 0;
+    /**
+     * number of fonts within the system
+     */
+    public  $numFonts = 0;
 
-  /**
-   * Number of graphic state resources used
-   */
-  private  $numStates =  0;
+    /**
+     * Number of graphic state resources used
+     */
+    private  $numStates =  0;
 
 
-  /**
-   * current colour for fill operations, defaults to inactive value, all three components should be between 0 and 1 inclusive when active
-   */
-  public  $currentColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
+    /**
+     * current colour for fill operations, defaults to inactive value, all three components should be between 0 and 1 inclusive when active
+     */
+    public  $currentColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
 
-  /**
-   * current colour for stroke operations (lines etc.)
-   */
-  public  $currentStrokeColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
+    /**
+     * current colour for stroke operations (lines etc.)
+     */
+    public  $currentStrokeColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
 
-  /**
-   * current style that lines are drawn in
-   */
-  public  $currentLineStyle = '';
+    /**
+     * current style that lines are drawn in
+     */
+    public  $currentLineStyle = '';
 
-  /**
-   * current line transparency (partial graphics state)
-   */
-  public $currentLineTransparency = array("mode" => "Normal", "opacity" => 1.0);
+    /**
+     * current line transparency (partial graphics state)
+     */
+    public $currentLineTransparency = array("mode" => "Normal", "opacity" => 1.0);
   
-  /**
-   * current fill transparency (partial graphics state)
-   */
-  public $currentFillTransparency = array("mode" => "Normal", "opacity" => 1.0);
+    /**
+     * current fill transparency (partial graphics state)
+     */
+    public $currentFillTransparency = array("mode" => "Normal", "opacity" => 1.0);
   
-  /**
-   * an array which is used to save the state of the document, mainly the colours and styles
-   * it is used to temporarily change to another state, the change back to what it was before
-   */
-  public  $stateStack =  array();
+    /**
+     * an array which is used to save the state of the document, mainly the colours and styles
+     * it is used to temporarily change to another state, the change back to what it was before
+     */
+    public  $stateStack =  array();
 
-  /**
-   * number of elements within the state stack
-   */
-  public  $nStateStack =  0;
+    /**
+     * number of elements within the state stack
+     */
+    public  $nStateStack =  0;
 
-  /**
-   * number of page objects within the document
-   */
-  public  $numPages = 0;
+    /**
+     * number of page objects within the document
+     */
+    public  $numPages = 0;
 
-  /**
-   * object Id storage stack
-   */
-  public  $stack = array();
+    /**
+     * object Id storage stack
+     */
+    public  $stack = array();
 
-  /**
-   * number of elements within the object Id storage stack
-   */
-  public  $nStack = 0;
+    /**
+     * number of elements within the object Id storage stack
+     */
+    public  $nStack = 0;
 
-  /**
-   * an array which contains information about the objects which are not firmly attached to pages
-   * these have been added with the addObject function
-   */
-  public  $looseObjects = array();
+    /**
+     * an array which contains information about the objects which are not firmly attached to pages
+     * these have been added with the addObject function
+     */
+    public  $looseObjects = array();
 
-  /**
-   * array contains infomation about how the loose objects are to be added to the document
-   */
-  public  $addLooseObjects = array();
+    /**
+     * array contains infomation about how the loose objects are to be added to the document
+     */
+    public  $addLooseObjects = array();
 
-  /**
-   * the objectId of the information object for the document
-   * this contains authorship, title etc.
-   */
-  public  $infoObject = 0;
+    /**
+     * the objectId of the information object for the document
+     * this contains authorship, title etc.
+     */
+    public  $infoObject = 0;
 
-  /**
-   * number of images being tracked within the document
-   */
-  public  $numImages = 0;
+    /**
+     * number of images being tracked within the document
+     */
+    public  $numImages = 0;
 
-  /**
-   * an array containing options about the document
-   * it defaults to turning on the compression of the objects
-   */
-  public  $options = array('compression'=>1);
+    /**
+     * an array containing options about the document
+     * it defaults to turning on the compression of the objects
+     */
+    public  $options = array('compression'=>1);
 
-  /**
-   * the objectId of the first page of the document
-   */
-  public  $firstPageId;
+    /**
+     * the objectId of the first page of the document
+     */
+    public  $firstPageId;
 
-  /**
-   * used to track the last used value of the inter-word spacing, this is so that it is known
-   * when the spacing is changed.
-   */
-  public  $wordSpaceAdjust = 0;
+    /**
+     * used to track the last used value of the inter-word spacing, this is so that it is known
+     * when the spacing is changed.
+     */
+    public  $wordSpaceAdjust = 0;
 
-  /**
-   * the object Id of the procset object
-   */
-  public  $procsetObjectId;
+    /**
+     * the object Id of the procset object
+     */
+    public  $procsetObjectId;
 
-  /**
-   * store the information about the relationship between font families
-   * this used so that the code knows which font is the bold version of another font, etc.
-   * the value of this array is initialised in the constuctor function.
-   */
-  public  $fontFamilies =  array();
+    /**
+     * store the information about the relationship between font families
+     * this used so that the code knows which font is the bold version of another font, etc.
+     * the value of this array is initialised in the constuctor function.
+     */
+    public  $fontFamilies =  array();
  
-  /**
-   * folder for php serialized formats of font metrics files.
-   * If empty string, use same folder as original metrics files.
-   * This can be passed in from class creator.
-   * If this folder does not exist or is not writable, Cpdf will be **much** slower.
-   * Because of potential trouble with php safe mode, folder cannot be created at runtime.
-   */
-  public  $fontcache = '';
+    /**
+     * folder for php serialized formats of font metrics files.
+     * If empty string, use same folder as original metrics files.
+     * This can be passed in from class creator.
+     * If this folder does not exist or is not writable, Cpdf will be **much** slower.
+     * Because of potential trouble with php safe mode, folder cannot be created at runtime.
+     */
+    public  $fontcache = '';
   
-  /**
-   * The version of the font metrics cache file.
-   * This value must be manually incremented whenever the internal font data structure is modified.
-   */
-  public  $fontcacheVersion = 2;
+    /**
+     * The version of the font metrics cache file.
+     * This value must be manually incremented whenever the internal font data structure is modified.
+     */
+    public  $fontcacheVersion = 2;
 
-  /**
-   * temporary folder.
-   * If empty string, will attempty system tmp folder.
-   * This can be passed in from class creator.
-   * Only used for conversion of gd images to jpeg images.
-   */
-  public  $tmp = '';
+    /**
+     * temporary folder.
+     * If empty string, will attempty system tmp folder.
+     * This can be passed in from class creator.
+     * Only used for conversion of gd images to jpeg images.
+     */
+    public  $tmp = '';
 
-  /**
-   * track if the current font is bolded or italicised
-   */
-  public  $currentTextState =  '';
+    /**
+     * track if the current font is bolded or italicised
+     */
+    public  $currentTextState =  '';
 
-  /**
-   * messages are stored here during processing, these can be selected afterwards to give some useful debug information
-   */
-  public  $messages = '';
+    /**
+     * messages are stored here during processing, these can be selected afterwards to give some useful debug information
+     */
+    public  $messages = '';
 
-  /**
-   * the ancryption array for the document encryption is stored here
-   */
-  public  $arc4 = '';
+    /**
+     * the ancryption array for the document encryption is stored here
+     */
+    public  $arc4 = '';
 
-  /**
-   * the object Id of the encryption information
-   */
-  public  $arc4_objnum = 0;
+    /**
+     * the object Id of the encryption information
+     */
+    public  $arc4_objnum = 0;
 
-  /**
-   * the file identifier, used to uniquely identify a pdf document
-   */
-  public  $fileIdentifier = '';
+    /**
+     * the file identifier, used to uniquely identify a pdf document
+     */
+    public  $fileIdentifier = '';
 
-  /**
-   * a flag to say if a document is to be encrypted or not
-   */
-  public  $encrypted = 0;
+    /**
+     * a flag to say if a document is to be encrypted or not
+     */
+    public  $encrypted = 0;
 
-  /**
-   * the ancryption key for the encryption of all the document content (structure is not encrypted)
-   */
-  public  $encryptionKey = '';
+    /**
+     * the ancryption key for the encryption of all the document content (structure is not encrypted)
+     */
+    public  $encryptionKey = '';
 
-  /**
-   * array which forms a stack to keep track of nested callback functions
-   */
-  public  $callback =  array();
+    /**
+     * array which forms a stack to keep track of nested callback functions
+     */
+    public  $callback =  array();
 
-  /**
-   * the number of callback functions in the callback array
-   */
-  public  $nCallback =  0;
+    /**
+     * the number of callback functions in the callback array
+     */
+    public  $nCallback =  0;
 
-  /**
-   * store label->id pairs for named destinations, these will be used to replace internal links
-   * done this way so that destinations can be defined after the location that links to them
-   */
-  public  $destinations =  array();
+    /**
+     * store label->id pairs for named destinations, these will be used to replace internal links
+     * done this way so that destinations can be defined after the location that links to them
+     */
+    public  $destinations =  array();
 
-  /**
-   * store the stack for the transaction commands, each item in here is a record of the values of all the
-   * publiciables within the class, so that the user can rollback at will (from each 'start' command)
-   * note that this includes the objects array, so these can be large.
-   */
-  public  $checkpoint =  '';
+    /**
+     * store the stack for the transaction commands, each item in here is a record of the values of all the
+     * publiciables within the class, so that the user can rollback at will (from each 'start' command)
+     * note that this includes the objects array, so these can be large.
+     */
+    public  $checkpoint =  '';
 
-  /* Table of Image origin filenames and image labels which were already added with o_image().
+    /* Table of Image origin filenames and image labels which were already added with o_image().
    * Allows to merge identical images
    */
-  public  $imagelist = array();
+    public  $imagelist = array();
 
-  /**
-   * whether the text passed in should be treated as Unicode or just local character set.
-   */
-  public  $isUnicode = false;
+    /**
+     * whether the text passed in should be treated as Unicode or just local character set.
+     */
+    public  $isUnicode = false;
   
-  public  $javascript = '';
+    public  $javascript = '';
 
-  /**
-   * class constructor
-   * this will start a new document
-   * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
-   * @var boolean whether text will be treated as Unicode or not.
-   */
-  function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
+    /**
+     * class constructor
+     * this will start a new document
+     * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
+     * @var boolean whether text will be treated as Unicode or not.
+     */
+    function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
     $this->isUnicode = $isUnicode;
     $this->fontcache = $fontcache;
     $this->tmp = $tmp;
@@ -327,73 +327,73 @@ 
     // also initialize the font families that are known about already
     $this->setFontFamily('init');
     //  $this->fileIdentifier = md5('xxxxxxxx'.time());
-  }
-
-
-  /**
-   * Document object methods (internal use only)
-   *
-   * There is about one object method for each type of object in the pdf document
-   * Each function has the same call list ($id,$action,$options).
-   * $id = the object ID of the object, or what it is to be if it is being created
-   * $action = a string specifying the action to be performed, though ALL must support:
-   *           'new' - create the object with the id $id
-   *           'out' - produce the output for the pdf object
-   * $options = optional, a string or array containing the various parameters for the object
-   *
-   * These, in conjunction with the output function are the ONLY way for output to be produced
-   * within the pdf 'file'.
-   */
+    }
 
-  /**
-   *destination object, used to specify the location for the user to jump to, presently on opening
-   */
-  protected function  o_destination($id, $action, $options = '') {
+
+    /**
+     * Document object methods (internal use only)
+     *
+     * There is about one object method for each type of object in the pdf document
+     * Each function has the same call list ($id,$action,$options).
+     * $id = the object ID of the object, or what it is to be if it is being created
+     * $action = a string specifying the action to be performed, though ALL must support:
+     *           'new' - create the object with the id $id
+     *           'out' - produce the output for the pdf object
+     * $options = optional, a string or array containing the various parameters for the object
+     *
+     * These, in conjunction with the output function are the ONLY way for output to be produced
+     * within the pdf 'file'.
+     */
+
+    /**
+     *destination object, used to specify the location for the user to jump to, presently on opening
+     */
+    protected function  o_destination($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
-      case  'XYZ':
+        $tmp =  '';
+        switch  ($options['type']) {
+        case  'XYZ':
       case  'FitR':
         $tmp =   ' '.$options['p3'].$tmp;
-      case  'FitH':
+        case  'FitH':
       case  'FitV':
       case  'FitBH':
       case  'FitBV':
         $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
-      case  'Fit':
+        case  'Fit':
       case  'FitB':
         $tmp =   $options['type'].$tmp;
         $this->objects[$id]['info']['string'] = $tmp;
         $this->objects[$id]['info']['page'] = $options['page'];
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $tmp =  $o['info'];
-      $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
-      return  $res;
+        $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * set the viewer preferences
-   */
-  protected function  o_viewerPreferences($id, $action, $options = '') {
+    /**
+     * set the viewer preferences
+     */
+    protected function  o_viewerPreferences($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
-      break;
+        break;
 
     case  'add':
       foreach($options as  $k=>$v) {
@@ -406,167 +406,167 @@ 
         case  'NonFullScreenPageMode':
         case  'Direction':
           $o['info'][$k] = $v;
-          break;
+            break;
+        }
         }
-      }
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.= "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\n";
-      return  $res;
+        }
+        $res.= "\n>>\n";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the document catalog, the overall controller for the document
-   */
-  protected function  o_catalog($id, $action, $options = '') {
+    /**
+     * define the document catalog, the overall controller for the document
+     */
+    protected function  o_catalog($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
-      $this->catalogId = $id;
-      break;
+        $this->catalogId = $id;
+        break;
 
     case  'outlines':
     case  'pages':
     case  'openHere':
     case  'javascript':
       $o['info'][$action] = $options;
-      break;
+        break;
 
     case  'viewerPreferences':
       if  (!isset($o['info']['viewerPreferences'])) {
         $this->numObj++;
         $this->o_viewerPreferences($this->numObj, 'new');
         $o['info']['viewerPreferences'] = $this->numObj;
-      }
+        }
 
-      $vp =  $o['info']['viewerPreferences'];
-      $this->o_viewerPreferences($vp, 'add', $options);
+        $vp =  $o['info']['viewerPreferences'];
+        $this->o_viewerPreferences($vp, 'add', $options);
 
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         switch ($k) {
         case  'outlines':
           $res.= "\n".'/Outlines '.$v.' 0 R';
-          break;
+            break;
           
         case  'pages':
           $res.= "\n".'/Pages '.$v.' 0 R';
-          break;
+            break;
 
         case  'viewerPreferences':
           $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
-          break;
+            break;
 
         case  'openHere':
           $res.= "\n".'/OpenAction '.$v.' 0 R';
-          break;
+            break;
 
         case  'javascript':
           $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
-          break;
+            break;
+        }
         }
-      }
 
-      $res.= " >>\nendobj";
-      return  $res;
+        $res.= " >>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * object which is a parent to the pages in the document
-   */
-  protected function  o_pages($id, $action, $options = '') {
+    /**
+     * object which is a parent to the pages in the document
+     */
+    protected function  o_pages($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'pages', 'info'=>array());
-      $this->o_catalog($this->catalogId, 'pages', $id);
-      break;
+        $this->o_catalog($this->catalogId, 'pages', $id);
+        break;
 
     case  'page':
       if  (!is_array($options)) {
         // then it will just be the id of the new page
         $o['info']['pages'][] = $options;
-      } else {
+        } else {
         // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
         // and pos is either 'before' or 'after', saying where this page will fit.
         if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+            $i =  array_search($options['rid'], $o['info']['pages']);
+            if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
 
             // then there is a match
             // make a space
             switch  ($options['pos']) {
             case  'before':
               $k =  $i;
-              break;
+                break;
 
             case  'after':
               $k = $i+1;
-              break;
+                break;
 
             default:
               $k = -1;
-              break;
+                break;
             }
 
             if  ($k >= 0) {
-              for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
+                for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
                 $o['info']['pages'][$j+1] = $o['info']['pages'][$j];
-              }
+                }
 
-              $o['info']['pages'][$k] = $options['id'];
+                $o['info']['pages'][$k] = $options['id'];
+            }
             }
-          }
         }
-      }
-      break;
+        }
+        break;
 
     case  'procset':
       $o['info']['procset'] = $options;
-      break;
+        break;
 
     case  'mediaBox':
       $o['info']['mediaBox'] = $options;
-      // which should be an array of 4 numbers
-      break;
+        // which should be an array of 4 numbers
+        break;
 
     case  'font':
       $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
-      break;
+        break;
 
     case  'extGState':
       $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
-      break;
+        break;
 
     case  'xObject':
       $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
-      break;
+        break;
 
     case  'out':
       if  (count($o['info']['pages'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
         foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
+            $res.= $v." 0 R\n";
         }
 
         $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
@@ -574,129 +574,129 @@ 
         if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
               isset($o['info']['procset']) ||
               (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+            $res.= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
+            if  (isset($o['info']['procset'])) {
             $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
-          }
+            }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
+            if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
             $res.= "\n/Font << ";
             foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
             }
             $res.= "\n>>";
-          }
+            }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
+            if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
             $res.= "\n/XObject << ";
             foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+                $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
             }
             $res.= "\n>>";
-          }
+            }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
+            if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
             $res.=  "\n/ExtGState << ";
             foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+                $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
             }
             $res.=  "\n>>";
-          }
+            }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
+            $res.= "\n>>";
+            if  (isset($o['info']['mediaBox'])) {
             $tmp = $o['info']['mediaBox'];
             $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
-          }
+            }
         }
 
         $res.= "\n >>\nendobj";
-      } else {
+        } else {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the outlines in the doc, empty for now
-   */
-  protected function  o_outlines($id, $action, $options = '') {
+    /**
+     * define the outlines in the doc, empty for now
+     */
+    protected function  o_outlines($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
-      $this->o_catalog($this->catalogId, 'outlines', $id);
-      break;
+        $this->o_catalog($this->catalogId, 'outlines', $id);
+        break;
 
     case  'outline':
       $o['info']['outlines'][] = $options;
-      break;
+        break;
 
     case  'out':
       if  (count($o['info']['outlines'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
         foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
+            $res.= $v." 0 R ";
         }
 
         $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
-      } else {
+        } else {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an object to hold the font description
-   */
-  protected function  o_font($id, $action, $options = '') {
+    /**
+     * an object to hold the font description
+     */
+    protected function  o_font($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
+        $fontNum =  $this->numFonts;
+        $this->objects[$id]['info']['fontNum'] =  $fontNum;
 
-      // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
+        // deal with the encoding and the differences
+        if  (isset($options['differences'])) {
         // then we'll need an encoding dictionary
         $this->numObj++;
         $this->o_fontEncoding($this->numObj, 'new', $options);
         $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
+        } else  if  (isset($options['encoding'])) {
         // we can specify encoding here
         switch ($options['encoding']) {
         case  'WinAnsiEncoding':
         case  'MacRomanEncoding':
         case  'MacExpertEncoding':
           $this->objects[$id]['info']['encoding'] =  $options['encoding'];
-          break;
+            break;
 
         case  'none':
           break;
 
         default:
           $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-          break;
+            break;
         }
-      } else {
+        } else {
         $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-      }
+        }
 
-      if ($this->fonts[$options['fontFileName']]['isUnicode']) {
+        if ($this->fonts[$options['fontFileName']]['isUnicode']) {
         // For Unicode fonts, we need to incorporate font data into
         // sub-sections that are linked from the primary font section.
         // Look at o_fontGIDtoCID and o_fontDescendentCID functions
@@ -738,34 +738,34 @@ 
         $cidFontId = ++$this->numObj;
         $this->o_fontDescendentCID($cidFontId, 'new', $options);
         $this->objects[$id]['info']['cidFont'] = $cidFontId;
-      }
+        }
       
-      // also tell the pages node about the new font
-      $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
-      break;
+        // also tell the pages node about the new font
+        $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
+        break;
 
     case  'add':
       foreach ($options as  $k => $v) {
         switch  ($k) {
         case  'BaseFont':
           $o['info']['name'] =  $v;
-          break;
+            break;
         case  'FirstChar':
         case  'LastChar':
         case  'Widths':
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
+            $o['info'][$k] =  $v;
+            break;
+        }
         }
-      }
 
-      // pass values down to descendent font
-      if (isset($o['info']['cidFont'])) {
+        // pass values down to descendent font
+        if (isset($o['info']['cidFont'])) {
         $this->o_fontDescendentCID($o['info']['cidFont'], 'add', $options);
-      }
-      break;
+        }
+        break;
 
     case  'out':
       if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
@@ -787,60 +787,60 @@ 
         $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
         $res.=  ">>\n";
         $res.=  "endobj";
-      } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
+        } else {
+        $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+        $res.=  "/Name /F".$o['info']['fontNum']."\n";
+        $res.=  "/BaseFont /".$o['info']['name']."\n";
 
-      if  (isset($o['info']['encodingDictionary'])) {
+        if  (isset($o['info']['encodingDictionary'])) {
         // then place a reference to the dictionary
         $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
+        } else  if  (isset($o['info']['encoding'])) {
         // use the specified encoding
         $res.=  "/Encoding /".$o['info']['encoding']."\n";
-      }
+        }
 
-      if  (isset($o['info']['FirstChar'])) {
+        if  (isset($o['info']['FirstChar'])) {
         $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-      }
+        }
 
-      if  (isset($o['info']['LastChar'])) {
+        if  (isset($o['info']['LastChar'])) {
         $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-      }
+        }
 
-      if  (isset($o['info']['Widths'])) {
+        if  (isset($o['info']['Widths'])) {
         $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
-      }
+        }
 
-      if  (isset($o['info']['FontDescriptor'])) {
+        if  (isset($o['info']['FontDescriptor'])) {
         $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        }
 
         $res.=  ">>\n";
         $res.=  "endobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a font descriptor, needed for including additional fonts
-   */
-  protected function  o_fontDescriptor($id, $action, $options = '') {
+    /**
+     * a font descriptor, needed for including additional fonts
+     */
+    protected function  o_fontDescriptor($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
-      foreach ($o['info'] as  $label => $value) {
+        foreach ($o['info'] as  $label => $value) {
         switch  ($label) {
         case  'Ascent':
         case  'CapHeight':
@@ -857,111 +857,111 @@ 
         case  'CharSet':
           if  (mb_strlen($value, '8bit')) {
             $res.= '/'.$label.' '.$value."\n";
-          }
+            }
 
-          break;
+            break;
         case  'FontFile':
         case  'FontFile2':
         case  'FontFile3':
           $res.= '/'.$label.' '.$value." 0 R\n";
-          break;
+            break;
 
         case  'FontBBox':
           $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
-          break;
+            break;
 
         case  'FontName':
           $res.= '/'.$label.' /'.$value."\n";
-          break;
+            break;
+        }
         }
-      }
 
-      $res.= ">>\nendobj";
+        $res.= ">>\nendobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * the font encoding
-   */
-  protected function  o_fontEncoding($id, $action, $options = '') {
+    /**
+     * the font encoding
+     */
+    protected function  o_fontEncoding($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       // the options array should contain 'differences' and maybe 'encoding'
       $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
+        if  (!isset($o['info']['encoding'])) {
         $o['info']['encoding'] = 'WinAnsiEncoding';
-      }
+        }
 
-      if  ($o['info']['encoding'] !== 'none') {
+        if  ($o['info']['encoding'] !== 'none') {
         $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
-      }
+        }
 
-      $res.= "/Differences \n[";
+        $res.= "/Differences \n[";
 
-      $onum = -100;
+        $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
+        foreach($o['info']['differences'] as  $num=>$label) {
         if  ($num != $onum+1) {
-          // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
+            // we cannot make use of consecutive numbering
+            $res.=  "\n".$num." /".$label;
         } else {
-          $res.=  " /".$label;
+            $res.=  " /".$label;
         }
 
         $onum = $num;
-      }
+        }
 
-      $res.= "\n]\n>>\nendobj";
-      return  $res;
+        $res.= "\n]\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a descendent cid font,  needed for unicode fonts
-   */
-  protected function  o_fontDescendentCID($id, $action, $options = '') {
+    /**
+     * a descendent cid font,  needed for unicode fonts
+     */
+    protected function  o_fontDescendentCID($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
 
-      // we need a CID system info section
-      $cidSystemInfoId = ++$this->numObj;
-      $this->o_contents($cidSystemInfoId, 'new', 'raw');
-      $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
-      $this->objects[$cidSystemInfoId]['c'] = $res;
-
-      // and a CID to GID map
-      $cidToGidMapId = ++$this->numObj;
-      $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
-      $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
-      break;
+        // we need a CID system info section
+        $cidSystemInfoId = ++$this->numObj;
+        $this->o_contents($cidSystemInfoId, 'new', 'raw');
+        $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
+        $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+        $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+        $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
+        $res.=  ">>";
+        $this->objects[$cidSystemInfoId]['c'] = $res;
+
+        // and a CID to GID map
+        $cidToGidMapId = ++$this->numObj;
+        $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
+        $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
+        break;
 
     case  'add':
       foreach ($options as  $k => $v) {
         switch  ($k) {
         case  'BaseFont':
           $o['info']['name'] =  $v;
-          break;
+            break;
 
         case  'FirstChar':
         case  'LastChar':
@@ -969,21 +969,21 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
+            $o['info'][$k] =  $v;
+            break;
+        }
         }
-      }
 
-      // pass values down to cid to gid map
-      $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
-      break;
+        // pass values down to cid to gid map
+        $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
+        break;
 
     case  'out':
       $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+        $res.=  "<</Type /Font\n";
+        $res.=  "/Subtype /CIDFontType2\n";
+        $res.=  "/BaseFont /".$o['info']['name']."\n";
+        $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
 //      if  (isset($o['info']['FirstChar'])) {
 //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
 //      }
@@ -991,126 +991,126 @@ 
 //      if  (isset($o['info']['LastChar'])) {
 //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
 //      }
-      if  (isset($o['info']['FontDescriptor'])) {
+        if  (isset($o['info']['FontDescriptor'])) {
         $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        }
 
-      if  (isset($o['info']['MissingWidth'])) {
+        if  (isset($o['info']['MissingWidth'])) {
         $res.=  "/DW ".$o['info']['MissingWidth']."\n";
-      }
+        }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+        if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
         $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
         $w = '';
         foreach ($cid_widths as $cid => $width) {
-          $w .= $cid.' ['.$width.'] ';
+            $w .= $cid.' ['.$width.'] ';
         }
         $res.=  "/W [".$w."]\n";
-      }
+        }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+        $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+        $res.=  ">>\n";
+        $res.=  "endobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
   
 
-  /**
-   * a font glyph to character map,  needed for unicode fonts
-   */
-  protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
+    /**
+     * a font glyph to character map,  needed for unicode fonts
+     */
+    protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n";
-      $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
-      $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
+        $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
+        $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
                     $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
+        if  (!$compressed && isset($o['raw'])) {
         $res.= $tmp;
-      } else {
+        } else {
         $res.=  "<<";
 
         if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
+            // then implement ZLIB based compression on this content stream
+            $compressed = true;
+            $tmp =  gzcompress($tmp,  6);
         }
         if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
+            $res.= "\n/Filter /FlateDecode";
         }
 
         $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
-      }
+        }
 
-      $res.= "\nendobj";
-      return  $res;
+        $res.= "\nendobj";
+        return  $res;
+    }
     }
-  }
   
 
-  /**
-   * the document procset, solves some problems with printing to old PS printers
-   */
-  protected function  o_procset($id, $action, $options = '') {
+    /**
+     * the document procset, solves some problems with printing to old PS printers
+     */
+    protected function  o_procset($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
-      $this->o_pages($this->currentNode, 'procset', $id);
-      $this->procsetObjectId = $id;
-      break;
+        $this->o_pages($this->currentNode, 'procset', $id);
+        $this->procsetObjectId = $id;
+        break;
 
     case  'add':
       // this is to add new items to the procset list, despite the fact that this is considered
       // obselete, the items are required for printing to some postscript printers
       switch  ($options) {
-      case  'ImageB':
+        case  'ImageB':
       case  'ImageC':
       case  'ImageI':
         $o['info'][$options] = 1;
         break;
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n[";
-      foreach ($o['info'] as  $label=>$val) {
+        foreach ($o['info'] as  $label=>$val) {
         $res.= '/'.$label.' ';
-      }
-      $res.= "]\nendobj";
-      return  $res;
+        }
+        $res.= "]\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the document information
-   */
-  protected function  o_info($id, $action, $options = '') {
+    /**
+     * define the document information
+     */
+    protected function  o_info($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->infoObject = $id;
-      $date = 'D:'.@date('Ymd');
-      $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
-      break;
+        $date = 'D:'.@date('Ymd');
+        $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
+        break;
     case  'Title':
     case  'Author':
     case  'Subject':
@@ -1121,107 +1121,107 @@ 
     case  'ModDate':
     case  'Trapped':
       $o['info'][$action] = $options;
-      break;
+        break;
 
     case  'out':
       if  ($this->encrypted) {
         $this->encryptInit($id);
-      }
+        }
 
-      $res = "\n".$id." 0 obj\n<<\n";
-      foreach ($o['info'] as  $k=>$v) {
+        $res = "\n".$id." 0 obj\n<<\n";
+        foreach ($o['info'] as  $k=>$v) {
         $res.= '/'.$k.' (';
         // dates must be outputted as-is, without Unicode transformations
         $raw = ($k === 'CreationDate' || $k === 'ModDate');
         $c = $v;
 
         if  ($this->encrypted) {
-          $c = $this->ARC4($c);
+            $c = $this->ARC4($c);
         }
 
         $res.= ($raw) ? $c : $this->filterText($c);
         $res.= ")\n";
-      }
+        }
 
-      $res.= ">>\nendobj";
-      return  $res;
+        $res.= ">>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an action object, used to link to URLS initially
-   */
-  protected function  o_action($id, $action, $options = '') {
+    /**
+     * an action object, used to link to URLS initially
+     */
+    protected function  o_action($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       if  (is_array($options)) {
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
-      } else {
+        } else {
         // then assume a URI action
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
-      }
-      break;
+        }
+        break;
 
     case  'out':
       if  ($this->encrypted) {
         $this->encryptInit($id);
-      }
+        }
 
-      $res = "\n".$id." 0 obj\n<< /Type /Action";
-      switch ($o['type']) {
-      case  'ilink':
+        $res = "\n".$id." 0 obj\n<< /Type /Action";
+        switch ($o['type']) {
+        case  'ilink':
         // there will be an 'label' setting, this is the name of the destination
         $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
         break;
 
-      case  'URI':
+        case  'URI':
         $res.= "\n/S /URI\n/URI (";
         if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
+            $res.= $this->filterText($this->ARC4($o['info']));
         } else {
-          $res.= $this->filterText($o['info']);
+            $res.= $this->filterText($o['info']);
         }
 
         $res.= ")";
         break;
-      }
+        }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an annotation object, this will add an annotation to the current page.
-   * initially will support just link annotations
-   */
-  protected function  o_annotation($id, $action, $options = '') {
+    /**
+     * an annotation object, this will add an annotation to the current page.
+     * initially will support just link annotations
+     */
+    protected function  o_annotation($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       // add the annotation to the current page
       $pageId =  $this->currentPage;
-      $this->o_page($pageId, 'annot', $id);
+        $this->o_page($pageId, 'annot', $id);
 
-      // and add the action object which is going to be required
-      switch ($options['type']) {
-      case  'link':
+        // and add the action object which is going to be required
+        switch ($options['type']) {
+        case  'link':
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
         $this->numObj++;
         $this->o_action($this->numObj, 'new', $options['url']);
         $this->objects[$id]['info']['actionId'] = $this->numObj;
         break;
 
-      case  'ilink':
+        case  'ilink':
         // this is to a named internal link
         $label =  $options['label'];
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
@@ -1229,199 +1229,199 @@ 
         $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
         $this->objects[$id]['info']['actionId'] = $this->numObj;
         break;
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Annot";
-      switch ($o['info']['type']) {
-      case  'link':
+        switch ($o['info']['type']) {
+        case  'link':
       case  'ilink':
         $res.=  "\n/Subtype /Link";
         break;
-      }
-      $res.= "\n/A ".$o['info']['actionId']." 0 R";
-      $res.= "\n/Border [0 0 0]";
-      $res.= "\n/H /I";
-      $res.= "\n/Rect [ ";
+        }
+        $res.= "\n/A ".$o['info']['actionId']." 0 R";
+        $res.= "\n/Border [0 0 0]";
+        $res.= "\n/H /I";
+        $res.= "\n/Rect [ ";
 
-      foreach($o['info']['rect'] as  $v) {
+        foreach($o['info']['rect'] as  $v) {
         $res.=  sprintf("%.4F ", $v);
-      }
+        }
 
-      $res.= "]";
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "]";
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a page object, it also creates a contents object to hold its contents
-   */
-  protected function  o_page($id, $action, $options = '') {
+    /**
+     * a page object, it also creates a contents object to hold its contents
+     */
+    protected function  o_page($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->numPages++;
-      $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
+        $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
 
-      if  (is_array($options)) {
+        if  (is_array($options)) {
         // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
         $options['id'] = $id;
         $this->o_pages($this->currentNode, 'page', $options);
-      } else {
+        } else {
         $this->o_pages($this->currentNode, 'page', $id);
-      }
-
-      $this->currentPage = $id;
-      //make a contents object to go with this page
-      $this->numObj++;
-      $this->o_contents($this->numObj, 'new', $id);
-      $this->currentContents = $this->numObj;
-      $this->objects[$id]['info']['contents'] = array();
-      $this->objects[$id]['info']['contents'][] = $this->numObj;
-
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
+        }
+
+        $this->currentPage = $id;
+        //make a contents object to go with this page
+        $this->numObj++;
+        $this->o_contents($this->numObj, 'new', $id);
+        $this->currentContents = $this->numObj;
+        $this->objects[$id]['info']['contents'] = array();
+        $this->objects[$id]['info']['contents'][] = $this->numObj;
+
+        $match =  ($this->numPages%2 ?  'odd' :  'even');
+        foreach($this->addLooseObjects as  $oId=>$target) {
         if  ($target === 'all' || $match === $target) {
-          $this->objects[$id]['info']['contents'][] = $oId;
+            $this->objects[$id]['info']['contents'][] = $oId;
         }
-      }
-      break;
+        }
+        break;
 
     case  'content':
       $o['info']['contents'][] = $options;
-      break;
+        break;
 
     case  'annot':
       // add an annotation to this page
       if  (!isset($o['info']['annot'])) {
         $o['info']['annot'] = array();
-      }
+        }
 
-      // $options should contain the id of the annotation dictionary
-      $o['info']['annot'][] = $options;
-      break;
+        // $options should contain the id of the annotation dictionary
+        $o['info']['annot'][] = $options;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+        $res.= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
+        if  (isset($o['info']['annot'])) {
         $res.= "\n/Annots [";
         foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
+            $res.= " ".$aId." 0 R";
         }
         $res.= " ]";
-      }
+        }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
+        $count =  count($o['info']['contents']);
+        if  ($count == 1) {
         $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
+        } else  if  ($count>1) {
         $res.= "\n/Contents [\n";
 
         // reverse the page contents so added objects are below normal content
         //foreach (array_reverse($o['info']['contents']) as  $cId) {
         // Back to normal now that I've got transparency working --Benj
         foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
+            $res.= $cId." 0 R\n";
         }
         $res.= "]";
-      }
+        }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * the contents objects hold all of the content which appears on pages
-   */
-  protected function  o_contents($id, $action, $options = '') {
+    /**
+     * the contents objects hold all of the content which appears on pages
+     */
+    protected function  o_contents($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
+        if  (mb_strlen($options, '8bit') &&  intval($options)) {
         // then this contents is the primary for a page
         $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
+        } else  if  ($options === 'raw') {
         // then this page contains some other type of system object
         $this->objects[$id]['raw'] = 1;
-      }
-      break;
+        }
+        break;
 
     case  'add':
       // add more options to the decleration
       foreach ($options as  $k=>$v) {
         $o['info'][$k] = $v;
-      }
+        }
 
     case  'out':
       $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+        $res =  "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
+        if  (isset($this->objects[$id]['raw'])) {
         $res.= $tmp;
-      } else {
+        } else {
         $res.=  "<<";
         if  (function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
+            // then implement ZLIB based compression on this content stream
+            $res.= " /Filter /FlateDecode";
+            $tmp =  gzcompress($tmp,  6);
         }
 
         if  ($this->encrypted) {
-          $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
+            $this->encryptInit($id);
+            $tmp =  $this->ARC4($tmp);
         }
 
         foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
+            $res.=  "\n/".$k.' '.$v;
         }
 
         $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
-      }
+        }
 
-      $res.= "\nendobj";
-      return  $res;
+        $res.= "\nendobj";
+        return  $res;
+    }
     }
-  }
 
-  protected function  o_embedjs($id, $action, $code = '') {
+    protected function  o_embedjs($id, $action, $code = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
         'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
-      ));
-      break;
+        ));
+        break;
 
     case  'out':
       $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        }
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
   
-  protected function  o_javascript($id, $action, $code = '') {
+    protected function  o_javascript($id, $action, $code = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
@@ -1429,71 +1429,71 @@ 
       $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
         'S' => '/JavaScript',
         'JS' => '('.$this->filterText($code).')',
-      ));
-      break;
+        ));
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        }
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
-  /**
-   * an image object, will be an XObject in the document, includes description and data
-   */
-  protected function  o_image($id, $action, $options = '') {
+    /**
+     * an image object, will be an XObject in the document, includes description and data
+     */
+    protected function  o_image($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       // make the new object
       $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
-      $this->objects[$id]['info']['Type'] = '/XObject';
-      $this->objects[$id]['info']['Subtype'] = '/Image';
-      $this->objects[$id]['info']['Width'] = $options['iw'];
-      $this->objects[$id]['info']['Height'] = $options['ih'];
+        $this->objects[$id]['info']['Type'] = '/XObject';
+        $this->objects[$id]['info']['Subtype'] = '/Image';
+        $this->objects[$id]['info']['Width'] = $options['iw'];
+        $this->objects[$id]['info']['Height'] = $options['ih'];
 
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
+        if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
         if  (!isset($options['channels'])) {
-          $options['channels'] = 3;
+            $options['channels'] = 3;
         }
 
         switch ($options['channels']) {
         case  1:
           $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
-          break;
+            break;
 
         default:
           $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
-          break;
+            break;
         }
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
-      } else  if  ($options['type'] === 'png') {
+        } else  if  ($options['type'] === 'png') {
         $this->objects[$id]['info']['Filter'] = '/FlateDecode';
         $this->objects[$id]['info']['DecodeParms'] = '<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
 
         if  (mb_strlen($options['pdata'], '8bit')) {
-          $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
-          $this->numObj++;
-          $this->o_contents($this->numObj, 'new');
-          $this->objects[$this->numObj]['c'] = $options['pdata'];
-          $tmp.= $this->numObj.' 0 R';
-          $tmp.= ' ]';
-          $this->objects[$id]['info']['ColorSpace'] =  $tmp;
-          if  (isset($options['transparency'])) {
+            $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
+            $this->numObj++;
+            $this->o_contents($this->numObj, 'new');
+            $this->objects[$this->numObj]['c'] = $options['pdata'];
+            $tmp.= $this->numObj.' 0 R';
+            $tmp.= ' ]';
+            $this->objects[$id]['info']['ColorSpace'] =  $tmp;
+            if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
+                $this->objects[$id]['info']['Mask'] =  $tmp;
+                break;
 
             case 'color-key':
               $tmp = ' [ '.
@@ -1501,19 +1501,19 @@ 
                 $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
                 $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
                 ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              pre_r($tmp);
-              break;
+                $this->objects[$id]['info']['Mask'] = $tmp;
+                pre_r($tmp);
+                break;
               
             }
-          }
+            }
         } else {
-          if  (isset($options['transparency'])) {
+            if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
+                $this->objects[$id]['info']['Mask'] =  $tmp;
+                break;
 
             case 'color-key':
               $tmp = ' [ '.
@@ -1521,329 +1521,329 @@ 
                 $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
                 $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
                 ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              break;              
+                $this->objects[$id]['info']['Mask'] = $tmp;
+                break;              
+            }
             }
-          }
-          $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
+            $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
         }
 
         $this->objects[$id]['info']['BitsPerComponent'] = $options['bitsPerComponent'];
-      }
+        }
 
-      // assign it a place in the named resource dictionary as an external object, according to
-      // the label passed in with it.
-      $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
+        // assign it a place in the named resource dictionary as an external object, according to
+        // the label passed in with it.
+        $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
 
-      // also make sure that we have the right procset object for it.
-      $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
-      break;
+        // also make sure that we have the right procset object for it.
+        $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
+        break;
 
     case  'out':
       $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+        $res =  "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.= "\n/".$k.' '.$v;
-      }
+        }
 
-      if  ($this->encrypted) {
+        if  ($this->encrypted) {
         $this->encryptInit($id);
         $tmp =  $this->ARC4($tmp);
-      }
+        }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * graphics state object
-   */
-  protected function  o_extGState($id,  $action,  $options = "") {
+    /**
+     * graphics state object
+     */
+    protected function  o_extGState($id,  $action,  $options = "") {
     static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
-                                   "D",  "RI",  "OP",  "op",  "OPM",
-                                   "Font",  "BG",  "BG2",  "UCR",
-                                   "TR",  "TR2",  "HT",  "FL",
-                                   "SM",  "SA",  "BM",  "SMask",
-                                   "CA",  "ca",  "AIS",  "TK");
+                                    "D",  "RI",  "OP",  "op",  "OPM",
+                                    "Font",  "BG",  "BG2",  "UCR",
+                                    "TR",  "TR2",  "HT",  "FL",
+                                    "SM",  "SA",  "BM",  "SMask",
+                                    "CA",  "ca",  "AIS",  "TK");
 
     if  ($action !==  "new") {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  "new":
       $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
 
-      // Tell the pages about the new resource
-      $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
-      break;
+        // Tell the pages about the new resource
+        $this->numStates++;
+        $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+        break;
 
     case  "out":
       $res =
         "\n" . $id . " 0 obj\n".
         "<< /Type /ExtGState\n";
 
-      foreach ($o["info"] as  $parameter => $value) {
+        foreach ($o["info"] as  $parameter => $value) {
         if  ( !in_array($parameter,  $valid_params))
-          continue;
+            continue;
         $res.=  "/$parameter $value\n";
-      }
+        }
 
-      $res.=
+        $res.=
         ">>\n".
         "endobj";
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * encryption object.
-   */
-  protected function  o_encryption($id, $action, $options = '') {
+    /**
+     * encryption object.
+     */
+    protected function  o_encryption($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       // make the new object
       $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
-      $this->arc4_objnum = $id;
+        $this->arc4_objnum = $id;
 
-      // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
+        // figure out the additional paramaters required
+        $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
+        $len =  mb_strlen($options['owner'], '8bit');
 
-      if  ($len>32) {
+        if  ($len>32) {
         $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
+        } else  if  ($len<32) {
         $owner =  $options['owner'].substr($pad, 0, 32-$len);
-      } else {
+        } else {
         $owner =  $options['owner'];
-      }
+        }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
+        $len =  mb_strlen($options['user'], '8bit');
+        if  ($len>32) {
         $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
+        } else  if  ($len<32) {
         $user =  $options['user'].substr($pad, 0, 32-$len);
-      } else {
+        } else {
         $user =  $options['user'];
-      }
-
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
-      $this->ARC4_init($okey);
-      $ovalue = $this->ARC4($user);
-      $this->objects[$id]['info']['O'] = $ovalue;
-
-      // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
-
-      $ukey =  substr($tmp, 0, 5);
-      $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
-      $this->encrypted = 1;
-      $uvalue = $this->ARC4($pad);
-      $this->objects[$id]['info']['U'] = $uvalue;
-      $this->encryptionKey = $ukey;
-      // initialize the arc4 array
-      break;
+        }
+
+        $tmp =  $this->md5_16($owner);
+        $okey =  substr($tmp, 0, 5);
+        $this->ARC4_init($okey);
+        $ovalue = $this->ARC4($user);
+        $this->objects[$id]['info']['O'] = $ovalue;
+
+        // now make the u value, phew.
+        $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+
+        $ukey =  substr($tmp, 0, 5);
+        $this->ARC4_init($ukey);
+        $this->encryptionKey =  $ukey;
+        $this->encrypted = 1;
+        $uvalue = $this->ARC4($pad);
+        $this->objects[$id]['info']['U'] = $uvalue;
+        $this->encryptionKey = $ukey;
+        // initialize the arc4 array
+        break;
 
     case  'out':
       $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
-      // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
-      return  $res;
-    }
-  }
-
-
-  /**
-   * ARC4 functions
-   * A series of function to implement ARC4 encoding in PHP
-   */
+        $res.= "\n/Filter /Standard";
+        $res.= "\n/V 1";
+        $res.= "\n/R 2";
+        $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
+        $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+        // and the p-value needs to be converted to account for the twos-complement approach
+        $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
+        $res.= "\n/P ".($o['info']['p']);
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
+    }
 
-  /**
-   * calculate the 16 byte version of the 128 bit md5 digest of the string
-   */
-  function  md5_16($string) {
+
+    /**
+     * ARC4 functions
+     * A series of function to implement ARC4 encoding in PHP
+     */
+
+    /**
+     * calculate the 16 byte version of the 128 bit md5 digest of the string
+     */
+    function  md5_16($string) {
     $tmp =  md5($string);
     $out = '';
     for  ($i = 0;$i <= 30;$i = $i+2) {
-      $out.= chr(hexdec(substr($tmp, $i, 2)));
+        $out.= chr(hexdec(substr($tmp, $i, 2)));
     }
     return  $out;
-  }
+    }
 
 
-  /**
-   * initialize the encryption for processing a particular object
-   */
-  function  encryptInit($id) {
+    /**
+     * initialize the encryption for processing a particular object
+     */
+    function  encryptInit($id) {
     $tmp =  $this->encryptionKey;
     $hex =  dechex($id);
     if  (mb_strlen($hex, '8bit') <6) {
-      $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
+        $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
     }
     $tmp.=  chr(hexdec(substr($hex, 4, 2))) .chr(hexdec(substr($hex, 2, 2))) .chr(hexdec(substr($hex, 0, 2))) .chr(0) .chr(0);
     $key =  $this->md5_16($tmp);
     $this->ARC4_init(substr($key, 0, 10));
-  }
+    }
 
 
-  /**
-   * initialize the ARC4 encryption
-   */
-  function  ARC4_init($key = '') {
+    /**
+     * initialize the ARC4 encryption
+     */
+    function  ARC4_init($key = '') {
     $this->arc4 =  '';
 
     // setup the control array
     if  (mb_strlen($key, '8bit') == 0) {
-      return;
+        return;
     }
 
     $k =  '';
     while (mb_strlen($k, '8bit') <256) {
-      $k.= $key;
+        $k.= $key;
     }
 
     $k = substr($k, 0, 256);
     for  ($i = 0;$i<256;$i++) {
-      $this->arc4.=  chr($i);
+        $this->arc4.=  chr($i);
     }
 
     $j = 0;
 
     for  ($i = 0;$i<256;$i++) {
-      $t =  $this->arc4[$i];
-      $j =  ($j + ord($t)  + ord($k[$i])) %256;
-      $this->arc4[$i] = $this->arc4[$j];
-      $this->arc4[$j] = $t;
+        $t =  $this->arc4[$i];
+        $j =  ($j + ord($t)  + ord($k[$i])) %256;
+        $this->arc4[$i] = $this->arc4[$j];
+        $this->arc4[$j] = $t;
+    }
     }
-  }
 
 
-  /**
-   * ARC4 encrypt a text string
-   */
-  function  ARC4($text) {
+    /**
+     * ARC4 encrypt a text string
+     */
+    function  ARC4($text) {
     $len = mb_strlen($text, '8bit');
     $a = 0;
     $b = 0;
     $c =  $this->arc4;
     $out = '';
     for  ($i = 0;$i<$len;$i++) {
-      $a =  ($a+1) %256;
-      $t =  $c[$a];
-      $b =  ($b+ord($t)) %256;
-      $c[$a] = $c[$b];
-      $c[$b] = $t;
-      $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
-      $out.= chr(ord($text[$i])  ^ $k);
+        $a =  ($a+1) %256;
+        $t =  $c[$a];
+        $b =  ($b+ord($t)) %256;
+        $c[$a] = $c[$b];
+        $c[$b] = $t;
+        $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
+        $out.= chr(ord($text[$i])  ^ $k);
     }
     return  $out;
-  }
+    }
 
 
-  /**
-   * functions which can be called to adjust or add to the document
-   */
+    /**
+     * functions which can be called to adjust or add to the document
+     */
 
-  /**
-   * add a link in the document to an external URL
-   */
-  function  addLink($url, $x0, $y0, $x1, $y1) {
+    /**
+     * add a link in the document to an external URL
+     */
+    function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
     $info =  array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
-  }
+    }
 
 
-  /**
-   * add a link in the document to an internal destination (ie. within the document)
-   */
-  function  addInternalLink($label, $x0, $y0, $x1, $y1) {
+    /**
+     * add a link in the document to an internal destination (ie. within the document)
+     */
+    function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
     $info =  array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
-  }
+    }
 
 
-  /**
-   * set the encryption of the document
-   * can be used to turn it on and/or set the passwords which it will have.
-   * also the functions that the user will have are set here, such as print, modify, add
-   */
-  function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
+    /**
+     * set the encryption of the document
+     * can be used to turn it on and/or set the passwords which it will have.
+     * also the functions that the user will have are set here, such as print, modify, add
+     */
+    function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
     $p = bindec(11000000);
 
     $options =  array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
 
     foreach($pc as  $k=>$v) {
-      if  ($v &&  isset($options[$k])) {
+        if  ($v &&  isset($options[$k])) {
         $p+= $options[$k];
-      } else  if  (isset($options[$v])) {
+        } else  if  (isset($options[$v])) {
         $p+= $options[$v];
-      }
+        }
     }
 
     // implement encryption on the document
     if  ($this->arc4_objnum ==  0) {
-      // then the block does not exist already, add it.
-      $this->numObj++;
-      if  (mb_strlen($ownerPass) == 0) {
+        // then the block does not exist already, add it.
+        $this->numObj++;
+        if  (mb_strlen($ownerPass) == 0) {
         $ownerPass = $userPass;
-      }
+        }
 
-      $this->o_encryption($this->numObj, 'new', array('user'=>$userPass, 'owner'=>$ownerPass, 'p'=>$p));
+        $this->o_encryption($this->numObj, 'new', array('user'=>$userPass, 'owner'=>$ownerPass, 'p'=>$p));
+    }
     }
-  }
 
 
-  /**
-   * should be used for internal checks, not implemented as yet
-   */
-  function  checkAllHere() {
-  }
+    /**
+     * should be used for internal checks, not implemented as yet
+     */
+    function  checkAllHere() {
+    }
 
 
-  /**
-   * return the pdf stream as a string returned from the function
-   */
-  function  output($debug = false) {
+    /**
+     * return the pdf stream as a string returned from the function
+     */
+    function  output($debug = false) {
     if  ($debug) {
-      // turn compression off
-      $this->options['compression'] = 0;
+        // turn compression off
+        $this->options['compression'] = 0;
     }
     
     if ($this->javascript) {
-      $this->numObj++;
+        $this->numObj++;
       
-      $js_id = $this->numObj;
-      $this->o_embedjs($js_id, 'new');
-      $this->o_javascript(++$this->numObj, 'new', $this->javascript);
+        $js_id = $this->numObj;
+        $this->o_embedjs($js_id, 'new');
+        $this->o_javascript(++$this->numObj, 'new', $this->javascript);
       
-      $id =  $this->catalogId;
+        $id =  $this->catalogId;
       
-      $this->o_catalog($id, 'javascript', $js_id);
+        $this->o_catalog($id, 'javascript', $js_id);
     }
 
     if  ($this->arc4_objnum) {
-      $this->ARC4_init($this->encryptionKey);
+        $this->ARC4_init($this->encryptionKey);
     }
 
     $this->checkAllHere();
@@ -1854,43 +1854,43 @@ 
     $pos = mb_strlen($content, '8bit');
 
     foreach($this->objects as  $k=>$v) {
-      $tmp = 'o_'.$v['t'];
-      $cont = $this->$tmp($k, 'out');
-      $content.= $cont;
-      $xref[] = $pos;
-      $pos+= mb_strlen($cont, '8bit');
+        $tmp = 'o_'.$v['t'];
+        $cont = $this->$tmp($k, 'out');
+        $content.= $cont;
+        $xref[] = $pos;
+        $pos+= mb_strlen($cont, '8bit');
     }
 
     $content.= "\nxref\n0 ".(count($xref) +1) ."\n0000000000 65535 f \n";
 
     foreach($xref as  $p) {
-      $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
+        $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
     }
 
     $content.= "trailer\n<<\n/Size ".(count($xref) +1) ."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
 
     // if encryption has been applied to this document then add the marker for this dictionary
     if  ($this->arc4_objnum > 0) {
-      $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
+        $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
     }
 
     if  (mb_strlen($this->fileIdentifier, '8bit')) {
-      $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
+        $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
     }
 
     $content.=  ">>\nstartxref\n".$pos."\n%%EOF\n";
 
     return  $content;
-  }
-
-  /**
-   * intialize a new document
-   * if this is called on an existing document results may be unpredictable, but the existing document would be lost at minimum
-   * this function is called automatically by the constructor function
-   *
-   * @access private
-   */
-  function  newDocument($pageSize = array(0, 0, 612, 792)) {
+    }
+
+    /**
+     * intialize a new document
+     * if this is called on an existing document results may be unpredictable, but the existing document would be lost at minimum
+     * this function is called automatically by the constructor function
+     *
+     * @access private
+     */
+    function  newDocument($pageSize = array(0, 0, 612, 792)) {
     $this->numObj = 0;
     $this->objects =  array();
 
@@ -1918,32 +1918,32 @@ 
     // need to store the first page id as there is no way to get it to the user during
     // startup
     $this->firstPageId =  $this->currentContents;
-  }
-
-  /**
-   * open the font file and return a php structure containing it.
-   * first check if this one has been done before and saved in a form more suited to php
-   * note that if a php serialized version does not exist it will try and make one, but will
-   * require write access to the directory to do it... it is MUCH faster to have these serialized
-   * files.
-   *
-   * @access private
-   */
-  function  openFont($font) {
+    }
+
+    /**
+     * open the font file and return a php structure containing it.
+     * first check if this one has been done before and saved in a form more suited to php
+     * note that if a php serialized version does not exist it will try and make one, but will
+     * require write access to the directory to do it... it is MUCH faster to have these serialized
+     * files.
+     *
+     * @access private
+     */
+    function  openFont($font) {
     // assume that $font contains the path and file but not the extension
     $pos = strrpos($font, '/');
 
     if  ($pos === false) {
-      $dir =  './';
-      $name =  $font;
+        $dir =  './';
+        $name =  $font;
     } else {
-      $dir = substr($font, 0, $pos+1);
-      $name = substr($font, $pos+1);
+        $dir = substr($font, 0, $pos+1);
+        $name = substr($font, $pos+1);
     }
     
     $fontcache = $this->fontcache;
     if ($fontcache == '') {
-    	$fontcache = $dir;
+        $fontcache = $dir;
     }
     
     //$name       filename without folder and extension of font metrics
@@ -1964,42 +1964,42 @@ 
     $cache_name = 'php_' . $metrics_name;
     $this->addMessage('metrics: '.$metrics_name.', cache: '.$cache_name);
     if  (file_exists($fontcache . $cache_name)) {
-      $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
-      $tmp =  file_get_contents($fontcache . $cache_name);
-      eval($tmp);
+        $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
+        $tmp =  file_get_contents($fontcache . $cache_name);
+        eval($tmp);
 
-      if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
+        if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
         // if the font file is old, then clear it out and prepare for re-creation
         $this->addMessage('openFont: clear out, make way for new version.');
         unset($this->fonts[$font]);
-      }
+        }
     }
 
     if  (!isset($this->fonts[$font]) &&  file_exists($dir . $metrics_name)) {
-      // then rebuild the php_<font>.afm file from the <font>.afm file
-      $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
-      $data =  array();
+        // then rebuild the php_<font>.afm file from the <font>.afm file
+        $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
+        $data =  array();
       
-      // Since we're not going to enable Unicode for the core fonts we need to use a font-based
-      // setting for Unicode support rather than a global setting.
-      $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm');
+        // Since we're not going to enable Unicode for the core fonts we need to use a font-based
+        // setting for Unicode support rather than a global setting.
+        $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm');
       
-      $cidtogid = '';
-      if ($data['isUnicode']) {
+        $cidtogid = '';
+        if ($data['isUnicode']) {
         $cidtogid = str_pad('', 256*256*2, "\x00");
-      }
+        }
 
-      $file =  file($dir . $metrics_name);
+        $file =  file($dir . $metrics_name);
 
-      foreach ($file as  $rowA) {
+        foreach ($file as  $rowA) {
         $row = trim($rowA);
         $pos = strpos($row, ' ');
 
         if  ($pos) {
-          // then there must be some keyword
-          $key =  substr($row, 0, $pos);
-          switch  ($key) {
-          case  'FontName':
+            // then there must be some keyword
+            $key =  substr($row, 0, $pos);
+            switch  ($key) {
+            case  'FontName':
           case  'FullName':
           case  'FamilyName':
           case  'Weight':
@@ -2021,140 +2021,140 @@ 
             $data[$key] = trim(substr($row, $pos));
             break;
 
-          case  'FontBBox':
+            case  'FontBBox':
             $data[$key] = explode(' ', trim(substr($row, $pos)));
             break;
 
-          case  'C': // Found in AFM files
+            case  'C': // Found in AFM files
             //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
             $bits = explode(';', trim($row));
             $dtmp = array();
 
             foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
+                $bits2 =  explode(' ', trim($bit));
+                if  (mb_strlen($bits2[0], '8bit')) {
                 if  (count($bits2) >2) {
-                  $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
+                    $dtmp[$bits2[0]] = array();
+                    for  ($i = 1;$i<count($bits2);$i++) {
                     $dtmp[$bits2[0]][] = $bits2[$i];
-                  }
+                    }
                 } else  if  (count($bits2) == 2) {
-                  $dtmp[$bits2[0]] = $bits2[1];
+                    $dtmp[$bits2[0]] = $bits2[1];
+                }
                 }
-              }
             }
 
             $cc = (int)$dtmp['C'];
             if  ($cc >= 0) {
-              $data['C'][$dtmp['C']] = $dtmp;
-              $data['C'][$dtmp['N']] = $dtmp;
+                $data['C'][$dtmp['C']] = $dtmp;
+                $data['C'][$dtmp['N']] = $dtmp;
             } else {
-              $data['C'][$dtmp['N']] = $dtmp;
+                $data['C'][$dtmp['N']] = $dtmp;
             }
 
             if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-              $data['MissingWidth'] = $width;
+                $data['MissingWidth'] = $width;
             }
             
             break;
 
-          case  'U': // Found in UFM files
+            case  'U': // Found in UFM files
             if ($data['isUnicode']) {
-              // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-              $bits = explode(';', trim($row));
-              $dtmp = array();
+                // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+                $bits = explode(';', trim($row));
+                $dtmp = array();
 
-              foreach($bits as  $bit) {
+                foreach($bits as  $bit) {
                 $bits2 =  explode(' ', trim($bit));
                 if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
+                    if  (count($bits2) >2) {
                     $dtmp[$bits2[0]] = array();
                     for  ($i = 1;$i<count($bits2);$i++) {
-                      $dtmp[$bits2[0]][] = $bits2[$i];
+                        $dtmp[$bits2[0]][] = $bits2[$i];
                     }
-                  } else  if  (count($bits2) == 2) {
+                    } else  if  (count($bits2) == 2) {
                     $dtmp[$bits2[0]] = $bits2[1];
-                  }
+                    }
+                }
                 }
-              }
 
-              $cc = (int)$dtmp['U'];
-              $glyph = $dtmp['G'];
-              $width = $dtmp['WX'];
-              if  ($cc >= 0) {
+                $cc = (int)$dtmp['U'];
+                $glyph = $dtmp['G'];
+                $width = $dtmp['WX'];
+                if  ($cc >= 0) {
                 // Set values in CID to GID map
                 if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                    $cidtogid[$cc*2] = chr($glyph >> 8);
+                    $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
                 }
 
                 $data['C'][$dtmp['U']] = $dtmp;
                 $data['C'][$dtmp['N']] = $dtmp;
-              } else {
+                } else {
                 $data['C'][$dtmp['N']] = $dtmp;
-              }
+                }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
                 $data['MissingWidth'] = $width;
-              }
+                }
             }
             break;
 
-          case  'KPX':
+            case  'KPX':
             //KPX Adieresis yacute -40
             $bits = explode(' ', trim($row));
             $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
             break;
-          }
+            }
+        }
         }
-      }
 
-      //    echo $cidtogid; die("CIDtoGID Displayed!");
-      if  (function_exists('gzcompress') &&  $this->options['compression']) {
+        //    echo $cidtogid; die("CIDtoGID Displayed!");
+        if  (function_exists('gzcompress') &&  $this->options['compression']) {
         // then implement ZLIB based compression on CIDtoGID string
         $data['CIDtoGID_Compressed'] = true;
         $cidtogid =  gzcompress($cidtogid,  6);
-      }
-      $data['CIDtoGID'] = base64_encode($cidtogid);
-      $data['_version_'] = $this->fontcacheVersion;
-      $this->fonts[$font] = $data;
-
-      //Because of potential trouble with php safe mode, expect that the folder already exists.
-      //If not existing, this will hit performance because of missing cached results.
-      if ( is_dir(substr($fontcache,0,-1)) ) {
+        }
+        $data['CIDtoGID'] = base64_encode($cidtogid);
+        $data['_version_'] = $this->fontcacheVersion;
+        $this->fonts[$font] = $data;
+
+        //Because of potential trouble with php safe mode, expect that the folder already exists.
+        //If not existing, this will hit performance because of missing cached results.
+        if ( is_dir(substr($fontcache,0,-1)) ) {
         file_put_contents($fontcache . $cache_name,  '$this->fonts[$font]=' . var_export($data,  true)  . ';');
-      }
+        }
     }
     
     if  (!isset($this->fonts[$font])) {
-      $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
-      //echo 'Font not Found '.$font;
+        $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
+        //echo 'Font not Found '.$font;
     }
 
     //pre_r($this->messages);
-  }
-
-  /**
-   * if the font is not loaded then load it and make the required object
-   * else just make it the current font
-   * the encoding array can contain 'encoding'=> 'none','WinAnsiEncoding','MacRomanEncoding' or 'MacExpertEncoding'
-   * note that encoding='none' will need to be used for symbolic fonts
-   * and 'differences' => an array of mappings between numbers 0->255 and character names.
-   *
-   */
-  function  selectFont($fontName, $encoding =  '', $set =  true) {
+    }
+
+    /**
+     * if the font is not loaded then load it and make the required object
+     * else just make it the current font
+     * the encoding array can contain 'encoding'=> 'none','WinAnsiEncoding','MacRomanEncoding' or 'MacExpertEncoding'
+     * note that encoding='none' will need to be used for symbolic fonts
+     * and 'differences' => an array of mappings between numbers 0->255 and character names.
+     *
+     */
+    function  selectFont($fontName, $encoding =  '', $set =  true) {
     $ext = substr($fontName, -4);
     if  ($ext === '.afm' || $ext === '.ufm') {
-      $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
+        $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
     }
 
     if  (!isset($this->fonts[$fontName])) {
-      $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
+        $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
 
-      // load the file
-      $this->openFont($fontName);
+        // load the file
+        $this->openFont($fontName);
 
-      if  (isset($this->fonts[$fontName])) {
+        if  (isset($this->fonts[$fontName])) {
         $this->numObj++;
         $this->numFonts++;
 
@@ -2165,17 +2165,17 @@ 
         $options =  array('name' => $name, 'fontFileName' => $fontName);
 
         if  (is_array($encoding)) {
-          // then encoding and differences might be set
-          if  (isset($encoding['encoding'])) {
+            // then encoding and differences might be set
+            if  (isset($encoding['encoding'])) {
             $options['encoding'] =  $encoding['encoding'];
-          }
+            }
 
-          if  (isset($encoding['differences'])) {
+            if  (isset($encoding['differences'])) {
             $options['differences'] =  $encoding['differences'];
-          }
+            }
         } else  if  (mb_strlen($encoding, '8bit')) {
-          // then perhaps only the encoding has been set
-          $options['encoding'] =  $encoding;
+            // then perhaps only the encoding has been set
+            $options['encoding'] =  $encoding;
         }
 
         $fontObj =  $this->numObj;
@@ -2187,11 +2187,11 @@ 
         // references into the font object
         $basefile =  $fontName;
         if  (file_exists($basefile.'.pfb')) {
-          $fbtype =  'pfb';
+            $fbtype =  'pfb';
         } else  if  (file_exists($basefile.'.ttf')) {
-          $fbtype =  'ttf';
+            $fbtype =  'ttf';
         } else {
-          $fbtype =  '';
+            $fbtype =  '';
         }
 
         $fbfile =  $basefile.'.'.$fbtype;
@@ -2203,74 +2203,74 @@ 
         // OAR - I don't understand this old check
         // if  (substr($fontName, -4) ===  '.afm' &&  strlen($fbtype)) {
         if  (mb_strlen($fbtype, '8bit')) {
-          $adobeFontName =  $this->fonts[$fontName]['FontName'];
-          //        $fontObj = $this->numObj;
-          $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
+            $adobeFontName =  $this->fonts[$fontName]['FontName'];
+            //        $fontObj = $this->numObj;
+            $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
 
-          // find the array of font widths, and put that into an object.
-          $firstChar =  -1;
-          $lastChar =  0;
-          $widths =  array();
-          $cid_widths = array();
+            // find the array of font widths, and put that into an object.
+            $firstChar =  -1;
+            $lastChar =  0;
+            $widths =  array();
+            $cid_widths = array();
 
-          foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
+            foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
             if  (intval($num) >0 ||  $num ==  '0') {
-              if (!$this->fonts[$fontName]['isUnicode']) {
+                if (!$this->fonts[$fontName]['isUnicode']) {
                 // With Unicode, widths array isn't used
                 if  ($lastChar>0 &&  $num>$lastChar+1) {
-                  for ($i =  $lastChar+1;$i<$num;$i++) {
+                    for ($i =  $lastChar+1;$i<$num;$i++) {
                     $widths[] =  0;
-                  }
+                    }
+                }
                 }
-              }
 
-              $widths[] =  $d['WX'];
+                $widths[] =  $d['WX'];
 
-              if ($this->fonts[$fontName]['isUnicode']) {
+                if ($this->fonts[$fontName]['isUnicode']) {
                 $cid_widths[$num] =  $d['WX'];
-              }
+                }
 
-              if  ($firstChar ==  -1) {
+                if  ($firstChar ==  -1) {
                 $firstChar =  $num;
-              }
+                }
 
-              $lastChar =  $num;
+                $lastChar =  $num;
+            }
             }
-          }
 
-          // also need to adjust the widths for the differences array
-          if  (isset($options['differences'])) {
+            // also need to adjust the widths for the differences array
+            if  (isset($options['differences'])) {
             foreach($options['differences'] as  $charNum => $charName) {
-              if  ($charNum > $lastChar) {
+                if  ($charNum > $lastChar) {
                 if (!$this->fonts[$fontName]['isUnicode']) {
-                  // With Unicode, widths array isn't used
-                  for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
+                    // With Unicode, widths array isn't used
+                    for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
                     $widths[] =  0;
-                  }
+                    }
                 }
 
                 $lastChar =  $charNum;
-              }
+                }
 
-              if  (isset($this->fonts[$fontName]['C'][$charName])) {
+                if  (isset($this->fonts[$fontName]['C'][$charName])) {
                 $widths[$charNum-$firstChar] =  $this->fonts[$fontName]['C'][$charName]['WX'];
                 if ($this->fonts[$fontName]['isUnicode']) {
-                  $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+                    $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
                 }
-              }
+                }
+            }
             }
-          }
 
-          if ($this->fonts[$fontName]['isUnicode']) {
+            if ($this->fonts[$fontName]['isUnicode']) {
             $this->fonts[$fontName]['CIDWidths'] = $cid_widths;
-          }
+            }
 
-          $this->addMessage('selectFont: FirstChar = '.$firstChar);
-          $this->addMessage('selectFont: LastChar = '.$lastChar);
+            $this->addMessage('selectFont: FirstChar = '.$firstChar);
+            $this->addMessage('selectFont: LastChar = '.$lastChar);
 
-          $widthid = -1;
+            $widthid = -1;
 
-          if (!$this->fonts[$fontName]['isUnicode']) {
+            if (!$this->fonts[$fontName]['isUnicode']) {
             // With Unicode, widths array isn't used
 
             $this->numObj++;
@@ -2278,147 +2278,147 @@ 
             $this->objects[$this->numObj]['c'].=  '[';
 
             foreach($widths as  $width) {
-              $this->objects[$this->numObj]['c'].=  ' '.$width;
+                $this->objects[$this->numObj]['c'].=  ' '.$width;
             }
 
             $this->objects[$this->numObj]['c'].=  ' ]';
             $widthid =  $this->numObj;
-          }
+            }
 
-          $missing_width = 500;
-          $stemV = 70;
+            $missing_width = 500;
+            $stemV = 70;
 
-          if (isset($this->fonts[$fontName]['MissingWidth'])) {
+            if (isset($this->fonts[$fontName]['MissingWidth'])) {
             $missing_width =  $this->fonts[$fontName]['MissingWidth'];
-          }
-          if (isset($this->fonts[$fontName]['StdVW'])) {
+            }
+            if (isset($this->fonts[$fontName]['StdVW'])) {
             $stemV = $this->fonts[$fontName]['StdVW'];
-          } elseif (isset($this->fonts[$fontName]['Weight']) && preg_match('!(bold|black)!i', $this->fonts[$fontName]['Weight'])) {
+            } elseif (isset($this->fonts[$fontName]['Weight']) && preg_match('!(bold|black)!i', $this->fonts[$fontName]['Weight'])) {
             $stemV = 120;
-          }
+            }
 
-          // load the pfb file, and put that into an object too.
-          // note that pdf supports only binary format type 1 font files, though there is a
-          // simple utility to convert them from pfa to pfb.
-          $data =  file_get_contents($fbfile);
+            // load the pfb file, and put that into an object too.
+            // note that pdf supports only binary format type 1 font files, though there is a
+            // simple utility to convert them from pfa to pfb.
+            $data =  file_get_contents($fbfile);
 
-          // create the font descriptor
-          $this->numObj++;
-          $fontDescriptorId =  $this->numObj;
+            // create the font descriptor
+            $this->numObj++;
+            $fontDescriptorId =  $this->numObj;
 
-          $this->numObj++;
-          $pfbid =  $this->numObj;
+            $this->numObj++;
+            $pfbid =  $this->numObj;
 
-          // determine flags (more than a little flakey, hopefully will not matter much)
-          $flags =  0;
+            // determine flags (more than a little flakey, hopefully will not matter much)
+            $flags =  0;
 
-          if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
+            if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
             $flags+=  pow(2, 6);
-          }
+            }
 
-          if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
+            if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
             $flags+=  1;
-          }
+            }
 
-          $flags+=  pow(2, 5); // assume non-sybolic
-          $list =  array(
+            $flags+=  pow(2, 5); // assume non-sybolic
+            $list =  array(
             'Ascent' => 'Ascender', 
             'CapHeight' => 'CapHeight', 
             'MissingWidth' => 'MissingWidth', 
             'Descent' => 'Descender', 
             'FontBBox' => 'FontBBox', 
             'ItalicAngle' => 'ItalicAngle'
-          );
-          $fdopt =  array(
+            );
+            $fdopt =  array(
             'Flags' => $flags, 
             'FontName' => $adobeFontName, 
             'StemV' => $stemV
-          );
+            );
 
-          foreach($list as  $k => $v) {
+            foreach($list as  $k => $v) {
             if  (isset($this->fonts[$fontName][$v])) {
-              $fdopt[$k] =  $this->fonts[$fontName][$v];
+                $fdopt[$k] =  $this->fonts[$fontName][$v];
+            }
             }
-          }
 
-          if  ($fbtype === 'pfb') {
+            if  ($fbtype === 'pfb') {
             $fdopt['FontFile'] =  $pfbid;
-          } else  if  ($fbtype === 'ttf') {
+            } else  if  ($fbtype === 'ttf') {
             $fdopt['FontFile2'] =  $pfbid;
-          }
+            }
 
-          $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
+            $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
 
-          // embed the font program
-          $this->o_contents($this->numObj, 'new');
-          $this->objects[$pfbid]['c'].=  $data;
+            // embed the font program
+            $this->o_contents($this->numObj, 'new');
+            $this->objects[$pfbid]['c'].=  $data;
 
-          // determine the cruicial lengths within this file
-          if  ($fbtype === 'pfb') {
+            // determine the cruicial lengths within this file
+            if  ($fbtype === 'pfb') {
             $l1 =  strpos($data, 'eexec') +6;
             $l2 =  strpos($data, '00000000') -$l1;
             $l3 =  mb_strlen($data, '8bit') -$l2-$l1;
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1, 'Length2' => $l2, 'Length3' => $l3));
-          } else  if  ($fbtype == 'ttf') {
+            } else  if  ($fbtype == 'ttf') {
             $l1 =  mb_strlen($data, '8bit');
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1));
-          }
+            }
 
-          // tell the font object about all this new stuff
-          $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
+            // tell the font object about all this new stuff
+            $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
 
-          if  ($fbtype === 'ttf') {
+            if  ($fbtype === 'ttf') {
             $tmp['SubType'] =  'TrueType';
-          }
+            }
 
-          $this->addMessage('adding extra info to font.('.$fontObj.')');
+            $this->addMessage('adding extra info to font.('.$fontObj.')');
 
-          foreach($tmp as  $fk => $fv) {
+            foreach($tmp as  $fk => $fv) {
             $this->addMessage($fk." : ".$fv);
-          }
+            }
 
-          $this->o_font($fontObj, 'add', $tmp);
+            $this->o_font($fontObj, 'add', $tmp);
         } else {
-          $this->addMessage('selectFont: pfb or ttf file not found, ok if this is one of the 14 standard fonts');
+            $this->addMessage('selectFont: pfb or ttf file not found, ok if this is one of the 14 standard fonts');
         }
 
         // also set the differences here, note that this means that these will take effect only the
         //first time that a font is selected, else they are ignored
         if  (isset($options['differences'])) {
-          $this->fonts[$fontName]['differences'] =  $options['differences'];
+            $this->fonts[$fontName]['differences'] =  $options['differences'];
+        }
         }
-      }
     }
 
     if  ($set &&  isset($this->fonts[$fontName])) {
-      // so if for some reason the font was not set in the last one then it will not be selected
-      $this->currentBaseFont =  $fontName;
+        // so if for some reason the font was not set in the last one then it will not be selected
+        $this->currentBaseFont =  $fontName;
 
-      // the next lines mean that if a new font is selected, then the current text state will be
-      // applied to it as well.
-      $this->currentFont =  $this->currentBaseFont;
-      $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+        // the next lines mean that if a new font is selected, then the current text state will be
+        // applied to it as well.
+        $this->currentFont =  $this->currentBaseFont;
+        $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
 
-      //$this->setCurrentFont();
+        //$this->setCurrentFont();
     }
 
     return  $this->currentFontNum;
     //return $this->numObj;
-  }
-
-  /**
-   * sets up the current font, based on the font families, and the current text state
-   * note that this system is quite flexible, a bold-italic font can be completely different to a
-   * italic-bold font, and even bold-bold will have to be defined within the family to have meaning
-   * This function is to be called whenever the currentTextState is changed, it will update
-   * the currentFont setting to whatever the appropriatte family one is.
-   * If the user calls selectFont themselves then that will reset the currentBaseFont, and the currentFont
-   * This function will change the currentFont to whatever it should be, but will not change the
-   * currentBaseFont.
-   *
-   * @access private
-   */
-  function  setCurrentFont() {
+    }
+
+    /**
+     * sets up the current font, based on the font families, and the current text state
+     * note that this system is quite flexible, a bold-italic font can be completely different to a
+     * italic-bold font, and even bold-bold will have to be defined within the family to have meaning
+     * This function is to be called whenever the currentTextState is changed, it will update
+     * the currentFont setting to whatever the appropriatte family one is.
+     * If the user calls selectFont themselves then that will reset the currentBaseFont, and the currentFont
+     * This function will change the currentFont to whatever it should be, but will not change the
+     * currentBaseFont.
+     *
+     * @access private
+     */
+    function  setCurrentFont() {
     //   if (strlen($this->currentBaseFont) == 0){
     //     // then assume an initial font
     //     $this->selectFont($this->defaultFont);
@@ -2440,185 +2440,185 @@ 
     $this->currentFont =  $this->currentBaseFont;
     $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
     //  }
-  }
+    }
 
 
-  /**
-   * function for the user to find out what the ID is of the first page that was created during
-   * startup - useful if they wish to add something to it later.
-   */
-  function  getFirstPageId() {
+    /**
+     * function for the user to find out what the ID is of the first page that was created during
+     * startup - useful if they wish to add something to it later.
+     */
+    function  getFirstPageId() {
     return  $this->firstPageId;
-  }
+    }
 
 
-  /**
-   * add content to the currently active object
-   *
-   * @access private
-   */
-  function  addContent($content) {
+    /**
+     * add content to the currently active object
+     *
+     * @access private
+     */
+    function  addContent($content) {
     $this->objects[$this->currentContents]['c'].=  $content;
-  }
+    }
 
 
-  /**
-   * sets the colour for fill operations
-   */
-  function  setColor($r, $g, $b, $force =  0) {
+    /**
+     * sets the colour for fill operations
+     */
+    function  setColor($r, $g, $b, $force =  0) {
     if  ($r >=  0 &&  ($force ||  $r !=  $this->currentColour['r'] ||  $g !=  $this->currentColour['g'] ||  $b !=  $this->currentColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
-      $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+        $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
+        $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+    }
     }
-  }
 
 
-  /**
-   * sets the colour for stroke operations
-   */
-  function  setStrokeColor($r, $g, $b, $force =  0) {
+    /**
+     * sets the colour for stroke operations
+     */
+    function  setStrokeColor($r, $g, $b, $force =  0) {
     if  ($r >=  0 &&  ($force ||  $r !=  $this->currentStrokeColour['r'] ||  $g !=  $this->currentStrokeColour['g'] ||  $b !=  $this->currentStrokeColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
-      $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+        $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
+        $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+    }
     }
-  }
 
 
-  /**
-   * Set the graphics state for compositions
-   */
-  function  setGraphicsState($parameters) {
+    /**
+     * Set the graphics state for compositions
+     */
+    function  setGraphicsState($parameters) {
     // Create a new graphics state object
     // FIXME: should actually keep track of states that have already been created...
     $this->numObj++;
     $this->o_extGState($this->numObj,  'new',  $parameters);
     $this->objects[ $this->currentContents ]['c'].=  "\n/GS" . $this->numStates . " gs";
-  }
-
-
-  /**
-   * Set current blend mode & opacity for lines.
-   *
-   * Valid blend modes are:
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blend mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  function setLineTransparency($mode, $opacity) {
+    }
+
+
+    /**
+     * Set current blend mode & opacity for lines.
+     *
+     * Valid blend modes are:
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blend mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    function setLineTransparency($mode, $opacity) {
     static $blend_modes = array("Normal", "Multiply", "Screen",
                                 "Overlay", "Darken", "Lighten",
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
     if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+        $mode = "Normal";
     
     // Only create a new graphics state if required
     if ( $mode == $this->currentLineTransparency["mode"]  &&
          $opacity == $this->currentLineTransparency["opacity"] )
-      return;
+        return;
 
     $options = array("BM" => "/$mode",
-                     "CA" => (float)$opacity);
+                        "CA" => (float)$opacity);
 
     $this->setGraphicsState($options);
-  }
+    }
   
-  /**
-   * Set current blend mode & opacity for filled objects.
-   *
-   * Valid blend modes are:
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blend mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  function setFillTransparency($mode, $opacity) {
+    /**
+     * Set current blend mode & opacity for filled objects.
+     *
+     * Valid blend modes are:
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blend mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    function setFillTransparency($mode, $opacity) {
     static $blend_modes = array("Normal", "Multiply", "Screen",
                                 "Overlay", "Darken", "Lighten",
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
     if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+        $mode = "Normal";
 
     if ( $mode == $this->currentFillTransparency["mode"]  &&
          $opacity == $this->currentFillTransparency["opacity"] )
-      return;
+        return;
 
     $options = array("BM" => "/$mode",
-                     "ca" => (float)$opacity);
+                        "ca" => (float)$opacity);
     
     $this->setGraphicsState($options);
-  }
+    }
 
-  /**
-   * draw a line from one set of coordinates to another
-   */
-  function  line($x1, $y1, $x2, $y2) {
+    /**
+     * draw a line from one set of coordinates to another
+     */
+    function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
-  }
+        "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
+    }
 
 
-  /**
-   * draw a bezier curve based on 4 control points
-   */
-  function  curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3) {
+    /**
+     * draw a bezier curve based on 4 control points
+     */
+    function  curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3) {
     // in the current line style, draw a bezier curve from (x0,y0) to (x3,y3) using the other two points
     // as the control points for the curve.
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
+        "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
 
     $this->objects[$this->currentContents]['c'] .=
-      ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
-  }
+        ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
+    }
 
 
-  /**
-   * draw a part of an ellipse
-   */
-  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
+    /**
+     * draw a part of an ellipse
+     */
+    function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
     $this->ellipse($x0, $y0, $r1, $r2, $angle, $nSeg, $astart, $afinish, 0);
-  }
+    }
 
 
-  /**
-   * draw a filled ellipse
-   */
-  function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
+    /**
+     * draw a filled ellipse
+     */
+    function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
     return  $this->ellipse($x0, $y0, $r1, $r2 =  0, $angle, $nSeg, $astart, $afinish, 1, 1);
-  }
-
-
-  /**
-   * draw an ellipse
-   * note that the part and filled ellipse are just special cases of this function
-   *
-   * draws an ellipse in the current line style
-   * centered at $x0,$y0, radii $r1,$r2
-   * if $r2 is not set, then a circle is drawn
-   * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
-   * pretty crappy shape at 2, as we are approximating with bezier curves.
-   */
-  function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
+    }
+
+
+    /**
+     * draw an ellipse
+     * note that the part and filled ellipse are just special cases of this function
+     *
+     * draws an ellipse in the current line style
+     * centered at $x0,$y0, radii $r1,$r2
+     * if $r2 is not set, then a circle is drawn
+     * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
+     * pretty crappy shape at 2, as we are approximating with bezier curves.
+     */
+    function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
     if  ($r1 ==  0) {
-      return;
+        return;
     }
 
     if  ($r2 ==  0) {
-      $r2 =  $r1;
+        $r2 =  $r1;
     }
 
     if  ($nSeg < 2) {
-      $nSeg =  2;
+        $nSeg =  2;
     }
 
     $astart =  deg2rad((float)$astart);
@@ -2629,16 +2629,16 @@ 
     $dtm =  $dt/3;
 
     if  ($angle !=  0) {
-      $a =  -1*deg2rad((float)$angle);
+        $a =  -1*deg2rad((float)$angle);
 
-      $tmp  =  "\n q ";
-      $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
+        $tmp  =  "\n q ";
+        $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
+        $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
 
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+        $this->objects[$this->currentContents]['c'].=  $tmp;
 
-      $x0 =  0;
-      $y0 =  0;
+        $x0 =  0;
+        $y0 =  0;
     }
 
     $t1 =  $astart;
@@ -2650,183 +2650,183 @@ 
     $this->objects[$this->currentContents]['c'] .=  "\n".sprintf('%.3F', $a0) .' '.sprintf('%.3F', $b0) .' m ';
 
     for  ($i = 1; $i <=  $nSeg; $i++) {
-      // draw this bit of the total curve
-      $t1 =  $i * $dt + $astart;
-      $a1 =  $x0 + $r1 * cos($t1);
-      $b1 =  $y0 + $r2 * sin($t1);
-      $c1 = -$r1 * sin($t1);
-      $d1 =  $r2 * cos($t1);
-
-      $this->objects[$this->currentContents]['c']
+        // draw this bit of the total curve
+        $t1 =  $i * $dt + $astart;
+        $a1 =  $x0 + $r1 * cos($t1);
+        $b1 =  $y0 + $r2 * sin($t1);
+        $c1 = -$r1 * sin($t1);
+        $d1 =  $r2 * cos($t1);
+
+        $this->objects[$this->currentContents]['c']
         .=  "\n".sprintf('%.3F', ($a0+$c0*$dtm)) .' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
 
-      $this->objects[$this->currentContents]['c'] .=
+        $this->objects[$this->currentContents]['c'] .=
         ' '.sprintf('%.3F', ($a1-$c1*$dtm)) .' '.sprintf('%.3F', ($b1-$d1*$dtm)) .' '.sprintf('%.3F', $a1) .' '.sprintf('%.3F', $b1) .' c';
 
-      $a0 =  $a1;
-      $b0 =  $b1;
-      $c0 =  $c1;
-      $d0 =  $d1;
+        $a0 =  $a1;
+        $b0 =  $b1;
+        $c0 =  $c1;
+        $d0 =  $d1;
     }
 
     if  ($fill) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+        $this->objects[$this->currentContents]['c'].=  ' f';
     } else if ($close) {
         $this->objects[$this->currentContents]['c'].=  ' s';
         // small 's' signifies closing the path as well
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+        $this->objects[$this->currentContents]['c'].=  ' S';
     }
 
     if  ($angle !=  0) {
-      $this->objects[$this->currentContents]['c'].=  ' Q';
-    }
-  }
-
-
-  /**
-   * this sets the line drawing style.
-   * width, is the thickness of the line in user units
-   * cap is the type of cap to put on the line, values can be 'butt','round','square'
-   *    where the diffference between 'square' and 'butt' is that 'square' projects a flat end past the
-   *    end of the line.
-   * join can be 'miter', 'round', 'bevel'
-   * dash is an array which sets the dash pattern, is a series of length values, which are the lengths of the
-   *   on and off dashes.
-   *   (2) represents 2 on, 2 off, 2 on , 2 off ...
-   *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
-   * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
-   */
-  function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
+        $this->objects[$this->currentContents]['c'].=  ' Q';
+    }
+    }
+
+
+    /**
+     * this sets the line drawing style.
+     * width, is the thickness of the line in user units
+     * cap is the type of cap to put on the line, values can be 'butt','round','square'
+     *    where the diffference between 'square' and 'butt' is that 'square' projects a flat end past the
+     *    end of the line.
+     * join can be 'miter', 'round', 'bevel'
+     * dash is an array which sets the dash pattern, is a series of length values, which are the lengths of the
+     *   on and off dashes.
+     *   (2) represents 2 on, 2 off, 2 on , 2 off ...
+     *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
+     * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
+     */
+    function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
     // this is quite inefficient in that it sets all the parameters whenever 1 is changed, but will fix another day
     $string =  '';
 
     if  ($width>0) {
-      $string.=  $width.' w';
+        $string.=  $width.' w';
     }
 
     $ca =  array('butt' => 0, 'round' => 1, 'square' => 2);
 
     if  (isset($ca[$cap])) {
-      $string.=  ' '.$ca[$cap].' J';
+        $string.=  ' '.$ca[$cap].' J';
     }
 
     $ja =  array('miter' => 0, 'round' => 1, 'bevel' => 2);
 
     if  (isset($ja[$join])) {
-      $string.=  ' '.$ja[$join].' j';
+        $string.=  ' '.$ja[$join].' j';
     }
 
     if  (is_array($dash)) {
-      $string.=  ' [';
+        $string.=  ' [';
 
-      foreach ($dash as  $len) {
+        foreach ($dash as  $len) {
         $string.=  ' '.$len;
-      }
+        }
 
-      $string.=  ' ] '.$phase.' d';
+        $string.=  ' ] '.$phase.' d';
     }
 
     $this->currentLineStyle =  $string;
     $this->objects[$this->currentContents]['c'].=  "\n".$string;
-  }
+    }
 
 
 
-  /**
-   * draw a polygon, the syntax for this is similar to the GD polygon command
-   */
-  function  polygon($p, $np, $f =  0) {
+    /**
+     * draw a polygon, the syntax for this is similar to the GD polygon command
+     */
+    function  polygon($p, $np, $f =  0) {
     $this->objects[$this->currentContents]['c'].=  "\n";
     $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[0]) .' '.sprintf('%.3F', $p[1]) .' m ';
 
     for  ($i =  2; $i < $np * 2; $i =  $i + 2) {
-      $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
+        $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
     }
 
     if  ($f ==  1) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+        $this->objects[$this->currentContents]['c'].=  ' f';
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+        $this->objects[$this->currentContents]['c'].=  ' S';
+    }
     }
-  }
 
 
-  /**
-   * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
-   * the coordinates of the upper-right corner
-   */
-  function  filledRectangle($x1, $y1, $width, $height) {
+    /**
+     * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
+     * the coordinates of the upper-right corner
+     */
+    function  filledRectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
-  }
+    }
 
 
-  /**
-   * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
-   * the coordinates of the upper-right corner
-   */
-  function  rectangle($x1, $y1, $width, $height) {
+    /**
+     * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
+     * the coordinates of the upper-right corner
+     */
+    function  rectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
-  }
+    }
 
 
-  /**
-   * add a new page to the document
-   * this also makes the new page the current active object
-   */
-  function  newPage($insert =  0, $id =  0, $pos =  'after') {
+    /**
+     * add a new page to the document
+     * this also makes the new page the current active object
+     */
+    function  newPage($insert =  0, $id =  0, $pos =  'after') {
     // if there is a state saved, then go up the stack closing them
     // then on the new page, re-open them with the right setings
 
     if  ($this->nStateStack) {
-      for  ($i =  $this->nStateStack;$i >=  1;$i--) {
+        for  ($i =  $this->nStateStack;$i >=  1;$i--) {
         $this->restoreState($i);
-      }
+        }
     }
 
     $this->numObj++;
 
     if  ($insert) {
-      // the id from the ezPdf class is the id of the contents of the page, not the page object itself
-      // query that object to find the parent
-      $rid =  $this->objects[$id]['onPage'];
-      $opt =  array('rid' => $rid, 'pos' => $pos);
-      $this->o_page($this->numObj, 'new', $opt);
+        // the id from the ezPdf class is the id of the contents of the page, not the page object itself
+        // query that object to find the parent
+        $rid =  $this->objects[$id]['onPage'];
+        $opt =  array('rid' => $rid, 'pos' => $pos);
+        $this->o_page($this->numObj, 'new', $opt);
     } else {
-      $this->o_page($this->numObj, 'new');
+        $this->o_page($this->numObj, 'new');
     }
 
     // if there is a stack saved, then put that onto the page
     if  ($this->nStateStack) {
-      for  ($i =  1;$i <=  $this->nStateStack;$i++) {
+        for  ($i =  1;$i <=  $this->nStateStack;$i++) {
         $this->saveState($i);
-      }
+        }
     }
 
     // and if there has been a stroke or fill colour set, then transfer them
     if  ($this->currentColour['r'] >=  0) {
-      $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
+        $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
     }
 
     if  ($this->currentStrokeColour['r'] >=  0) {
-      $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
+        $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
     }
 
     // if there is a line style set, then put this in too
     if  (mb_strlen($this->currentLineStyle, '8bit')) {
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
+        $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
     }
 
     // the call to the o_page object set currentContents to the present page, so this can be returned as the page id
     return  $this->currentContents;
-  }
+    }
 
 
-  /**
-   * output the pdf code, streaming it to the browser
-   * the relevant headers are set so that hopefully the browser will recognise it
-   */
-  function  stream($options =  '') {
+    /**
+     * output the pdf code, streaming it to the browser
+     * the relevant headers are set so that hopefully the browser will recognise it
+     */
+    function  stream($options =  '') {
     // setting the options allows the adjustment of the headers
     // values at the moment are:
     // 'Content-Disposition' => 'filename'  - sets the filename, though not too sure how well this will
@@ -2837,16 +2837,16 @@ 
     // 'compress' = > 1 or 0 - apply content stream compression, this is on (1) by default
     // 'Attachment' => 1 or 0 - if 1, force the browser to open a download dialog
     if  (!is_array($options)) {
-      $options =  array();
+        $options =  array();
     }
 
     if  ( headers_sent())
-      die("Unable to stream pdf: headers already sent");
+        die("Unable to stream pdf: headers already sent");
 
     if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
-      $tmp =  ltrim($this->output(1));
+        $tmp =  ltrim($this->output(1));
     } else {
-      $tmp =  ltrim($this->output());
+        $tmp =  ltrim($this->output());
     }
 
     header("Cache-Control: private");
@@ -2857,28 +2857,28 @@ 
     $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
 
     if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+        $options["Attachment"] =  true;
 
     $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
 
     header("Content-Disposition: $attachment; filename=\"$fileName\"");
 
     if  (isset($options['Accept-Ranges']) &&  $options['Accept-Ranges'] ==  1) {
-      //FIXME: Is this the correct value ... spec says 1#range-unit
-      header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
+        //FIXME: Is this the correct value ... spec says 1#range-unit
+        header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
     }
 
     echo  $tmp;
     flush();
-  }
+    }
 
 
-  /**
-   * return the height in units of the current font in the given size
-   */
-  function  getFontHeight($size) {
+    /**
+     * return the height in units of the current font in the given size
+     */
+    function  getFontHeight($size) {
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
     
     // for the current font, and the given size, what is the height of the font in user units
@@ -2887,165 +2887,165 @@ 
     // have to adjust by a font offset for Windows fonts.  unfortunately it looks like
     // the bounding box calculations are wrong and I don't know why.
     if (isset($this->fonts[$this->currentFont]['FontHeightOffset'])) {
-      // For CourierNew from Windows this needs to be -646 to match the
-      // Adobe native Courier font.
-      //
-      // For FreeMono from GNU this needs to be -337 to match the
-      // Courier font.
-      //
-      // Both have been added manually to the .afm and .ufm files.
-      $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
+        // For CourierNew from Windows this needs to be -646 to match the
+        // Adobe native Courier font.
+        //
+        // For FreeMono from GNU this needs to be -337 to match the
+        // Courier font.
+        //
+        // Both have been added manually to the .afm and .ufm files.
+        $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
     }
 
     return  $size*$h/1000;
-  }
+    }
 
 
-  /**
-   * return the font descender, this will normally return a negative number
-   * if you add this number to the baseline, you get the level of the bottom of the font
-   * it is in the pdf user units
-   */
-  function  getFontDescender($size) {
+    /**
+     * return the font descender, this will normally return a negative number
+     * if you add this number to the baseline, you get the level of the bottom of the font
+     * it is in the pdf user units
+     */
+    function  getFontDescender($size) {
     // note that this will most likely return a negative value
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     //$h = $this->fonts[$this->currentFont]['FontBBox'][1];
     $h = $this->fonts[$this->currentFont]['Descender'];
 
     return  $size*$h/1000;
-  }
+    }
 
 
-  /**
-   * filter the text, this is applied to all text just before being inserted into the pdf document
-   * it escapes the various things that need to be escaped, and so on
-   *
-   * @access private
-   */
-  function  filterText($text, $bom = true) {
+    /**
+     * filter the text, this is applied to all text just before being inserted into the pdf document
+     * it escapes the various things that need to be escaped, and so on
+     *
+     * @access private
+     */
+    function  filterText($text, $bom = true) {
     if (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
     
-  	$cf = $this->currentFont;
+        $cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
-      $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-      $text =  $this->utf8toUtf16BE($text, $bom);
+        $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+        $text =  $this->utf8toUtf16BE($text, $bom);
     } else {
-      if (in_array('Windows-1252', mb_list_encodings())) {
+        if (in_array('Windows-1252', mb_list_encodings())) {
         $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
-      } else {
+        } else {
         $text = mb_convert_encoding($text, 'iso-8859-1', 'UTF-8');
-      }
-      $text = html_entity_decode($text, ENT_QUOTES);
+        }
+        $text = html_entity_decode($text, ENT_QUOTES);
     }
 
     // the chr(13) substitution fixes a bug seen in TCPDF (bug #1421290)
     $text = strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
     return  $text;
-  }
-
-  /**
-   * return array containing codepoints (UTF-8 character values) for the
-   * string passed in.
-   *
-   * based on the excellent TCPDF code by Nicola Asuni and the
-   * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-   *
-   * @access private
-   * @author Orion Richardson
-   * @since January 5, 2008
-   * @param string $text UTF-8 string to process
-   * @return array UTF-8 codepoints array for the string
-   */
-  function  utf8toCodePointsArray(&$text) {
+    }
+
+    /**
+     * return array containing codepoints (UTF-8 character values) for the
+     * string passed in.
+     *
+     * based on the excellent TCPDF code by Nicola Asuni and the
+     * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+     *
+     * @access private
+     * @author Orion Richardson
+     * @since January 5, 2008
+     * @param string $text UTF-8 string to process
+     * @return array UTF-8 codepoints array for the string
+     */
+    function  utf8toCodePointsArray(&$text) {
     $length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040
     $unicode = array(); // array containing unicode values
     $bytes = array(); // array containing single character byte sequences
     $numbytes = 1; // number of octetc needed to represent the UTF-8 character
     
     for ($i = 0; $i < $length; $i++) {
-      $c = ord($text[$i]); // get one string character at time
-      if (count($bytes) == 0) { // get starting octect
+        $c = ord($text[$i]); // get one string character at time
+        if (count($bytes) == 0) { // get starting octect
         if ($c <= 0x7F) {
-          $unicode[] = $c; // use the character "as is" because is ASCII
-          $numbytes = 1;
+            $unicode[] = $c; // use the character "as is" because is ASCII
+            $numbytes = 1;
         } elseif (($c >> 0x05) == 0x06) { // 2 bytes character (0x06 = 110 BIN)
-          $bytes[] = ($c - 0xC0) << 0x06;
-          $numbytes = 2;
+            $bytes[] = ($c - 0xC0) << 0x06;
+            $numbytes = 2;
         } elseif (($c >> 0x04) == 0x0E) { // 3 bytes character (0x0E = 1110 BIN)
-          $bytes[] = ($c - 0xE0) << 0x0C;
-          $numbytes = 3;
+            $bytes[] = ($c - 0xE0) << 0x0C;
+            $numbytes = 3;
         } elseif (($c >> 0x03) == 0x1E) { // 4 bytes character (0x1E = 11110 BIN)
-          $bytes[] = ($c - 0xF0) << 0x12;
-          $numbytes = 4;
+            $bytes[] = ($c - 0xF0) << 0x12;
+            $numbytes = 4;
         } else {
-          // use replacement character for other invalid sequences
-          $unicode[] = 0xFFFD;
-          $bytes = array();
-          $numbytes = 1;
+            // use replacement character for other invalid sequences
+            $unicode[] = 0xFFFD;
+            $bytes = array();
+            $numbytes = 1;
         }
-      } elseif (($c >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
+        } elseif (($c >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
         $bytes[] = $c - 0x80;
         if (count($bytes) == $numbytes) {
-          // compose UTF-8 bytes to a single unicode value
-          $c = $bytes[0];
-          for ($j = 1; $j < $numbytes; $j++) {
+            // compose UTF-8 bytes to a single unicode value
+            $c = $bytes[0];
+            for ($j = 1; $j < $numbytes; $j++) {
             $c += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
-          }
-          if ((($c >= 0xD800) AND ($c <= 0xDFFF)) OR ($c >= 0x10FFFF)) {
+            }
+            if ((($c >= 0xD800) AND ($c <= 0xDFFF)) OR ($c >= 0x10FFFF)) {
             // The definition of UTF-8 prohibits encoding character numbers between
             // U+D800 and U+DFFF, which are reserved for use with the UTF-16
             // encoding form (as surrogate pairs) and do not directly represent
             // characters.
             $unicode[] = 0xFFFD; // use replacement character
-          } else {
+            } else {
             $unicode[] = $c; // add char to array
-          }
-          // reset data for next char
-          $bytes = array();
-          $numbytes = 1;
+            }
+            // reset data for next char
+            $bytes = array();
+            $numbytes = 1;
         }
-      } else {
+        } else {
         // use replacement character for other invalid sequences
         $unicode[] = 0xFFFD;
         $bytes = array();
         $numbytes = 1;
-      }
+        }
     }
     return $unicode;
-  }
-
-  /**
-   * convert UTF-8 to UTF-16 with an additional byte order marker
-   * at the front if required.
-   *
-   * based on the excellent TCPDF code by Nicola Asuni and the
-   * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-   *
-   * @access private
-   * @author Orion Richardson
-   * @since January 5, 2008
-   * @param string $text UTF-8 string to process
-   * @param boolean $bom whether to add the byte order marker
-   * @return string UTF-16 result string
-   */
-  function  utf8toUtf16BE(&$text, $bom = true) {
+    }
+
+    /**
+     * convert UTF-8 to UTF-16 with an additional byte order marker
+     * at the front if required.
+     *
+     * based on the excellent TCPDF code by Nicola Asuni and the
+     * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+     *
+     * @access private
+     * @author Orion Richardson
+     * @since January 5, 2008
+     * @param string $text UTF-8 string to process
+     * @param boolean $bom whether to add the byte order marker
+     * @return string UTF-16 result string
+     */
+    function  utf8toUtf16BE(&$text, $bom = true) {
     $cf =  $this->currentFont;
     if (!$this->fonts[$cf]['isUnicode']) return $text;
     $out = $bom ? "\xFE\xFF" : '';
     
     $unicode = $this->utf8toCodePointsArray($text);
     foreach ($unicode as $c) {
-      if ($c == 0xFFFD) {
+        if ($c == 0xFFFD) {
         $out .= "\xFF\xFD"; // replacement character
-      } elseif ($c < 0x10000) {
+        } elseif ($c < 0x10000) {
         $out .= chr($c >> 0x08);
         $out .= chr($c & 0xFF);
-       } else {
+        } else {
         $c -= 0x10000;
         $w1 = 0xD800 | ($c >> 0x10);
         $w2 = 0xDC00 | ($c & 0x3FF);
@@ -3053,19 +3053,19 @@ 
         $out .= chr($w1 & 0xFF);
         $out .= chr($w2 >> 0x08);
         $out .= chr($w2 & 0xFF);
-      }
+        }
     }
     return $out;
-  }
+    }
 
 
-  /**
-   * given a start position and information about how text is to be laid out, calculate where
-   * on the page the text will end
-   *
-   * @access private
-   */
-  function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
+    /**
+     * given a start position and information about how text is to be laid out, calculate where
+     * on the page the text will end
+     *
+     * @access private
+     */
+    function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
     $w =  $this->getTextWidth($size, $text);
 
@@ -3076,66 +3076,66 @@ 
     $a =  deg2rad((float)$angle);
 
     return  array(cos($a) *$w+$x, -sin($a) *$w+$y);
-  }
+    }
 
 
-  /**
-   * wrapper function for PRVTcheckTextDirective1
-   *
-   * @access private
-   */
-  function  PRVTcheckTextDirective(&$text, $i, &$f) {
+    /**
+     * wrapper function for PRVTcheckTextDirective1
+     *
+     * @access private
+     */
+    function  PRVTcheckTextDirective(&$text, $i, &$f) {
     return  0;
     $x =  0;
     $y =  0;
     return  $this->PRVTcheckTextDirective1($text, $i, $f, 0, $x, $y);
-  }
+    }
 
 
-  /**
-   * checks if the text stream contains a control directive
-   * if so then makes some changes and returns the number of characters involved in the directive
-   * this has been re-worked to include everything neccesary to find the current writing point, so that
-   * the location can be sent to the callback function if required
-   * if the directive does not require a font change, then $f should be set to 0
-   *
-   * @access private
-   */
-  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
+    /**
+     * checks if the text stream contains a control directive
+     * if so then makes some changes and returns the number of characters involved in the directive
+     * this has been re-worked to include everything neccesary to find the current writing point, so that
+     * the location can be sent to the callback function if required
+     * if the directive does not require a font change, then $f should be set to 0
+     *
+     * @access private
+     */
+    function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
     return  0;
     $directive =  0;
     $j =  $i;
     if  ($text[$j] === '<') {
-      $j++;
-      switch ($text[$j]) {
-      case  '/':
+        $j++;
+        switch ($text[$j]) {
+        case  '/':
         $j++;
         if  (mb_strlen($text) <=  $j) {
-          return  $directive;
+            return  $directive;
         }
 
         switch ($text[$j]) {
         case  'b':
         case  'i':
           $j++;
-          if  ($text[$j] === '>') {
+            if  ($text[$j] === '>') {
             $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
 
             if  ($p !==  false) {
-              // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+                // then there is one to remove
+                $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
             }
 
             $directive =  $j-$i+1;
-          }
-          break;
+            }
+            break;
 
         case  'c':
           // this this might be a callback function
           $j++;
-          $k =  mb_strpos($text, '>', $j);
+            $k =  mb_strpos($text, '>', $j);
 
-          if  ($k !==  false &&  $text[$j] === ':') {
+            if  ($k !==  false &&  $text[$j] === ':') {
             // then this will be treated as a callback directive
             $directive =  $k-$i+1;
             $f =  0;
@@ -3144,18 +3144,18 @@ 
             $b1 =  mb_strpos($tmp, ':');
 
             if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
+                $func =  mb_substr($tmp, 0, $b1);
+                $parm =  mb_substr($tmp, $b1+1);
             } else {
-              $func =  $tmp;
-              $parm =  '';
+                $func =  $tmp;
+                $parm =  '';
             }
 
             if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
+                $directive =  0;
             } else {
-              // only call the function if this is the final call
-              if  ($final) {
+                // only call the function if this is the final call
+                if  ($final) {
                 // need to assess the text position, calculate the text width to this point
                 // can use getTextWidth to find the text width I think
                 $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
@@ -3166,76 +3166,76 @@ 
                 $ret =  $this->$func($info);
 
                 if  (is_array($ret)) {
-                  // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
+                    // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                    foreach($ret as  $rk => $rv) {
                     switch ($rk) {
                     case  'x':
                     case  'y':
                       $$rk =  $rv;
-                      break;
+                        break;
+                    }
                     }
-                  }
                 }
 
                 // also remove from to the stack
                 // for simplicity, just take from the end, fix this another day
                 $this->nCallback--;
                 if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
+                    $this->nCallBack =  0;
+                }
                 }
-              }
             }
-          }
-          break;
+            }
+            break;
         }
         break;
 
-      case  'b':
+        case  'b':
       case  'i':
         $j++;
         if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
+            $this->currentTextState.=  $text[$j-1];
+            $directive =  $j-$i+1;
         }
         break;
 
-      case  'C':
+        case  'C':
         $noClose =  1;
-      case  'c':
+        case  'c':
         // this this might be a callback function
         $j++;
         $k =  mb_strpos($text, '>', $j);
 
         if  ($k !==  false &&  $text[$j] ===  ':') {
-          // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+            // then this will be treated as a callback directive
+            $directive =  $k-$i+1;
 
-          $f =  0;
+            $f =  0;
 
-          // split the remainder on colons to get the function name and the paramater
-          //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+            // split the remainder on colons to get the function name and the paramater
+            //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
+            $tmp =  mb_substr($text, $j+1, $k-$j-1);
+            $b1 =  mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
+            if  ($b1 !==  false) {
             $func =  mb_substr($tmp, 0, $b1);
             $parm =  mb_substr($tmp, $b1+1);
-          } else {
+            } else {
             $func =  $tmp;
             $parm =  '';
-          }
+            }
 
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
             $directive =  0;
-          } else {
+            } else {
             // only call the function if this is the final call, ie, the one actually doing printing, not measurement
             if  ($final) {
-              // need to assess the text position, calculate the text width to this point
-              // can use getTextWidth to find the text width I think
-              // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+                // need to assess the text position, calculate the text width to this point
+                // can use getTextWidth to find the text width I think
+                // also add the text height and descender
+                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-              $info =  array(
+                $info =  array(
                 'x' => $tmp[0], 
                 'y' => $tmp[1], 
                 'angle' => $angle, 
@@ -3244,79 +3244,79 @@ 
                 'f' => $func, 
                 'height' => $this->getFontHeight($size), 
                 'descender' => $this->getFontDescender($size)
-              );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
+                );
+                $x =  $tmp[0];
+                $y =  $tmp[1];
 
-              if  (!isset($noClose) ||  !$noClose) {
+                if  (!isset($noClose) ||  !$noClose) {
                 // only add to the stack if this is a small 'c', therefore is a start-stop pair
                 $this->nCallback++;
                 $info['nCallback'] =  $this->nCallback;
                 $this->callback[$this->nCallback] =  $info;
-              }
+                }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
+                $ret =  $this->$func($info);
+                if  (is_array($ret)) {
                 // then the return from the callback function could set the position, to start with, later will do font colour, and font
                 foreach($ret as  $rk => $rv) {
-                  switch ($rk) {
-                  case  'x':
+                    switch ($rk) {
+                    case  'x':
                   case  'y':
                     $$rk =  $rv;
                     break;
-                  }
+                    }
+                }
                 }
-              }
             }
-          }
+            }
         }
         break;
-      }
+        }
     }
 
     return  $directive;
-  }
+    }
 
 
-  /**
-   * add text to the document, at a specified location, size and angle on the page
-   */
-  function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
+    /**
+     * add text to the document, at a specified location, size and angle on the page
+     */
+    function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     // if there are any open callbacks, then they should be called, to show the start of the line
     if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+        for  ($i =  $this->nCallback;$i>0;$i--) {
         // call each function
         $info =  array('x' => $x,
-                       'y' => $y,
-                       'angle' => $angle,
-                       'status' => 'sol',
-                       'p' => $this->callback[$i]['p'],
-                       'nCallback' => $this->callback[$i]['nCallback'],
-                       'height' => $this->callback[$i]['height'],
-                       'descender' => $this->callback[$i]['descender']);
+                        'y' => $y,
+                        'angle' => $angle,
+                        'status' => 'sol',
+                        'p' => $this->callback[$i]['p'],
+                        'nCallback' => $this->callback[$i]['nCallback'],
+                        'height' => $this->callback[$i]['height'],
+                        'descender' => $this->callback[$i]['descender']);
 
         $func =  $this->callback[$i]['f'];
         $this->$func($info);
-      }
+        }
     }
 
     if  ($angle ==  0) {
-      $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
+        $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
     } else {
-      $a =  deg2rad((float)$angle);
-      $tmp =  "\n".'BT ';
-      $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+        $a =  deg2rad((float)$angle);
+        $tmp =  "\n".'BT ';
+        $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
+        $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
+        $this->objects[$this->currentContents]['c'].=  $tmp;
     }
 
     if  ($wordSpaceAdjust !=  0 ||  $wordSpaceAdjust !=  $this->wordSpaceAdjust) {
-      $this->wordSpaceAdjust =  $wordSpaceAdjust;
-      $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
+        $this->wordSpaceAdjust =  $wordSpaceAdjust;
+        $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
     }
 
     $len =  mb_strlen($text);
@@ -3366,47 +3366,47 @@ 
      }
     */
     if  ($start < $len) {
-      $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
-      $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
-      $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
+        $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
+        $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
+        $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
     }
 
     $this->objects[$this->currentContents]['c'].=  ' ET';
 
     // if there are any open callbacks, then they should be called, to show the end of the line
     if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+        for  ($i =  $this->nCallback;$i>0;$i--) {
         // call each function
         $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
         $info =  array(
-          'x' => $tmp[0], 
-          'y' => $tmp[1], 
-          'angle' => $angle,
-          'status' => 'eol', 
-          'p' => $this->callback[$i]['p'], 
-          'nCallback' => $this->callback[$i]['nCallback'], 
-          'height' => $this->callback[$i]['height'], 
-          'descender' => $this->callback[$i]['descender']
+            'x' => $tmp[0], 
+            'y' => $tmp[1], 
+            'angle' => $angle,
+            'status' => 'eol', 
+            'p' => $this->callback[$i]['p'], 
+            'nCallback' => $this->callback[$i]['nCallback'], 
+            'height' => $this->callback[$i]['height'], 
+            'descender' => $this->callback[$i]['descender']
         );
         $func =  $this->callback[$i]['f'];
         $this->$func($info);
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * calculate how wide a given text string will be on a page, at a given size.
-   * this can be called externally, but is alse used by the other class functions
-   */
-  function  getTextWidth($size, $text, $spacing =  0) {
+    /**
+     * calculate how wide a given text string will be on a page, at a given size.
+     * this can be called externally, but is alse used by the other class functions
+     */
+    function  getTextWidth($size, $text, $spacing =  0) {
     // this function should not change any of the settings, though it will need to
     // track any directives which change during calculation, so copy them at the start
     // and put them back at the end.
     $store_currentTextState =  $this->currentTextState;
 
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     // converts a number or a float to a string so it can get the width
@@ -3418,33 +3418,33 @@ 
     $cf =  $this->currentFont;
     $space_scale =  1000 / $size;
     if ( $this->fonts[$cf]['isUnicode']) {
-      // for Unicode, use the code points array to calculate width rather
-      // than just the string itself
-      $unicode =  $this->utf8toCodePointsArray($text);
+        // for Unicode, use the code points array to calculate width rather
+        // than just the string itself
+        $unicode =  $this->utf8toCodePointsArray($text);
 
-      foreach ($unicode as $char) {
+        foreach ($unicode as $char) {
         // check if we have to replace character
-      if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+        if  ( isset($this->fonts[$cf]['differences'][$char])) {
+            $char =  $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
         if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+            $w+=  $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
         if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+            $w+=  $spacing * $space_scale;
+        }
         }
-      }
 
     } else {
-      $len =  mb_strlen($text, 'Windows-1252');
+        $len =  mb_strlen($text, 'Windows-1252');
 
-      for  ($i =  0; $i < $len; $i++) {
+        for  ($i =  0; $i < $len; $i++) {
         $char =  ord($text[$i]);
         // check if we have to replace character
         if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+            $char =  $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
         if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
@@ -3452,60 +3452,60 @@ 
         }
         // add additional padding for space
         if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+            $w+=  $spacing * $space_scale;
+        }
         }
-      }
     }
 
     $this->currentTextState =  $store_currentTextState;
     $this->setCurrentFont();
 
     return  $w*$size/1000;
-  }
+    }
 
 
-  /**
-   * do a part of the calculation for sorting out the justification of the text
-   *
-   * @access private
-   */
-  function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
+    /**
+     * do a part of the calculation for sorting out the justification of the text
+     *
+     * @access private
+     */
+    function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
     case  'left':
       return;
 
     case  'right':
       $x+=  $width-$actual;
-      break;
+        break;
 
     case  'center':
     case  'centre':
       $x+=  ($width-$actual) /2;
-      break;
+        break;
 
     case  'full':
       // count the number of words
       $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+        $nspaces =  count($words) -1;
 
-      if  ($nspaces>0) {
+        if  ($nspaces>0) {
         $adjust =  ($width-$actual) /$nspaces;
-      } else {
+        } else {
         $adjust =  0;
-      }
-      break;
+        }
+        break;
+    }
     }
-  }
 
 
-  /**
-   * add text to the page, but ensure that it fits within a certain width
-   * if it does not fit then put in as much as possible, splitting at word boundaries
-   * and return the remainder.
-   * justification and angle can also be specified for the text
-   */
-  function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
-  	// TODO - need to support Unicode
+    /**
+     * add text to the page, but ensure that it fits within a certain width
+     * if it does not fit then put in as much as possible, splitting at word boundaries
+     * and return the remainder.
+     * justification and angle can also be specified for the text
+     */
+    function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
+        // TODO - need to support Unicode
     $cf =  $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
         die("addTextWrap does not support Unicode yet!");
@@ -3521,12 +3521,12 @@ 
     $store_currentTextState =  $this->currentTextState;
 
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     if  ($width <=  0) {
-      // error, pretend it printed ok, otherwise risking a loop
-      return  '';
+        // error, pretend it printed ok, otherwise risking a loop
+        return  '';
     }
 
     $w =  0;
@@ -3537,38 +3537,38 @@ 
     $tw =  $width/$size*1000;
 
     for  ($i =  0;$i<$len;$i++) {
-      $f =  1;
-      $directive =  0;
-      //$this->PRVTcheckTextDirective($text,$i,$f);
-      if  ($directive) {
+        $f =  1;
+        $directive =  0;
+        //$this->PRVTcheckTextDirective($text,$i,$f);
+        if  ($directive) {
         if  ($f) {
-          $this->setCurrentFont();
-          $cf =  $this->currentFont;
+            $this->setCurrentFont();
+            $cf =  $this->currentFont;
         }
 
         $i =  $i+$directive-1;
-      } else {
+        } else {
         $cOrd =  ord($text[$i]);
 
         if  (isset($this->fonts[$cf]['differences'][$cOrd])) {
-          // then this character is being replaced by another
-          $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
+            // then this character is being replaced by another
+            $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
         } else {
-          $cOrd2 =  $cOrd;
+            $cOrd2 =  $cOrd;
         }
 
         if  (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
+            $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
         }
 
         if  ($w>$tw) {
-          // then we need to truncate this line
-          if  ($break>0) {
+            // then we need to truncate this line
+            if  ($break>0) {
             // then we have somewhere that we can split :)
             if  ($text[$break] ===  ' ') {
-              $tmp =  mb_substr($text, 0, $break);
+                $tmp =  mb_substr($text, 0, $break);
             } else {
-              $tmp =  mb_substr($text, 0, $break+1);
+                $tmp =  mb_substr($text, 0, $break+1);
             }
 
             $adjust =  0;
@@ -3579,18 +3579,18 @@ 
             $this->setCurrentFont();
 
             if  (!$test) {
-              $this->addText($x, $y, $size, $tmp, $angle, $adjust);
+                $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
             return  mb_substr($text, $break+1);
-          } else {
+            } else {
             // just split before the current character
             $tmp =  mb_substr($text, 0, $i);
             $adjust =  0;
             $ctmp =  ord($text[$i]);
 
             if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-              $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+                $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
             }
 
             $tmpw =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
@@ -3601,34 +3601,34 @@ 
             $this->setCurrentFont();
 
             if  (!$test) {
-              $this->addText($x, $y, $size, $tmp, $angle, $adjust);
+                $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
             return  mb_substr($text, $i);
-          }
+            }
         }
 
         if  ($text[$i] ===  '-') {
-          $break =  $i;
-          $breakWidth =  $w*$size/1000;
+            $break =  $i;
+            $breakWidth =  $w*$size/1000;
         }
 
         if  ($text[$i] ===  ' ') {
-          $break =  $i;
-          $ctmp =  ord($text[$i]);
+            $break =  $i;
+            $ctmp =  ord($text[$i]);
 
-          if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
+            if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
             $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
-          }
+            }
 
-          $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+            $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+        }
         }
-      }
     }
 
     // then there was no need to break this line
     if  ($justification ===  'full') {
-      $justification =  'left';
+        $justification =  'left';
     }
 
     $adjust =  0;
@@ -3641,68 +3641,68 @@ 
     $this->setCurrentFont();
 
     if  (!$test) {
-      $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
+        $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
     }
 
     return  '';
-  }
+    }
 
 
-  /**
-   * this will be called at a new page to return the state to what it was on the
-   * end of the previous page, before the stack was closed down
-   * This is to get around not being able to have open 'q' across pages
-   *
-   */
-  function  saveState($pageEnd =  0) {
+    /**
+     * this will be called at a new page to return the state to what it was on the
+     * end of the previous page, before the stack was closed down
+     * This is to get around not being able to have open 'q' across pages
+     *
+     */
+    function  saveState($pageEnd =  0) {
     if  ($pageEnd) {
-      // this will be called at a new page to return the state to what it was on the
-      // end of the previous page, before the stack was closed down
-      // This is to get around not being able to have open 'q' across pages
-      $opt =  $this->stateStack[$pageEnd];
-      // ok to use this as stack starts numbering at 1
-      $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
-      $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
-      $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
-      //    $this->currentLineStyle = $opt['lin'];
+        // this will be called at a new page to return the state to what it was on the
+        // end of the previous page, before the stack was closed down
+        // This is to get around not being able to have open 'q' across pages
+        $opt =  $this->stateStack[$pageEnd];
+        // ok to use this as stack starts numbering at 1
+        $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
+        $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
+        $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
+        //    $this->currentLineStyle = $opt['lin'];
     } else {
-      $this->nStateStack++;
-      $this->stateStack[$this->nStateStack] =  array(
+        $this->nStateStack++;
+        $this->stateStack[$this->nStateStack] =  array(
         'col' => $this->currentColour, 
         'str' => $this->currentStrokeColour, 
         'lin' => $this->currentLineStyle
-      );
+        );
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
-  }
+    }
 
 
-  /**
-   * restore a previously saved state
-   */
-  function  restoreState($pageEnd =  0) {
+    /**
+     * restore a previously saved state
+     */
+    function  restoreState($pageEnd =  0) {
     if  (!$pageEnd) {
-      $n =  $this->nStateStack;
-      $this->currentColour =  $this->stateStack[$n]['col'];
-      $this->currentStrokeColour =  $this->stateStack[$n]['str'];
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
-      $this->currentLineStyle =  $this->stateStack[$n]['lin'];
-      unset($this->stateStack[$n]);
-      $this->nStateStack--;
+        $n =  $this->nStateStack;
+        $this->currentColour =  $this->stateStack[$n]['col'];
+        $this->currentStrokeColour =  $this->stateStack[$n]['str'];
+        $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
+        $this->currentLineStyle =  $this->stateStack[$n]['lin'];
+        unset($this->stateStack[$n]);
+        $this->nStateStack--;
     }
     
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * make a loose object, the output will go into this object, until it is closed, then will revert to
-   * the current one.
-   * this object will not appear until it is included within a page.
-   * the function will return the object number
-   */
-  function  openObject() {
+    /**
+     * make a loose object, the output will go into this object, until it is closed, then will revert to
+     * the current one.
+     * this object will not appear until it is included within a page.
+     * the function will return the object number
+     */
+    function  openObject() {
     $this->nStack++;
     $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
     // add a new object of the content type, to hold the data flow
@@ -3712,315 +3712,315 @@ 
     $this->looseObjects[$this->numObj] =  1;
 
     return  $this->numObj;
-  }
+    }
 
 
-  /**
-   * open an existing object for editing
-   */
-  function  reopenObject($id) {
+    /**
+     * open an existing object for editing
+     */
+    function  reopenObject($id) {
     $this->nStack++;
     $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
     $this->currentContents =  $id;
 
     // also if this object is the primary contents for a page, then set the current page to its parent
     if  (isset($this->objects[$id]['onPage'])) {
-      $this->currentPage =  $this->objects[$id]['onPage'];
+        $this->currentPage =  $this->objects[$id]['onPage'];
+    }
     }
-  }
 
 
-  /**
-   * close an object
-   */
-  function  closeObject() {
+    /**
+     * close an object
+     */
+    function  closeObject() {
     // close the object, as long as there was one open in the first place, which will be indicated by
     // an objectId on the stack.
     if  ($this->nStack>0) {
-      $this->currentContents =  $this->stack[$this->nStack]['c'];
-      $this->currentPage =  $this->stack[$this->nStack]['p'];
-      $this->nStack--;
-      // easier to probably not worry about removing the old entries, they will be overwritten
-      // if there are new ones.
+        $this->currentContents =  $this->stack[$this->nStack]['c'];
+        $this->currentPage =  $this->stack[$this->nStack]['p'];
+        $this->nStack--;
+        // easier to probably not worry about removing the old entries, they will be overwritten
+        // if there are new ones.
+    }
     }
-  }
 
 
-  /**
-   * stop an object from appearing on pages from this point on
-   */
-  function  stopObject($id) {
+    /**
+     * stop an object from appearing on pages from this point on
+     */
+    function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
     // be the last one that could contian it.
     if  (isset($this->addLooseObjects[$id])) {
-      $this->addLooseObjects[$id] =  '';
+        $this->addLooseObjects[$id] =  '';
+    }
     }
-  }
 
 
-  /**
-   * after an object has been created, it wil only show if it has been added, using this function.
-   */
-  function  addObject($id, $options =  'add') {
+    /**
+     * after an object has been created, it wil only show if it has been added, using this function.
+     */
+    function  addObject($id, $options =  'add') {
     // add the specified object to the page
     if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
-      // then it is a valid object, and it is not being added to itself
-      switch ($options) {
-      case  'all':
+        // then it is a valid object, and it is not being added to itself
+        switch ($options) {
+        case  'all':
         // then this object is to be added to this page (done in the next block) and
         // all future new pages.
         $this->addLooseObjects[$id] =  'all';
 
-      case  'add':
+        case  'add':
         if  (isset($this->objects[$this->currentContents]['onPage'])) {
-          // then the destination contents is the primary for the page
-          // (though this object is actually added to that page)
-          $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
+            // then the destination contents is the primary for the page
+            // (though this object is actually added to that page)
+            $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
         }
         break;
 
-      case  'even':
+        case  'even':
         $this->addLooseObjects[$id] =  'even';
         $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
         if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
-          $this->addObject($id);
-          // hacky huh :)
+            $this->addObject($id);
+            // hacky huh :)
         }
         break;
 
-      case  'odd':
+        case  'odd':
         $this->addLooseObjects[$id] =  'odd';
         $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
         if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
-          $this->addObject($id);
-          // hacky huh :)
+            $this->addObject($id);
+            // hacky huh :)
         }
         break;
 
-      case  'next':
+        case  'next':
         $this->addLooseObjects[$id] =  'all';
         break;
 
-      case  'nexteven':
+        case  'nexteven':
         $this->addLooseObjects[$id] =  'even';
         break;
 
-      case  'nextodd':
+        case  'nextodd':
         $this->addLooseObjects[$id] =  'odd';
         break;
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * return a storable representation of a specific object
-   */
-  function  serializeObject($id) {
+    /**
+     * return a storable representation of a specific object
+     */
+    function  serializeObject($id) {
     if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
-  }
+        return  var_export($this->objects[$id],  true);
+    }
 
 
-  /**
-   * restore an object from its stored representation.  returns its new object id.
-   */
-  function  restoreSerializedObject($obj) {
+    /**
+     * restore an object from its stored representation.  returns its new object id.
+     */
+    function  restoreSerializedObject($obj) {
     $obj_id =  $this->openObject();
     eval('$this->objects[$obj_id] = ' . $obj . ';');
     $this->closeObject();
     return  $obj_id;
-  }
+    }
 
 
-  /**
-   * add content to the documents info object
-   */
-  function  addInfo($label, $value =  0) {
+    /**
+     * add content to the documents info object
+     */
+    function  addInfo($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
     // modify this so that arrays can be passed as well.
     // if $label is an array then assume that it is key => value pairs
     // else assume that they are both scalar, anything else will probably error
     if  (is_array($label)) {
-      foreach ($label as  $l => $v) {
+        foreach ($label as  $l => $v) {
         $this->o_info($this->infoObject, $l, $v);
-      }
+        }
     } else {
-      $this->o_info($this->infoObject, $label, $value);
+        $this->o_info($this->infoObject, $label, $value);
+    }
     }
-  }
 
 
-  /**
-   * set the viewer preferences of the document, it is up to the browser to obey these.
-   */
-  function  setPreferences($label, $value =  0) {
+    /**
+     * set the viewer preferences of the document, it is up to the browser to obey these.
+     */
+    function  setPreferences($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
     if  (is_array($label)) {
-      foreach ($label as  $l => $v) {
+        foreach ($label as  $l => $v) {
         $this->o_catalog($this->catalogId, 'viewerPreferences', array($l => $v));
-      }
+        }
     } else {
-      $this->o_catalog($this->catalogId, 'viewerPreferences', array($label => $value));
+        $this->o_catalog($this->catalogId, 'viewerPreferences', array($label => $value));
+    }
     }
-  }
 
 
-  /**
-   * extract an integer from a position in a byte stream
-   *
-   * @access private
-   */
-  function  PRVT_getBytes(&$data, $pos, $num) {
+    /**
+     * extract an integer from a position in a byte stream
+     *
+     * @access private
+     */
+    function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
     $ret =  0;
     for  ($i =  0;$i<$num;$i++) {
-      $ret =  $ret*256;
-      $ret+=  ord($data[$pos+$i]);
+        $ret =  $ret*256;
+        $ret+=  ord($data[$pos+$i]);
     }
 
     return  $ret;
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a GD object
-   * this should work with remote files
-   */
-  function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
+    /**
+     * add a PNG image into the document, from a GD object
+     * this should work with remote files
+     */
+    function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
-	  $data = null;
-	} else {
-  	  // Example for transparency handling on new image. Retain for current image
-      // $tIndex = imagecolortransparent($img);
-      // if ($tIndex > 0) {
-      //   $tColor    = imagecolorsforindex($img, $tIndex);
-      //   $new_tIndex    = imagecolorallocate($new_img, $tColor['red'], $tColor['green'], $tColor['blue']);
-      //   imagefill($new_img, 0, 0, $new_tIndex);
-      //   imagecolortransparent($new_img, $new_tIndex);
-      // }
-	  // blending mode (literal/blending) on drawing into current image. not relevant when not saved or not drawn
-	  //imagealphablending($img, true);
-	  //default, but explicitely set to ensure pdf compatibility
-      imagesavealpha($img, false);
+    if ( isset($this->imagelist[$file]) ) {
+        $data = null;
+    } else {
+        // Example for transparency handling on new image. Retain for current image
+        // $tIndex = imagecolortransparent($img);
+        // if ($tIndex > 0) {
+        //   $tColor    = imagecolorsforindex($img, $tIndex);
+        //   $new_tIndex    = imagecolorallocate($new_img, $tColor['red'], $tColor['green'], $tColor['blue']);
+        //   imagefill($new_img, 0, 0, $new_tIndex);
+        //   imagecolortransparent($new_img, $new_tIndex);
+        // }
+        // blending mode (literal/blending) on drawing into current image. not relevant when not saved or not drawn
+        //imagealphablending($img, true);
+        //default, but explicitely set to ensure pdf compatibility
+        imagesavealpha($img, false);
       
-      $error =  0;
-      //DEBUG_IMG_TEMP
-      //debugpng
-      if (DEBUGPNG) print '[addImagePng '.$file.']';
+        $error =  0;
+        //DEBUG_IMG_TEMP
+        //debugpng
+        if (DEBUGPNG) print '[addImagePng '.$file.']';
 
-      ob_start();
-      @imagepng($img);
-      //$data = ob_get_contents(); ob_end_clean();
-      $data = ob_get_clean();
+        ob_start();
+        @imagepng($img);
+        //$data = ob_get_contents(); ob_end_clean();
+        $data = ob_get_clean();
 
-      if ($data == '') {
+        if ($data == '') {
         $error = 1;
         $errormsg = 'trouble writing file from GD';
         //DEBUG_IMG_TEMP
         //debugpng
         if (DEBUGPNG) print 'trouble writing file from GD';
-	  }
+        }
 
-      if  ($error) {
+        if  ($error) {
         $this->addMessage('PNG error - ('.$file.') '.$errormsg);
         return;
-      }
+        }
     }  //End isset($this->imagelist[$file]) (png Duplicate removal)
 
     $this->addPngFromBuf($file, $x, $y, $w, $h, $data);
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a file
-   * this should work with remote files
-   */
-  function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
+    /**
+     * add a PNG image into the document, from a file
+     * this should work with remote files
+     */
+    function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
-	  $img = null;
-	} else {
-      //png files typically contain an alpha channel.
-      //pdf file format or class.pdf does not support alpha blending.
-      //on alpha blended images, more transparent areas have a color near black.
-      //This appears in the result on not storing the alpha channel.
-      //Correct would be the box background image or its parent when transparent.
-      //But this would make the image dependent on the background.
-      //Therefore create an image with white background and copy in
-      //A more natural background than black is white.
-      //Therefore create an empty image with white background and merge the
-      //image in with alpha blending.
-      $imgtmp = @imagecreatefrompng($file);
-      if (!$imgtmp) {
+    if ( isset($this->imagelist[$file]) ) {
+        $img = null;
+    } else {
+        //png files typically contain an alpha channel.
+        //pdf file format or class.pdf does not support alpha blending.
+        //on alpha blended images, more transparent areas have a color near black.
+        //This appears in the result on not storing the alpha channel.
+        //Correct would be the box background image or its parent when transparent.
+        //But this would make the image dependent on the background.
+        //Therefore create an image with white background and copy in
+        //A more natural background than black is white.
+        //Therefore create an empty image with white background and merge the
+        //image in with alpha blending.
+        $imgtmp = @imagecreatefrompng($file);
+        if (!$imgtmp) {
         return;
-      }
-      $sx = imagesx($imgtmp);
-      $sy = imagesy($imgtmp);
-      $img = imagecreatetruecolor($sx,$sy);
-      imagealphablending($img, true);
-  	  $ti = imagecolortransparent($imgtmp);
-	  if ($ti >= 0) {
-	    $tc = imagecolorsforindex($imgtmp,$ti);
+        }
+        $sx = imagesx($imgtmp);
+        $sy = imagesy($imgtmp);
+        $img = imagecreatetruecolor($sx,$sy);
+        imagealphablending($img, true);
+        $ti = imagecolortransparent($imgtmp);
+        if ($ti >= 0) {
+        $tc = imagecolorsforindex($imgtmp,$ti);
         $ti = imagecolorallocate($img,$tc['red'],$tc['green'],$tc['blue']);
         imagefill($img,0,0,$ti);
         imagecolortransparent($img, $ti);
-      } else {
+        } else {
         imagefill($img,1,1,imagecolorallocate($img,255,255,255));
-      }
-      imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
-      imagedestroy($imgtmp);
+        }
+        imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
+        imagedestroy($imgtmp);
     }
     $this->addImagePng($file, $x, $y, $w, $h, $img);
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a memory buffer of the file
-   */
-  function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
-	if ( isset($this->imagelist[$file]) ) {
-      //debugpng
-      //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
-	  $data = null;
-      $info['width'] = $this->imagelist[$file]['w'];
-      $info['height'] = $this->imagelist[$file]['h'];
-      $label = $this->imagelist[$file]['label'];
-
-	} else {
-      if ($data == null) {
-      	$this->addMessage('addPngFromBuf error - ('.$imgname.') data not present!');
+    /**
+     * add a PNG image into the document, from a memory buffer of the file
+     */
+    function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
+    if ( isset($this->imagelist[$file]) ) {
+        //debugpng
+        //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
+        $data = null;
+        $info['width'] = $this->imagelist[$file]['w'];
+        $info['height'] = $this->imagelist[$file]['h'];
+        $label = $this->imagelist[$file]['label'];
+
+    } else {
+        if ($data == null) {
+            $this->addMessage('addPngFromBuf error - ('.$imgname.') data not present!');
         return;
-      }
-      //debugpng
-      //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
+        }
+        //debugpng
+        //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
     $error =  0;
 
     if  (!$error) {
-      $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
-      if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
+        $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
+        if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
         $error =  1;
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
 
         $errormsg =  'this file does not have a valid header';
-      }
+        }
     }
 
 
     if  (!$error) {
-      // set pointer
-      $p =  8;
-      $len =  mb_strlen($data, '8bit');
+        // set pointer
+        $p =  8;
+        $len =  mb_strlen($data, '8bit');
 
-      // cycle through the file, identifying chunks
-      $haveHeader =  0;
-      $info =  array();
-      $idata =  '';
-      $pdata =  '';
+        // cycle through the file, identifying chunks
+        $haveHeader =  0;
+        $info =  array();
+        $idata =  '';
+        $pdata =  '';
 
-      while  ($p < $len) {
+        while  ($p < $len) {
         $chunkLen =  $this->PRVT_getBytes($data, $p, 4);
         $chunkType =  mb_substr($data, $p+4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
@@ -4028,48 +4028,48 @@ 
         case  'IHDR':
           // this is where all the file information comes from
           $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
-
-          //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
+            $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
+            $info['bitDepth'] =  ord($data[$p+16]);
+            $info['colorType'] =  ord($data[$p+17]);
+            $info['compressionMethod'] =  ord($data[$p+18]);
+            $info['filterMethod'] =  ord($data[$p+19]);
+            $info['interlaceMethod'] =  ord($data[$p+20]);
+
+            //print_r($info);
+            $haveHeader =  1;
+            if  ($info['compressionMethod'] !=  0) {
             $error =  1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
 
             $errormsg =  'unsupported compression method';
-          }
+            }
 
-          if  ($info['filterMethod'] !=  0) {
+            if  ($info['filterMethod'] !=  0) {
             $error =  1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
             $errormsg =  'unsupported filter method';
-          }
-          break;
+            }
+            break;
 
         case  'PLTE':
           $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            break;
 
         case  'IDAT':
           $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            break;
 
         case  'tRNS':
           //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
           //print "tRNS found, color type = ".$info['colorType']."\n";
           $transparency =  array();
 
-          if  ($info['colorType'] ==  3) {
+            if  ($info['colorType'] ==  3) {
             // indexed color, rbg
             /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
@@ -4083,13 +4083,13 @@ 
             $trans =  0;
 
             for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
+                if  (ord($data[$p+8+$i]) ==  0) {
                 $trans =  $i;
-              }
+                }
             }
 
             $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
+            } elseif ($info['colorType'] ==  0) {
             // grayscale
             /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
@@ -4098,7 +4098,7 @@ 
             $transparency['type'] =  'indexed';
 
             $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
+            } elseif ($info['colorType'] ==  2) {
             // truecolor
             /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
@@ -4114,176 +4114,176 @@ 
 
             $transparency['type'] = 'color-key';
             
-          } else {
+            } else {
             //unsupported transparency type
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
-          }
-          // KS End new code
-          break;
+            }
+            // KS End new code
+            break;
 
         default:
           break;
         }
 
         $p+=  $chunkLen+12;
-      }
+        }
 
 
-      if (!$haveHeader) {
+        if (!$haveHeader) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
 
         $errormsg =  'information header is missing';
-      }
+        }
 
-      if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
+        if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
 
         $errormsg =  'There appears to be no support for interlaced images in pdf.';
-      }
+        }
     }
 
     if  (!$error &&  $info['bitDepth'] > 8) {
-      $error =  1;
+        $error =  1;
 
-      //debugpng
-      if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+        //debugpng
+        if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
 
-      $errormsg =  'only bit depth of 8 or less is supported';
+        $errormsg =  'only bit depth of 8 or less is supported';
     }
 
     if  (!$error) {
-      if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
+        if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
-      } else {
+        } else {
         switch  ($info['colorType']) {
         case  3:
           $color =  'DeviceRGB';
-          $ncolor =  1;
-          break;
+            $ncolor =  1;
+            break;
 
         case  2:
           $color =  'DeviceRGB';
-          $ncolor =  3;
-          break;
+            $ncolor =  3;
+            break;
 
         case  0:
           $color =  'DeviceGray';
-          $ncolor =  1;
-          break;
+            $ncolor =  1;
+            break;
+        }
         }
-      }
     }
 
     if  ($error) {
-      $this->addMessage('PNG error - ('.$file.') '.$errormsg);
-      return;
+        $this->addMessage('PNG error - ('.$file.') '.$errormsg);
+        return;
     }
 
-      //print_r($info);
-      // so this image is ok... add it in.
-      $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
-      $this->numObj++;
+        //print_r($info);
+        // so this image is ok... add it in.
+        $this->numImages++;
+        $im =  $this->numImages;
+        $label =  'I'.$im;
+        $this->numObj++;
 
-      //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
-      $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
+        //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
+        $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
 
-      if  (isset($transparency)) {
+        if  (isset($transparency)) {
         $options['transparency'] =  $transparency;
-      }
+        }
 
-      $this->o_image($this->numObj, 'new', $options);
-      $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
+        $this->o_image($this->numObj, 'new', $options);
+        $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
     }
 
     if  ($w <=  0 && $h <=  0) {
-      $w =  $info['width'];
-      $h =  $info['height'];
+        $w =  $info['width'];
+        $h =  $info['height'];
     }
 
     if  ($w <=  0) {
-      $w =  $h/$info['height']*$info['width'];
+        $w =  $h/$info['height']*$info['width'];
     }
 
     if  ($h <=  0) {
-      $h =  $w*$info['height']/$info['width'];
+        $h =  $w*$info['height']/$info['width'];
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
     $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * add a JPEG image into the document, from a file
-   */
-  function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
+    /**
+     * add a JPEG image into the document, from a file
+     */
+    function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
     // note that this function is unable to operate on a remote file.
 
     if  (!file_exists($img)) {
-      return;
+        return;
     }
 
-	if ( isset($this->imagelist[$img]) ) {
-	  $data = null;
-      $imageWidth = $this->imagelist[$img]['w'];
-      $imageHeight = $this->imagelist[$img]['h'];
-      $channels =  $this->imagelist[$img]['c'];
-	} else {
-      $tmp =  getimagesize($img);
-      $imageWidth =  $tmp[0];
-      $imageHeight =  $tmp[1];
+    if ( isset($this->imagelist[$img]) ) {
+        $data = null;
+        $imageWidth = $this->imagelist[$img]['w'];
+        $imageHeight = $this->imagelist[$img]['h'];
+        $channels =  $this->imagelist[$img]['c'];
+    } else {
+        $tmp =  getimagesize($img);
+        $imageWidth =  $tmp[0];
+        $imageHeight =  $tmp[1];
 
-      if  (isset($tmp['channels'])) {
+        if  (isset($tmp['channels'])) {
         $channels =  $tmp['channels'];
-      } else {
+        } else {
         $channels =  3;
-      }
+        }
 
-      //$fp = fopen($img,'rb');
-      $data =  file_get_contents($img);
-      //fread($fp,filesize($img));
-      //fclose($fp);
+        //$fp = fopen($img,'rb');
+        $data =  file_get_contents($img);
+        //fread($fp,filesize($img));
+        //fclose($fp);
     }
 
     if  ($w <=  0 &&  $h <=  0) {
-      $w =  $imageWidth;
+        $w =  $imageWidth;
     }
 
     if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+        $w =  $h/$imageHeight*$imageWidth;
     }
 
     if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+        $h =  $w*$imageHeight/$imageWidth;
     }
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $channels, $img);
-  }
+    }
 
 
-  /**
-   * add an image into the document, from a GD object
-   * this function is not all that reliable, and I would probably encourage people to use
-   * the file based functions
-   */
-  function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
+    /**
+     * add an image into the document, from a GD object
+     * this function is not all that reliable, and I would probably encourage people to use
+     * the file based functions
+     */
+    function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
     /* Todo:
      * Pass in original filename as $imgname
      * If already cached like image_iscached(), allow empty $img
@@ -4303,7 +4303,7 @@ 
     // there seems to be some problem here in that images that have quality set above 75 do not appear
     // not too sure why this is, but in the meantime I have restricted this to 75.
     if  ($quality>75) {
-      $quality =  75;
+        $quality =  75;
     }
 
     // if the width or height are set to zero, then set the other one based on keeping the image
@@ -4312,15 +4312,15 @@ 
     $imageHeight =  imagesy($img);
 
     if  ($w <=  0 &&  $h <=  0) {
-      return;
+        return;
     }
 
     if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+        $w =  $h/$imageHeight*$imageWidth;
     }
 
     if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+        $h =  $w*$imageHeight/$imageWidth;
     }
 
     // gotta get the data out of the img..
@@ -4330,55 +4330,55 @@ 
     $data = ob_get_clean();
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $imgname);
-  }
+    }
 
 
-  /* Check if image already added to pdf image directory.
+    /* Check if image already added to pdf image directory.
    * If yes, need not to create again (pass empty data)
    */
-  function  image_iscached($imgname) {
+    function  image_iscached($imgname) {
     return isset($this->imagelist[$imgname]);
-  }
+    }
 
 
-  /**
-   * common code used by the two JPEG adding functions
-   *
-   * @access private
-   */
-  function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
+    /**
+     * common code used by the two JPEG adding functions
+     *
+     * @access private
+     */
+    function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
     if ( isset($this->imagelist[$imgname]) ) {
-      $label = $this->imagelist[$imgname]['label'];
-      //debugpng
-      //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
+        $label = $this->imagelist[$imgname]['label'];
+        //debugpng
+        //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
 
     } else {
-      if ($data == null) {
-      	$this->addMessage('addJpegImage_common error - ('.$imgname.') data not present!');
+        if ($data == null) {
+            $this->addMessage('addJpegImage_common error - ('.$imgname.') data not present!');
         return;
-      }
+        }
 
-      // note that this function is not to be called externally
-      // it is just the common code between the GD and the file options
-      $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
-      $this->numObj++;
-      $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
-      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
+        // note that this function is not to be called externally
+        // it is just the common code between the GD and the file options
+        $this->numImages++;
+        $im =  $this->numImages;
+        $label =  'I'.$im;
+        $this->numObj++;
+        $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
+        $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
     $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * specify where the document should open when it first starts
-   */
-  function  openHere($style, $a =  0, $b =  0, $c =  0) {
+    /**
+     * specify where the document should open when it first starts
+     */
+    function  openHere($style, $a =  0, $b =  0, $c =  0) {
     // this function will open the document at a specified page, in a specified style
     // the values for style, and the required paramters are:
     // 'XYZ'  left, top, zoom
@@ -4393,17 +4393,17 @@ 
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
     $id =  $this->catalogId;
     $this->o_catalog($id, 'openHere', $this->numObj);
-  }
+    }
   
-  function addJavascript($code) {
+    function addJavascript($code) {
     $this->javascript .= $code;
-  }
+    }
 
 
-  /**
-   * create a labelled destination within the document
-   */
-  function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
+    /**
+     * create a labelled destination within the document
+     */
+    function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
     // it has been linked to
     // styles are the same as the 'openHere' function
@@ -4413,78 +4413,78 @@ 
 
     // store the label->idf relationship, note that this means that labels can be used only once
     $this->destinations["$label"] =  $id;
-  }
+    }
 
 
-  /**
-   * define font families, this is used to initialize the font families for the default fonts
-   * and for the user to add new ones for their fonts. The default bahavious can be overridden should
-   * that be desired.
-   */
-  function  setFontFamily($family, $options =  '') {
+    /**
+     * define font families, this is used to initialize the font families for the default fonts
+     * and for the user to add new ones for their fonts. The default bahavious can be overridden should
+     * that be desired.
+     */
+    function  setFontFamily($family, $options =  '') {
     if  (!is_array($options)) {
-      if  ($family ===  'init') {
+        if  ($family ===  'init') {
         // set the known family groups
         // these font families will be used to enable bold and italic markers to be included
         // within text streams. html forms will be used... <b></b> <i></i>
         $this->fontFamilies['Helvetica.afm'] =
-          array('b' => 'Helvetica-Bold.afm',
+            array('b' => 'Helvetica-Bold.afm',
                 'i' => 'Helvetica-Oblique.afm',
                 'bi' => 'Helvetica-BoldOblique.afm',
                 'ib' => 'Helvetica-BoldOblique.afm');
 
         $this->fontFamilies['Courier.afm'] =
-          array('b' => 'Courier-Bold.afm',
+            array('b' => 'Courier-Bold.afm',
                 'i' => 'Courier-Oblique.afm',
                 'bi' => 'Courier-BoldOblique.afm',
                 'ib' => 'Courier-BoldOblique.afm');
 
         $this->fontFamilies['Times-Roman.afm'] =
-          array('b' => 'Times-Bold.afm',
+            array('b' => 'Times-Bold.afm',
                 'i' => 'Times-Italic.afm',
                 'bi' => 'Times-BoldItalic.afm',
                 'ib' => 'Times-BoldItalic.afm');
-      }
+        }
     } else {
 
-      // the user is trying to set a font family
-      // note that this can also be used to set the base ones to something else
-      if  (mb_strlen($family)) {
+        // the user is trying to set a font family
+        // note that this can also be used to set the base ones to something else
+        if  (mb_strlen($family)) {
         $this->fontFamilies[$family] =  $options;
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * used to add messages for use in debugging
-   */
-  function  addMessage($message) {
+    /**
+     * used to add messages for use in debugging
+     */
+    function  addMessage($message) {
     $this->messages.=  $message."\n";
-  }
+    }
 
 
-  /**
-   * a few functions which should allow the document to be treated transactionally.
-   */
-  function  transaction($action) {
+    /**
+     * a few functions which should allow the document to be treated transactionally.
+     */
+    function  transaction($action) {
     switch  ($action) {
     case  'start':
       // store all the data away into the checkpoint variable
       $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
-      unset($data);
-      break;
+        $this->checkpoint =  $data;
+        unset($data);
+        break;
 
     case  'commit':
       if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
         $tmp =  $this->checkpoint['checkpoint'];
         $this->checkpoint =  $tmp;
         unset($tmp);
-      } else {
+        } else {
         $this->checkpoint =  '';
-      }
-      break;
+        }
+        break;
 
     case  'rewind':
       // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
@@ -4493,25 +4493,25 @@ 
         $tmp =  $this->checkpoint;
 
         foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
+            if  ($k !==  'checkpoint') {
             $this->$k =  $v;
-          }
+            }
         }
         unset($tmp);
-      }
-      break;
+        }
+        break;
 
     case  'abort':
       if  (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
         $tmp =  $this->checkpoint;
         foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
+            $this->$k =  $v;
         }
         unset($tmp);
-      }
-      break;
+        }
+        break;
+    }
     }
-  }
 }
 // end of class

Switch Indentation +1218 added lines, -1218 removed lines

@@ -354,30 +354,30 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
-      case  'XYZ':
-      case  'FitR':
-        $tmp =   ' '.$options['p3'].$tmp;
-      case  'FitH':
-      case  'FitV':
-      case  'FitBH':
-      case  'FitBV':
-        $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
-      case  'Fit':
-      case  'FitB':
-        $tmp =   $options['type'].$tmp;
-        $this->objects[$id]['info']['string'] = $tmp;
-        $this->objects[$id]['info']['page'] = $options['page'];
-      }
+        case  'new':
+          $this->objects[$id] = array('t'=>'destination', 'info'=>array());
+          $tmp =  '';
+          switch  ($options['type']) {
+              case  'XYZ':
+              case  'FitR':
+                $tmp =   ' '.$options['p3'].$tmp;
+              case  'FitH':
+              case  'FitV':
+              case  'FitBH':
+              case  'FitBV':
+                $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
+              case  'Fit':
+              case  'FitB':
+                $tmp =   $options['type'].$tmp;
+                $this->objects[$id]['info']['string'] = $tmp;
+                $this->objects[$id]['info']['page'] = $options['page'];
+          }
       break;
 
-    case  'out':
-      $tmp =  $o['info'];
-      $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
-      return  $res;
+        case  'out':
+          $tmp =  $o['info'];
+          $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+          return  $res;
     }
   }
 
@@ -391,33 +391,33 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
-      break;
-
-    case  'add':
-      foreach($options as  $k=>$v) {
-        switch  ($k) {
-        case  'HideToolbar':
-        case  'HideMenubar':
-        case  'HideWindowUI':
-        case  'FitWindow':
-        case  'CenterWindow':
-        case  'NonFullScreenPageMode':
-        case  'Direction':
-          $o['info'][$k] = $v;
+        case  'new':
+          $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
           break;
-        }
+
+        case  'add':
+          foreach($options as  $k=>$v) {
+            switch  ($k) {
+                case  'HideToolbar':
+                case  'HideMenubar':
+                case  'HideWindowUI':
+                case  'FitWindow':
+                case  'CenterWindow':
+                case  'NonFullScreenPageMode':
+                case  'Direction':
+                  $o['info'][$k] = $v;
+                  break;
+            }
       }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\n";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\n";
+          return  $res;
     }
   }
 
@@ -431,55 +431,55 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
-      $this->catalogId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
+          $this->catalogId = $id;
+          break;
 
-    case  'outlines':
-    case  'pages':
-    case  'openHere':
-    case  'javascript':
-      $o['info'][$action] = $options;
-      break;
+        case  'outlines':
+        case  'pages':
+        case  'openHere':
+        case  'javascript':
+          $o['info'][$action] = $options;
+          break;
 
-    case  'viewerPreferences':
-      if  (!isset($o['info']['viewerPreferences'])) {
-        $this->numObj++;
-        $this->o_viewerPreferences($this->numObj, 'new');
-        $o['info']['viewerPreferences'] = $this->numObj;
-      }
+        case  'viewerPreferences':
+          if  (!isset($o['info']['viewerPreferences'])) {
+            $this->numObj++;
+            $this->o_viewerPreferences($this->numObj, 'new');
+            $o['info']['viewerPreferences'] = $this->numObj;
+          }
 
-      $vp =  $o['info']['viewerPreferences'];
-      $this->o_viewerPreferences($vp, 'add', $options);
+          $vp =  $o['info']['viewerPreferences'];
+          $this->o_viewerPreferences($vp, 'add', $options);
 
-      break;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
-        switch ($k) {
-        case  'outlines':
-          $res.= "\n".'/Outlines '.$v.' 0 R';
-          break;
+          foreach($o['info'] as  $k=>$v) {
+            switch ($k) {
+                case  'outlines':
+                  $res.= "\n".'/Outlines '.$v.' 0 R';
+                  break;
           
-        case  'pages':
-          $res.= "\n".'/Pages '.$v.' 0 R';
-          break;
+                case  'pages':
+                  $res.= "\n".'/Pages '.$v.' 0 R';
+                  break;
 
-        case  'viewerPreferences':
-          $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
-          break;
+                case  'viewerPreferences':
+                  $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
+                  break;
 
-        case  'openHere':
-          $res.= "\n".'/OpenAction '.$v.' 0 R';
-          break;
+                case  'openHere':
+                  $res.= "\n".'/OpenAction '.$v.' 0 R';
+                  break;
 
-        case  'javascript':
-          $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
-          break;
-        }
+                case  'javascript':
+                  $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
+                  break;
+            }
       }
 
       $res.= " >>\nendobj";
@@ -497,37 +497,37 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'pages', 'info'=>array());
-      $this->o_catalog($this->catalogId, 'pages', $id);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'pages', 'info'=>array());
+          $this->o_catalog($this->catalogId, 'pages', $id);
+          break;
 
-    case  'page':
-      if  (!is_array($options)) {
-        // then it will just be the id of the new page
-        $o['info']['pages'][] = $options;
-      } else {
-        // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
-        // and pos is either 'before' or 'after', saying where this page will fit.
-        if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
-
-            // then there is a match
-            // make a space
-            switch  ($options['pos']) {
-            case  'before':
-              $k =  $i;
-              break;
+        case  'page':
+          if  (!is_array($options)) {
+            // then it will just be the id of the new page
+            $o['info']['pages'][] = $options;
+          } else {
+            // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
+            // and pos is either 'before' or 'after', saying where this page will fit.
+            if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
+              $i =  array_search($options['rid'], $o['info']['pages']);
+              if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+
+                // then there is a match
+                // make a space
+                switch  ($options['pos']) {
+                    case  'before':
+                      $k =  $i;
+                      break;
 
-            case  'after':
-              $k = $i+1;
-              break;
+                    case  'after':
+                      $k = $i+1;
+                      break;
 
-            default:
-              $k = -1;
-              break;
-            }
+                    default:
+                      $k = -1;
+                      break;
+                }
 
             if  ($k >= 0) {
               for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
@@ -541,82 +541,82 @@ 
       }
       break;
 
-    case  'procset':
-      $o['info']['procset'] = $options;
-      break;
+        case  'procset':
+          $o['info']['procset'] = $options;
+          break;
 
-    case  'mediaBox':
-      $o['info']['mediaBox'] = $options;
-      // which should be an array of 4 numbers
-      break;
+        case  'mediaBox':
+          $o['info']['mediaBox'] = $options;
+          // which should be an array of 4 numbers
+          break;
 
-    case  'font':
-      $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
-      break;
+        case  'font':
+          $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
+          break;
 
-    case  'extGState':
-      $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
-      break;
+        case  'extGState':
+          $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
+          break;
 
-    case  'xObject':
-      $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
-      break;
+        case  'xObject':
+          $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
+          break;
 
-    case  'out':
-      if  (count($o['info']['pages'])) {
-        $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
-        foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
-        }
+        case  'out':
+          if  (count($o['info']['pages'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
+            foreach($o['info']['pages'] as  $k=>$v) {
+              $res.= $v." 0 R\n";
+            }
 
-        $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
+            $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
 
-        if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
-              isset($o['info']['procset']) ||
-              (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+            if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
+                  isset($o['info']['procset']) ||
+                  (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
+              $res.= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
-            $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
-          }
+              if  (isset($o['info']['procset'])) {
+                $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
+              }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
-            $res.= "\n/Font << ";
-            foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
+                $res.= "\n/Font << ";
+                foreach($o['info']['fonts'] as  $finfo) {
+                  $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
-            $res.= "\n/XObject << ";
-            foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
+                $res.= "\n/XObject << ";
+                foreach($o['info']['xObjects'] as  $finfo) {
+                  $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
-            $res.=  "\n/ExtGState << ";
-            foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+              if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
+                $res.=  "\n/ExtGState << ";
+                foreach ($o['info']['extGStates'] as  $gstate) {
+                  $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+                }
+                $res.=  "\n>>";
+              }
+
+              $res.= "\n>>";
+              if  (isset($o['info']['mediaBox'])) {
+                $tmp = $o['info']['mediaBox'];
+                $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+              }
             }
-            $res.=  "\n>>";
-          }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
-            $tmp = $o['info']['mediaBox'];
-            $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+            $res.= "\n >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
           }
-        }
 
-        $res.= "\n >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
-      }
-
-      return  $res;
+          return  $res;
     }
   }
 
@@ -630,28 +630,28 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
-      $this->o_catalog($this->catalogId, 'outlines', $id);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
+          $this->o_catalog($this->catalogId, 'outlines', $id);
+          break;
 
-    case  'outline':
-      $o['info']['outlines'][] = $options;
-      break;
+        case  'outline':
+          $o['info']['outlines'][] = $options;
+          break;
 
-    case  'out':
-      if  (count($o['info']['outlines'])) {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
-        foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
-        }
+        case  'out':
+          if  (count($o['info']['outlines'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
+            foreach($o['info']['outlines'] as  $k=>$v) {
+              $res.= $v." 0 R ";
+            }
 
-        $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
-      }
+            $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -665,33 +665,33 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
-
-      // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
-        // then we'll need an encoding dictionary
-        $this->numObj++;
-        $this->o_fontEncoding($this->numObj, 'new', $options);
-        $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
-        // we can specify encoding here
-        switch ($options['encoding']) {
-        case  'WinAnsiEncoding':
-        case  'MacRomanEncoding':
-        case  'MacExpertEncoding':
-          $this->objects[$id]['info']['encoding'] =  $options['encoding'];
-          break;
-
-        case  'none':
-          break;
+        case  'new':
+          $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
+          $fontNum =  $this->numFonts;
+          $this->objects[$id]['info']['fontNum'] =  $fontNum;
 
-        default:
-          $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-          break;
-        }
+          // deal with the encoding and the differences
+          if  (isset($options['differences'])) {
+            // then we'll need an encoding dictionary
+            $this->numObj++;
+            $this->o_fontEncoding($this->numObj, 'new', $options);
+            $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
+          } else  if  (isset($options['encoding'])) {
+            // we can specify encoding here
+            switch ($options['encoding']) {
+                case  'WinAnsiEncoding':
+                case  'MacRomanEncoding':
+                case  'MacExpertEncoding':
+                  $this->objects[$id]['info']['encoding'] =  $options['encoding'];
+                  break;
+
+                case  'none':
+                  break;
+
+                default:
+                  $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+                  break;
+            }
       } else {
         $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
       }
@@ -744,21 +744,21 @@ 
       $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
       break;
 
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
-          break;
-        case  'FirstChar':
-        case  'LastChar':
-        case  'Widths':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+                case  'FirstChar':
+                case  'LastChar':
+                case  'Widths':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_font '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to descendent font
@@ -767,60 +767,60 @@ 
       }
       break;
 
-    case  'out':
-      if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
-        // For Unicode fonts, we need to incorporate font data into
-        // sub-sections that are linked from the primary font section.
-        // Look at o_fontGIDtoCID and o_fontDescendentCID functions
-        // for more informaiton.
-        //
-        // All of this code is adapted from the excellent changes made to
-        // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
-
-        $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
-        $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-        // The horizontal identity mapping for 2-byte CIDs; may be used
-        // with CIDFonts using any Registry, Ordering, and Supplement values.
-        $res.=  "/Encoding /Identity-H\n";
-        $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
-        $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-      if  (isset($o['info']['encodingDictionary'])) {
-        // then place a reference to the dictionary
-        $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
-        // use the specified encoding
-        $res.=  "/Encoding /".$o['info']['encoding']."\n";
-      }
+        case  'out':
+          if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
+            // For Unicode fonts, we need to incorporate font data into
+            // sub-sections that are linked from the primary font section.
+            // Look at o_fontGIDtoCID and o_fontDescendentCID functions
+            // for more informaiton.
+            //
+            // All of this code is adapted from the excellent changes made to
+            // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
+
+            $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
+            $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+            // The horizontal identity mapping for 2-byte CIDs; may be used
+            // with CIDFonts using any Registry, Ordering, and Supplement values.
+            $res.=  "/Encoding /Identity-H\n";
+            $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
+            $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          } else {
+          $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+          $res.=  "/Name /F".$o['info']['fontNum']."\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+          if  (isset($o['info']['encodingDictionary'])) {
+            // then place a reference to the dictionary
+            $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
+          } else  if  (isset($o['info']['encoding'])) {
+            // use the specified encoding
+            $res.=  "/Encoding /".$o['info']['encoding']."\n";
+          }
 
-      if  (isset($o['info']['FirstChar'])) {
-        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-      }
+          if  (isset($o['info']['FirstChar'])) {
+            $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+          }
 
-      if  (isset($o['info']['LastChar'])) {
-        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-      }
+          if  (isset($o['info']['LastChar'])) {
+            $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+          }
 
-      if  (isset($o['info']['Widths'])) {
-        $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
-      }
+          if  (isset($o['info']['Widths'])) {
+            $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
+          }
 
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      }
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -834,46 +834,46 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
-      foreach ($o['info'] as  $label => $value) {
-        switch  ($label) {
-        case  'Ascent':
-        case  'CapHeight':
-        case  'Descent':
-        case  'Flags':
-        case  'ItalicAngle':
-        case  'StemV':
-        case  'AvgWidth':
-        case  'Leading':
-        case  'MaxWidth':
-        case  'MissingWidth':
-        case  'StemH':
-        case  'XHeight':
-        case  'CharSet':
-          if  (mb_strlen($value, '8bit')) {
-            $res.= '/'.$label.' '.$value."\n";
-          }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
+          foreach ($o['info'] as  $label => $value) {
+            switch  ($label) {
+                case  'Ascent':
+                case  'CapHeight':
+                case  'Descent':
+                case  'Flags':
+                case  'ItalicAngle':
+                case  'StemV':
+                case  'AvgWidth':
+                case  'Leading':
+                case  'MaxWidth':
+                case  'MissingWidth':
+                case  'StemH':
+                case  'XHeight':
+                case  'CharSet':
+                  if  (mb_strlen($value, '8bit')) {
+                    $res.= '/'.$label.' '.$value."\n";
+                  }
 
-          break;
-        case  'FontFile':
-        case  'FontFile2':
-        case  'FontFile3':
-          $res.= '/'.$label.' '.$value." 0 R\n";
-          break;
+                  break;
+                case  'FontFile':
+                case  'FontFile2':
+                case  'FontFile3':
+                  $res.= '/'.$label.' '.$value." 0 R\n";
+                  break;
 
-        case  'FontBBox':
-          $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
-          break;
+                case  'FontBBox':
+                  $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
+                  break;
 
-        case  'FontName':
-          $res.= '/'.$label.' /'.$value."\n";
-          break;
-        }
+                case  'FontName':
+                  $res.= '/'.$label.' /'.$value."\n";
+                  break;
+            }
       }
 
       $res.= ">>\nendobj";
@@ -892,38 +892,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // the options array should contain 'differences' and maybe 'encoding'
-      $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
-      break;
+        case  'new':
+          // the options array should contain 'differences' and maybe 'encoding'
+          $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
-        $o['info']['encoding'] = 'WinAnsiEncoding';
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
+          if  (!isset($o['info']['encoding'])) {
+            $o['info']['encoding'] = 'WinAnsiEncoding';
+          }
 
-      if  ($o['info']['encoding'] !== 'none') {
-        $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
-      }
+          if  ($o['info']['encoding'] !== 'none') {
+            $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
+          }
 
-      $res.= "/Differences \n[";
+          $res.= "/Differences \n[";
 
-      $onum = -100;
+          $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
-        if  ($num != $onum+1) {
-          // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
-        } else {
-          $res.=  " /".$label;
-        }
+          foreach($o['info']['differences'] as  $num=>$label) {
+            if  ($num != $onum+1) {
+              // we cannot make use of consecutive numbering
+              $res.=  "\n".$num." /".$label;
+            } else {
+              $res.=  " /".$label;
+            }
 
-        $onum = $num;
-      }
+            $onum = $num;
+          }
 
-      $res.= "\n]\n>>\nendobj";
-      return  $res;
+          $res.= "\n]\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -937,82 +937,82 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
-
-      // we need a CID system info section
-      $cidSystemInfoId = ++$this->numObj;
-      $this->o_contents($cidSystemInfoId, 'new', 'raw');
-      $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
-      $this->objects[$cidSystemInfoId]['c'] = $res;
-
-      // and a CID to GID map
-      $cidToGidMapId = ++$this->numObj;
-      $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
-      $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
-      break;
-
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
+
+          // we need a CID system info section
+          $cidSystemInfoId = ++$this->numObj;
+          $this->o_contents($cidSystemInfoId, 'new', 'raw');
+          $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
+          $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+          $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+          $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
+          $res.=  ">>";
+          $this->objects[$cidSystemInfoId]['c'] = $res;
+
+          // and a CID to GID map
+          $cidToGidMapId = ++$this->numObj;
+          $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
+          $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
           break;
 
-        case  'FirstChar':
-        case  'LastChar':
-        case  'MissingWidth':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+
+                case  'FirstChar':
+                case  'LastChar':
+                case  'MissingWidth':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to cid to gid map
       $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
       break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
-//      if  (isset($o['info']['FirstChar'])) {
-//        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-//      }
-
-//      if  (isset($o['info']['LastChar'])) {
-//        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-//      }
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        case  'out':
+          $res =  "\n".$id." 0 obj\n";
+          $res.=  "<</Type /Font\n";
+          $res.=  "/Subtype /CIDFontType2\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+          $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+    //      if  (isset($o['info']['FirstChar'])) {
+    //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+    //      }
+
+    //      if  (isset($o['info']['LastChar'])) {
+    //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+    //      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-      if  (isset($o['info']['MissingWidth'])) {
-        $res.=  "/DW ".$o['info']['MissingWidth']."\n";
-      }
+          if  (isset($o['info']['MissingWidth'])) {
+            $res.=  "/DW ".$o['info']['MissingWidth']."\n";
+          }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
-        $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
-        $w = '';
-        foreach ($cid_widths as $cid => $width) {
-          $w .= $cid.' ['.$width.'] ';
-        }
-        $res.=  "/W [".$w."]\n";
-      }
+          if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+            $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
+            $w = '';
+            foreach ($cid_widths as $cid => $width) {
+              $w .= $cid.' ['.$width.'] ';
+            }
+            $res.=  "/W [".$w."]\n";
+          }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+          $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+          $res.=  ">>\n";
+          $res.=  "endobj";
 
-      return  $res;
+          return  $res;
     }
   }
   
@@ -1026,35 +1026,35 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n";
-      $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
-      $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
-                    $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
+        case  'out':
+          $res = "\n".$id." 0 obj\n";
+          $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
+          $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
+                        $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
+          if  (!$compressed && isset($o['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
 
-        if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
-        }
-        if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
-        }
+            if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $compressed = true;
+              $tmp =  gzcompress($tmp,  6);
+            }
+            if ($compressed) {
+              $res.= "\n/Filter /FlateDecode";
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
   
@@ -1068,31 +1068,31 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
-      $this->o_pages($this->currentNode, 'procset', $id);
-      $this->procsetObjectId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
+          $this->o_pages($this->currentNode, 'procset', $id);
+          $this->procsetObjectId = $id;
+          break;
 
-    case  'add':
-      // this is to add new items to the procset list, despite the fact that this is considered
-      // obselete, the items are required for printing to some postscript printers
-      switch  ($options) {
-      case  'ImageB':
-      case  'ImageC':
-      case  'ImageI':
-        $o['info'][$options] = 1;
-        break;
-      }
+        case  'add':
+          // this is to add new items to the procset list, despite the fact that this is considered
+          // obselete, the items are required for printing to some postscript printers
+          switch  ($options) {
+              case  'ImageB':
+              case  'ImageC':
+              case  'ImageI':
+                $o['info'][$options] = 1;
+                break;
+          }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n[";
-      foreach ($o['info'] as  $label=>$val) {
-        $res.= '/'.$label.' ';
-      }
-      $res.= "]\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n[";
+          foreach ($o['info'] as  $label=>$val) {
+            $res.= '/'.$label.' ';
+          }
+          $res.= "]\nendobj";
+          return  $res;
     }
   }
 
@@ -1106,45 +1106,45 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->infoObject = $id;
-      $date = 'D:'.@date('Ymd');
-      $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
-      break;
-    case  'Title':
-    case  'Author':
-    case  'Subject':
-    case  'Keywords':
-    case  'Creator':
-    case  'Producer':
-    case  'CreationDate':
-    case  'ModDate':
-    case  'Trapped':
-      $o['info'][$action] = $options;
-      break;
+        case  'new':
+          $this->infoObject = $id;
+          $date = 'D:'.@date('Ymd');
+          $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
+          break;
+        case  'Title':
+        case  'Author':
+        case  'Subject':
+        case  'Keywords':
+        case  'Creator':
+        case  'Producer':
+        case  'CreationDate':
+        case  'ModDate':
+        case  'Trapped':
+          $o['info'][$action] = $options;
+          break;
 
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      $res = "\n".$id." 0 obj\n<<\n";
-      foreach ($o['info'] as  $k=>$v) {
-        $res.= '/'.$k.' (';
-        // dates must be outputted as-is, without Unicode transformations
-        $raw = ($k === 'CreationDate' || $k === 'ModDate');
-        $c = $v;
+          $res = "\n".$id." 0 obj\n<<\n";
+          foreach ($o['info'] as  $k=>$v) {
+            $res.= '/'.$k.' (';
+            // dates must be outputted as-is, without Unicode transformations
+            $raw = ($k === 'CreationDate' || $k === 'ModDate');
+            $c = $v;
 
-        if  ($this->encrypted) {
-          $c = $this->ARC4($c);
-        }
+            if  ($this->encrypted) {
+              $c = $this->ARC4($c);
+            }
 
-        $res.= ($raw) ? $c : $this->filterText($c);
-        $res.= ")\n";
-      }
+            $res.= ($raw) ? $c : $this->filterText($c);
+            $res.= ")\n";
+          }
 
-      $res.= ">>\nendobj";
-      return  $res;
+          $res.= ">>\nendobj";
+          return  $res;
     }
   }
 
@@ -1158,38 +1158,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      if  (is_array($options)) {
-        $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
-      } else {
-        // then assume a URI action
-        $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
-      }
-      break;
-
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'new':
+          if  (is_array($options)) {
+            $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
+          } else {
+            // then assume a URI action
+            $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
+          }
+          break;
 
-      $res = "\n".$id." 0 obj\n<< /Type /Action";
-      switch ($o['type']) {
-      case  'ilink':
-        // there will be an 'label' setting, this is the name of the destination
-        $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
-        break;
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      case  'URI':
-        $res.= "\n/S /URI\n/URI (";
-        if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
-        } else {
-          $res.= $this->filterText($o['info']);
-        }
+          $res = "\n".$id." 0 obj\n<< /Type /Action";
+          switch ($o['type']) {
+              case  'ilink':
+                // there will be an 'label' setting, this is the name of the destination
+                $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+                break;
+
+              case  'URI':
+                $res.= "\n/S /URI\n/URI (";
+                if  ($this->encrypted) {
+                  $res.= $this->filterText($this->ARC4($o['info']));
+                } else {
+                  $res.= $this->filterText($o['info']);
+                }
 
-        $res.= ")";
-        break;
-      }
+                $res.= ")";
+                break;
+          }
 
       $res.= "\n>>\nendobj";
       return  $res;
@@ -1207,39 +1207,39 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // add the annotation to the current page
-      $pageId =  $this->currentPage;
-      $this->o_page($pageId, 'annot', $id);
-
-      // and add the action object which is going to be required
-      switch ($options['type']) {
-      case  'link':
-        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
-        $this->numObj++;
-        $this->o_action($this->numObj, 'new', $options['url']);
-        $this->objects[$id]['info']['actionId'] = $this->numObj;
-        break;
-
-      case  'ilink':
-        // this is to a named internal link
-        $label =  $options['label'];
-        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
-        $this->numObj++;
-        $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
-        $this->objects[$id]['info']['actionId'] = $this->numObj;
-        break;
-      }
+        case  'new':
+          // add the annotation to the current page
+          $pageId =  $this->currentPage;
+          $this->o_page($pageId, 'annot', $id);
+
+          // and add the action object which is going to be required
+          switch ($options['type']) {
+              case  'link':
+                $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
+                $this->numObj++;
+                $this->o_action($this->numObj, 'new', $options['url']);
+                $this->objects[$id]['info']['actionId'] = $this->numObj;
+                break;
+
+              case  'ilink':
+                // this is to a named internal link
+                $label =  $options['label'];
+                $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
+                $this->numObj++;
+                $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
+                $this->objects[$id]['info']['actionId'] = $this->numObj;
+                break;
+          }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Annot";
-      switch ($o['info']['type']) {
-      case  'link':
-      case  'ilink':
-        $res.=  "\n/Subtype /Link";
-        break;
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Annot";
+          switch ($o['info']['type']) {
+              case  'link':
+              case  'ilink':
+                $res.=  "\n/Subtype /Link";
+                break;
+          }
       $res.= "\n/A ".$o['info']['actionId']." 0 R";
       $res.= "\n/Border [0 0 0]";
       $res.= "\n/H /I";
@@ -1265,77 +1265,77 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->numPages++;
-      $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
-
-      if  (is_array($options)) {
-        // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
-        $options['id'] = $id;
-        $this->o_pages($this->currentNode, 'page', $options);
-      } else {
-        $this->o_pages($this->currentNode, 'page', $id);
-      }
+        case  'new':
+          $this->numPages++;
+          $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
+
+          if  (is_array($options)) {
+            // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
+            $options['id'] = $id;
+            $this->o_pages($this->currentNode, 'page', $options);
+          } else {
+            $this->o_pages($this->currentNode, 'page', $id);
+          }
 
-      $this->currentPage = $id;
-      //make a contents object to go with this page
-      $this->numObj++;
-      $this->o_contents($this->numObj, 'new', $id);
-      $this->currentContents = $this->numObj;
-      $this->objects[$id]['info']['contents'] = array();
-      $this->objects[$id]['info']['contents'][] = $this->numObj;
-
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
-        if  ($target === 'all' || $match === $target) {
-          $this->objects[$id]['info']['contents'][] = $oId;
-        }
-      }
-      break;
+          $this->currentPage = $id;
+          //make a contents object to go with this page
+          $this->numObj++;
+          $this->o_contents($this->numObj, 'new', $id);
+          $this->currentContents = $this->numObj;
+          $this->objects[$id]['info']['contents'] = array();
+          $this->objects[$id]['info']['contents'][] = $this->numObj;
+
+          $match =  ($this->numPages%2 ?  'odd' :  'even');
+          foreach($this->addLooseObjects as  $oId=>$target) {
+            if  ($target === 'all' || $match === $target) {
+              $this->objects[$id]['info']['contents'][] = $oId;
+            }
+          }
+          break;
 
-    case  'content':
-      $o['info']['contents'][] = $options;
-      break;
+        case  'content':
+          $o['info']['contents'][] = $options;
+          break;
 
-    case  'annot':
-      // add an annotation to this page
-      if  (!isset($o['info']['annot'])) {
-        $o['info']['annot'] = array();
-      }
+        case  'annot':
+          // add an annotation to this page
+          if  (!isset($o['info']['annot'])) {
+            $o['info']['annot'] = array();
+          }
 
-      // $options should contain the id of the annotation dictionary
-      $o['info']['annot'][] = $options;
-      break;
+          // $options should contain the id of the annotation dictionary
+          $o['info']['annot'][] = $options;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Page";
+          $res.= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
-        $res.= "\n/Annots [";
-        foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
-        }
-        $res.= " ]";
-      }
+          if  (isset($o['info']['annot'])) {
+            $res.= "\n/Annots [";
+            foreach($o['info']['annot'] as  $aId) {
+              $res.= " ".$aId." 0 R";
+            }
+            $res.= " ]";
+          }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
-        $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
-        $res.= "\n/Contents [\n";
-
-        // reverse the page contents so added objects are below normal content
-        //foreach (array_reverse($o['info']['contents']) as  $cId) {
-        // Back to normal now that I've got transparency working --Benj
-        foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
-        }
-        $res.= "]";
-      }
+          $count =  count($o['info']['contents']);
+          if  ($count == 1) {
+            $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
+          } else  if  ($count>1) {
+            $res.= "\n/Contents [\n";
+
+            // reverse the page contents so added objects are below normal content
+            //foreach (array_reverse($o['info']['contents']) as  $cId) {
+            // Back to normal now that I've got transparency working --Benj
+            foreach ($o['info']['contents'] as  $cId) {
+              $res.= $cId." 0 R\n";
+            }
+            $res.= "]";
+          }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1349,51 +1349,51 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
-        // then this contents is the primary for a page
-        $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
-        // then this page contains some other type of system object
-        $this->objects[$id]['raw'] = 1;
-      }
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
+          if  (mb_strlen($options, '8bit') &&  intval($options)) {
+            // then this contents is the primary for a page
+            $this->objects[$id]['onPage'] = $options;
+          } else  if  ($options === 'raw') {
+            // then this page contains some other type of system object
+            $this->objects[$id]['raw'] = 1;
+          }
+          break;
 
-    case  'add':
-      // add more options to the decleration
-      foreach ($options as  $k=>$v) {
-        $o['info'][$k] = $v;
-      }
+        case  'add':
+          // add more options to the decleration
+          foreach ($options as  $k=>$v) {
+            $o['info'][$k] = $v;
+          }
 
-    case  'out':
-      $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+        case  'out':
+          $tmp = $o['c'];
+          $res =  "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
-        if  (function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
-        }
+          if  (isset($this->objects[$id]['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
+            if  (function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $res.= " /Filter /FlateDecode";
+              $tmp =  gzcompress($tmp,  6);
+            }
 
-        if  ($this->encrypted) {
-          $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
-        }
+            if  ($this->encrypted) {
+              $this->encryptInit($id);
+              $tmp =  $this->ARC4($tmp);
+            }
 
-        foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
-        }
+            foreach($o['info'] as  $k=>$v) {
+              $res.=  "\n/".$k.' '.$v;
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
 
@@ -1403,19 +1403,19 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
-        'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
+            'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
+          ));
+          break;
 
-    case  'out':
-      $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res .= "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
   
@@ -1425,20 +1425,20 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
-        'S' => '/JavaScript',
-        'JS' => '('.$this->filterText($code).')',
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
+            'S' => '/JavaScript',
+            'JS' => '('.$this->filterText($code).')',
+          ));
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1451,28 +1451,28 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      // make the new object
-      $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
-      $this->objects[$id]['info']['Type'] = '/XObject';
-      $this->objects[$id]['info']['Subtype'] = '/Image';
-      $this->objects[$id]['info']['Width'] = $options['iw'];
-      $this->objects[$id]['info']['Height'] = $options['ih'];
-
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
-        if  (!isset($options['channels'])) {
-          $options['channels'] = 3;
-        }
+        case  'new':
+          // make the new object
+          $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
+          $this->objects[$id]['info']['Type'] = '/XObject';
+          $this->objects[$id]['info']['Subtype'] = '/Image';
+          $this->objects[$id]['info']['Width'] = $options['iw'];
+          $this->objects[$id]['info']['Height'] = $options['ih'];
+
+          if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
+            if  (!isset($options['channels'])) {
+              $options['channels'] = 3;
+            }
 
-        switch ($options['channels']) {
-        case  1:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
-          break;
+            switch ($options['channels']) {
+                case  1:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
+                  break;
 
-        default:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
-          break;
-        }
+                default:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
+                  break;
+            }
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
@@ -1490,39 +1490,39 @@ 
           $this->objects[$id]['info']['ColorSpace'] =  $tmp;
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              pre_r($tmp);
-              break;
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  pre_r($tmp);
+                  break;
               
             }
           }
         } else {
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              break;              
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  break;              
             }
           }
           $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
@@ -1539,22 +1539,22 @@ 
       $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
       break;
 
-    case  'out':
-      $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+        case  'out':
+          $tmp = &$o['data'];
+          $res =  "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
 
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-        $tmp =  $this->ARC4($tmp);
-      }
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+            $tmp =  $this->ARC4($tmp);
+          }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+          $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -1575,29 +1575,29 @@ 
     }
 
     switch  ($action) {
-    case  "new":
-      $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
+        case  "new":
+          $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
 
-      // Tell the pages about the new resource
-      $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
-      break;
+          // Tell the pages about the new resource
+          $this->numStates++;
+          $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+          break;
 
-    case  "out":
-      $res =
-        "\n" . $id . " 0 obj\n".
-        "<< /Type /ExtGState\n";
+        case  "out":
+          $res =
+            "\n" . $id . " 0 obj\n".
+            "<< /Type /ExtGState\n";
 
-      foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
-          continue;
-        $res.=  "/$parameter $value\n";
-      }
+          foreach ($o["info"] as  $parameter => $value) {
+            if  ( !in_array($parameter,  $valid_params))
+              continue;
+            $res.=  "/$parameter $value\n";
+          }
 
-      $res.=
-        ">>\n".
-        "endobj";
-      return  $res;
+          $res.=
+            ">>\n".
+            "endobj";
+          return  $res;
     }
   }
 
@@ -1611,63 +1611,63 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      // make the new object
-      $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
-      $this->arc4_objnum = $id;
-
-      // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
-
-      if  ($len>32) {
-        $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
-        $owner =  $options['owner'].substr($pad, 0, 32-$len);
-      } else {
-        $owner =  $options['owner'];
-      }
+        case  'new':
+          // make the new object
+          $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
+          $this->arc4_objnum = $id;
+
+          // figure out the additional paramaters required
+          $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
+          $len =  mb_strlen($options['owner'], '8bit');
+
+          if  ($len>32) {
+            $owner =  substr($options['owner'], 0, 32);
+          } else  if  ($len<32) {
+            $owner =  $options['owner'].substr($pad, 0, 32-$len);
+          } else {
+            $owner =  $options['owner'];
+          }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
-        $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
-        $user =  $options['user'].substr($pad, 0, 32-$len);
-      } else {
-        $user =  $options['user'];
-      }
+          $len =  mb_strlen($options['user'], '8bit');
+          if  ($len>32) {
+            $user =  substr($options['user'], 0, 32);
+          } else  if  ($len<32) {
+            $user =  $options['user'].substr($pad, 0, 32-$len);
+          } else {
+            $user =  $options['user'];
+          }
 
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
-      $this->ARC4_init($okey);
-      $ovalue = $this->ARC4($user);
-      $this->objects[$id]['info']['O'] = $ovalue;
-
-      // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
-
-      $ukey =  substr($tmp, 0, 5);
-      $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
-      $this->encrypted = 1;
-      $uvalue = $this->ARC4($pad);
-      $this->objects[$id]['info']['U'] = $uvalue;
-      $this->encryptionKey = $ukey;
-      // initialize the arc4 array
-      break;
+          $tmp =  $this->md5_16($owner);
+          $okey =  substr($tmp, 0, 5);
+          $this->ARC4_init($okey);
+          $ovalue = $this->ARC4($user);
+          $this->objects[$id]['info']['O'] = $ovalue;
+
+          // now make the u value, phew.
+          $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+
+          $ukey =  substr($tmp, 0, 5);
+          $this->ARC4_init($ukey);
+          $this->encryptionKey =  $ukey;
+          $this->encrypted = 1;
+          $uvalue = $this->ARC4($pad);
+          $this->objects[$id]['info']['U'] = $uvalue;
+          $this->encryptionKey = $ukey;
+          // initialize the arc4 array
+          break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
-      // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res =  "\n".$id." 0 obj\n<<";
+          $res.= "\n/Filter /Standard";
+          $res.= "\n/V 1";
+          $res.= "\n/R 2";
+          $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
+          $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+          // and the p-value needs to be converted to account for the twos-complement approach
+          $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
+          $res.= "\n/P ".($o['info']['p']);
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1999,112 +1999,112 @@ 
           // then there must be some keyword
           $key =  substr($row, 0, $pos);
           switch  ($key) {
-          case  'FontName':
-          case  'FullName':
-          case  'FamilyName':
-          case  'Weight':
-          case  'ItalicAngle':
-          case  'IsFixedPitch':
-          case  'CharacterSet':
-          case  'UnderlinePosition':
-          case  'UnderlineThickness':
-          case  'Version':
-          case  'EncodingScheme':
-          case  'CapHeight':
-          case  'XHeight':
-          case  'Ascender':
-          case  'Descender':
-          case  'StdHW':
-          case  'StdVW':
-          case  'StartCharMetrics':
-          case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
-            $data[$key] = trim(substr($row, $pos));
-            break;
-
-          case  'FontBBox':
-            $data[$key] = explode(' ', trim(substr($row, $pos)));
-            break;
-
-          case  'C': // Found in AFM files
-            //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
-            $bits = explode(';', trim($row));
-            $dtmp = array();
-
-            foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
-                if  (count($bits2) >2) {
-                  $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
-                    $dtmp[$bits2[0]][] = $bits2[$i];
+              case  'FontName':
+              case  'FullName':
+              case  'FamilyName':
+              case  'Weight':
+              case  'ItalicAngle':
+              case  'IsFixedPitch':
+              case  'CharacterSet':
+              case  'UnderlinePosition':
+              case  'UnderlineThickness':
+              case  'Version':
+              case  'EncodingScheme':
+              case  'CapHeight':
+              case  'XHeight':
+              case  'Ascender':
+              case  'Descender':
+              case  'StdHW':
+              case  'StdVW':
+              case  'StartCharMetrics':
+              case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
+                $data[$key] = trim(substr($row, $pos));
+                break;
+
+              case  'FontBBox':
+                $data[$key] = explode(' ', trim(substr($row, $pos)));
+                break;
+
+              case  'C': // Found in AFM files
+                //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
+                $bits = explode(';', trim($row));
+                $dtmp = array();
+
+                foreach($bits as  $bit) {
+                  $bits2 =  explode(' ', trim($bit));
+                  if  (mb_strlen($bits2[0], '8bit')) {
+                    if  (count($bits2) >2) {
+                      $dtmp[$bits2[0]] = array();
+                      for  ($i = 1;$i<count($bits2);$i++) {
+                        $dtmp[$bits2[0]][] = $bits2[$i];
+                      }
+                    } else  if  (count($bits2) == 2) {
+                      $dtmp[$bits2[0]] = $bits2[1];
+                    }
                   }
-                } else  if  (count($bits2) == 2) {
-                  $dtmp[$bits2[0]] = $bits2[1];
                 }
-              }
-            }
 
-            $cc = (int)$dtmp['C'];
-            if  ($cc >= 0) {
-              $data['C'][$dtmp['C']] = $dtmp;
-              $data['C'][$dtmp['N']] = $dtmp;
-            } else {
-              $data['C'][$dtmp['N']] = $dtmp;
-            }
+                $cc = (int)$dtmp['C'];
+                if  ($cc >= 0) {
+                  $data['C'][$dtmp['C']] = $dtmp;
+                  $data['C'][$dtmp['N']] = $dtmp;
+                } else {
+                  $data['C'][$dtmp['N']] = $dtmp;
+                }
 
-            if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-              $data['MissingWidth'] = $width;
-            }
+                if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                  $data['MissingWidth'] = $width;
+                }
             
-            break;
-
-          case  'U': // Found in UFM files
-            if ($data['isUnicode']) {
-              // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-              $bits = explode(';', trim($row));
-              $dtmp = array();
-
-              foreach($bits as  $bit) {
-                $bits2 =  explode(' ', trim($bit));
-                if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
-                    $dtmp[$bits2[0]] = array();
-                    for  ($i = 1;$i<count($bits2);$i++) {
-                      $dtmp[$bits2[0]][] = $bits2[$i];
+                break;
+
+              case  'U': // Found in UFM files
+                if ($data['isUnicode']) {
+                  // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+                  $bits = explode(';', trim($row));
+                  $dtmp = array();
+
+                  foreach($bits as  $bit) {
+                    $bits2 =  explode(' ', trim($bit));
+                    if  (mb_strlen($bits2[0], '8bit')) {
+                      if  (count($bits2) >2) {
+                        $dtmp[$bits2[0]] = array();
+                        for  ($i = 1;$i<count($bits2);$i++) {
+                          $dtmp[$bits2[0]][] = $bits2[$i];
+                        }
+                      } else  if  (count($bits2) == 2) {
+                        $dtmp[$bits2[0]] = $bits2[1];
+                      }
                     }
-                  } else  if  (count($bits2) == 2) {
-                    $dtmp[$bits2[0]] = $bits2[1];
                   }
-                }
-              }
 
-              $cc = (int)$dtmp['U'];
-              $glyph = $dtmp['G'];
-              $width = $dtmp['WX'];
-              if  ($cc >= 0) {
-                // Set values in CID to GID map
-                if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
-                }
+                  $cc = (int)$dtmp['U'];
+                  $glyph = $dtmp['G'];
+                  $width = $dtmp['WX'];
+                  if  ($cc >= 0) {
+                    // Set values in CID to GID map
+                    if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
+                      $cidtogid[$cc*2] = chr($glyph >> 8);
+                      $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                    }
 
-                $data['C'][$dtmp['U']] = $dtmp;
-                $data['C'][$dtmp['N']] = $dtmp;
-              } else {
-                $data['C'][$dtmp['N']] = $dtmp;
-              }
+                    $data['C'][$dtmp['U']] = $dtmp;
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  } else {
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-                $data['MissingWidth'] = $width;
-              }
-            }
-            break;
+                  if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                    $data['MissingWidth'] = $width;
+                  }
+                }
+                break;
 
-          case  'KPX':
-            //KPX Adieresis yacute -40
-            $bits = explode(' ', trim($row));
-            $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
-            break;
+              case  'KPX':
+                //KPX Adieresis yacute -40
+                $bits = explode(' ', trim($row));
+                $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
+                break;
           }
         }
       }
@@ -3108,163 +3108,163 @@ 
     if  ($text[$j] === '<') {
       $j++;
       switch ($text[$j]) {
-      case  '/':
-        $j++;
-        if  (mb_strlen($text) <=  $j) {
-          return  $directive;
-        }
+          case  '/':
+            $j++;
+            if  (mb_strlen($text) <=  $j) {
+              return  $directive;
+            }
 
-        switch ($text[$j]) {
-        case  'b':
-        case  'i':
-          $j++;
-          if  ($text[$j] === '>') {
-            $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
+            switch ($text[$j]) {
+                case  'b':
+                case  'i':
+                  $j++;
+                  if  ($text[$j] === '>') {
+                    $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
 
-            if  ($p !==  false) {
-              // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
-            }
+                    if  ($p !==  false) {
+                      // then there is one to remove
+                      $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+                    }
 
-            $directive =  $j-$i+1;
-          }
-          break;
+                    $directive =  $j-$i+1;
+                  }
+                  break;
+
+                case  'c':
+                  // this this might be a callback function
+                  $j++;
+                  $k =  mb_strpos($text, '>', $j);
+
+                  if  ($k !==  false &&  $text[$j] === ':') {
+                    // then this will be treated as a callback directive
+                    $directive =  $k-$i+1;
+                    $f =  0;
+                    // split the remainder on colons to get the function name and the paramater
+                    $tmp =  mb_substr($text, $j+1, $k-$j-1);
+                    $b1 =  mb_strpos($tmp, ':');
+
+                    if  ($b1 !==  false) {
+                      $func =  mb_substr($tmp, 0, $b1);
+                      $parm =  mb_substr($tmp, $b1+1);
+                    } else {
+                      $func =  $tmp;
+                      $parm =  '';
+                    }
 
-        case  'c':
-          // this this might be a callback function
-          $j++;
-          $k =  mb_strpos($text, '>', $j);
-
-          if  ($k !==  false &&  $text[$j] === ':') {
-            // then this will be treated as a callback directive
-            $directive =  $k-$i+1;
-            $f =  0;
-            // split the remainder on colons to get the function name and the paramater
-            $tmp =  mb_substr($text, $j+1, $k-$j-1);
-            $b1 =  mb_strpos($tmp, ':');
-
-            if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
-            } else {
-              $func =  $tmp;
-              $parm =  '';
-            }
+                    if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                      $directive =  0;
+                    } else {
+                      // only call the function if this is the final call
+                      if  ($final) {
+                        // need to assess the text position, calculate the text width to this point
+                        // can use getTextWidth to find the text width I think
+                        $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+
+                        $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
+                        $x =  $tmp[0];
+                        $y =  $tmp[1];
+                        $ret =  $this->$func($info);
+
+                        if  (is_array($ret)) {
+                          // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                          foreach($ret as  $rk => $rv) {
+                            switch ($rk) {
+                                case  'x':
+                                case  'y':
+                                  $$rk =  $rv;
+                                  break;
+                            }
+                      }
+                    }
 
-            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
-            } else {
-              // only call the function if this is the final call
-              if  ($final) {
-                // need to assess the text position, calculate the text width to this point
-                // can use getTextWidth to find the text width I think
-                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
-
-                $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
-                $x =  $tmp[0];
-                $y =  $tmp[1];
-                $ret =  $this->$func($info);
-
-                if  (is_array($ret)) {
-                  // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
-                    switch ($rk) {
-                    case  'x':
-                    case  'y':
-                      $$rk =  $rv;
-                      break;
+                    // also remove from to the stack
+                    // for simplicity, just take from the end, fix this another day
+                    $this->nCallback--;
+                    if  ($this->nCallback<0) {
+                      $this->nCallBack =  0;
                     }
                   }
                 }
-
-                // also remove from to the stack
-                // for simplicity, just take from the end, fix this another day
-                $this->nCallback--;
-                if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
-                }
               }
-            }
-          }
-          break;
+              break;
         }
         break;
 
-      case  'b':
-      case  'i':
-        $j++;
-        if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
-        }
-        break;
+          case  'b':
+          case  'i':
+            $j++;
+            if  ($text[$j] === '>') {
+              $this->currentTextState.=  $text[$j-1];
+              $directive =  $j-$i+1;
+            }
+            break;
 
-      case  'C':
-        $noClose =  1;
-      case  'c':
-        // this this might be a callback function
-        $j++;
-        $k =  mb_strpos($text, '>', $j);
+          case  'C':
+            $noClose =  1;
+          case  'c':
+            // this this might be a callback function
+            $j++;
+            $k =  mb_strpos($text, '>', $j);
 
-        if  ($k !==  false &&  $text[$j] ===  ':') {
-          // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+            if  ($k !==  false &&  $text[$j] ===  ':') {
+              // then this will be treated as a callback directive
+              $directive =  $k-$i+1;
 
-          $f =  0;
+              $f =  0;
 
-          // split the remainder on colons to get the function name and the paramater
-          //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+              // split the remainder on colons to get the function name and the paramater
+              //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
+              $tmp =  mb_substr($text, $j+1, $k-$j-1);
+              $b1 =  mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
-            $func =  mb_substr($tmp, 0, $b1);
-            $parm =  mb_substr($tmp, $b1+1);
-          } else {
-            $func =  $tmp;
-            $parm =  '';
-          }
-
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-            $directive =  0;
-          } else {
-            // only call the function if this is the final call, ie, the one actually doing printing, not measurement
-            if  ($final) {
-              // need to assess the text position, calculate the text width to this point
-              // can use getTextWidth to find the text width I think
-              // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
-
-              $info =  array(
-                'x' => $tmp[0], 
-                'y' => $tmp[1], 
-                'angle' => $angle, 
-                'status' => 'start', 
-                'p' => $parm, 
-                'f' => $func, 
-                'height' => $this->getFontHeight($size), 
-                'descender' => $this->getFontDescender($size)
-              );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
-
-              if  (!isset($noClose) ||  !$noClose) {
-                // only add to the stack if this is a small 'c', therefore is a start-stop pair
-                $this->nCallback++;
-                $info['nCallback'] =  $this->nCallback;
-                $this->callback[$this->nCallback] =  $info;
+              if  ($b1 !==  false) {
+                $func =  mb_substr($tmp, 0, $b1);
+                $parm =  mb_substr($tmp, $b1+1);
+              } else {
+                $func =  $tmp;
+                $parm =  '';
               }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
-                // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                foreach($ret as  $rk => $rv) {
-                  switch ($rk) {
-                  case  'x':
-                  case  'y':
-                    $$rk =  $rv;
-                    break;
+              if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                $directive =  0;
+              } else {
+                // only call the function if this is the final call, ie, the one actually doing printing, not measurement
+                if  ($final) {
+                  // need to assess the text position, calculate the text width to this point
+                  // can use getTextWidth to find the text width I think
+                  // also add the text height and descender
+                  $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+
+                  $info =  array(
+                    'x' => $tmp[0], 
+                    'y' => $tmp[1], 
+                    'angle' => $angle, 
+                    'status' => 'start', 
+                    'p' => $parm, 
+                    'f' => $func, 
+                    'height' => $this->getFontHeight($size), 
+                    'descender' => $this->getFontDescender($size)
+                  );
+                  $x =  $tmp[0];
+                  $y =  $tmp[1];
+
+                  if  (!isset($noClose) ||  !$noClose) {
+                    // only add to the stack if this is a small 'c', therefore is a start-stop pair
+                    $this->nCallback++;
+                    $info['nCallback'] =  $this->nCallback;
+                    $this->callback[$this->nCallback] =  $info;
                   }
+
+                  $ret =  $this->$func($info);
+                  if  (is_array($ret)) {
+                    // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                    foreach($ret as  $rk => $rv) {
+                      switch ($rk) {
+                          case  'x':
+                          case  'y':
+                            $$rk =  $rv;
+                            break;
+                      }
                 }
               }
             }
@@ -3471,29 +3471,29 @@ 
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
-    case  'left':
-      return;
+        case  'left':
+          return;
 
-    case  'right':
-      $x+=  $width-$actual;
-      break;
+        case  'right':
+          $x+=  $width-$actual;
+          break;
 
-    case  'center':
-    case  'centre':
-      $x+=  ($width-$actual) /2;
-      break;
+        case  'center':
+        case  'centre':
+          $x+=  ($width-$actual) /2;
+          break;
 
-    case  'full':
-      // count the number of words
-      $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+        case  'full':
+          // count the number of words
+          $words =  explode(' ', $text);
+          $nspaces =  count($words) -1;
 
-      if  ($nspaces>0) {
-        $adjust =  ($width-$actual) /$nspaces;
-      } else {
-        $adjust =  0;
-      }
-      break;
+          if  ($nspaces>0) {
+            $adjust =  ($width-$actual) /$nspaces;
+          } else {
+            $adjust =  0;
+          }
+          break;
     }
   }
 
@@ -3766,48 +3766,48 @@ 
     if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
       // then it is a valid object, and it is not being added to itself
       switch ($options) {
-      case  'all':
-        // then this object is to be added to this page (done in the next block) and
-        // all future new pages.
-        $this->addLooseObjects[$id] =  'all';
-
-      case  'add':
-        if  (isset($this->objects[$this->currentContents]['onPage'])) {
-          // then the destination contents is the primary for the page
-          // (though this object is actually added to that page)
-          $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
-        }
-        break;
+          case  'all':
+            // then this object is to be added to this page (done in the next block) and
+            // all future new pages.
+            $this->addLooseObjects[$id] =  'all';
+
+          case  'add':
+            if  (isset($this->objects[$this->currentContents]['onPage'])) {
+              // then the destination contents is the primary for the page
+              // (though this object is actually added to that page)
+              $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
+            }
+            break;
 
-      case  'even':
-        $this->addLooseObjects[$id] =  'even';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
-          $this->addObject($id);
-          // hacky huh :)
-        }
-        break;
+          case  'even':
+            $this->addLooseObjects[$id] =  'even';
+            $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
+            if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
+              $this->addObject($id);
+              // hacky huh :)
+            }
+            break;
 
-      case  'odd':
-        $this->addLooseObjects[$id] =  'odd';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
-          $this->addObject($id);
-          // hacky huh :)
-        }
-        break;
+          case  'odd':
+            $this->addLooseObjects[$id] =  'odd';
+            $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
+            if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
+              $this->addObject($id);
+              // hacky huh :)
+            }
+            break;
 
-      case  'next':
-        $this->addLooseObjects[$id] =  'all';
-        break;
+          case  'next':
+            $this->addLooseObjects[$id] =  'all';
+            break;
 
-      case  'nexteven':
-        $this->addLooseObjects[$id] =  'even';
-        break;
+          case  'nexteven':
+            $this->addLooseObjects[$id] =  'even';
+            break;
 
-      case  'nextodd':
-        $this->addLooseObjects[$id] =  'odd';
-        break;
+          case  'nextodd':
+            $this->addLooseObjects[$id] =  'odd';
+            break;
       }
     }
   }
@@ -4025,105 +4025,105 @@ 
         $chunkType =  mb_substr($data, $p+4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
         switch ($chunkType) {
-        case  'IHDR':
-          // this is where all the file information comes from
-          $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
-
-          //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
-            $error =  1;
-
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
-
-            $errormsg =  'unsupported compression method';
-          }
+            case  'IHDR':
+              // this is where all the file information comes from
+              $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
+              $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
+              $info['bitDepth'] =  ord($data[$p+16]);
+              $info['colorType'] =  ord($data[$p+17]);
+              $info['compressionMethod'] =  ord($data[$p+18]);
+              $info['filterMethod'] =  ord($data[$p+19]);
+              $info['interlaceMethod'] =  ord($data[$p+20]);
+
+              //print_r($info);
+              $haveHeader =  1;
+              if  ($info['compressionMethod'] !=  0) {
+                $error =  1;
+
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
+
+                $errormsg =  'unsupported compression method';
+              }
 
-          if  ($info['filterMethod'] !=  0) {
-            $error =  1;
+              if  ($info['filterMethod'] !=  0) {
+                $error =  1;
 
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
-            $errormsg =  'unsupported filter method';
-          }
-          break;
+                $errormsg =  'unsupported filter method';
+              }
+              break;
 
-        case  'PLTE':
-          $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'PLTE':
+              $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'IDAT':
-          $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'IDAT':
+              $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'tRNS':
-          //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
-          //print "tRNS found, color type = ".$info['colorType']."\n";
-          $transparency =  array();
+            case  'tRNS':
+              //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
+              //print "tRNS found, color type = ".$info['colorType']."\n";
+              $transparency =  array();
 
-          if  ($info['colorType'] ==  3) {
-            // indexed color, rbg
-            /* corresponding to entries in the plte chunk
+              if  ($info['colorType'] ==  3) {
+                // indexed color, rbg
+                /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
              Alpha for palette index 1: 1 byte
              ...etc...
             */
-            // there will be one entry for each palette entry. up until the last non-opaque entry.
-            // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
-            $transparency['type'] =  'indexed';
-            $numPalette =  mb_strlen($pdata, '8bit')/3;
-            $trans =  0;
-
-            for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
-                $trans =  $i;
-              }
-            }
+                // there will be one entry for each palette entry. up until the last non-opaque entry.
+                // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
+                $transparency['type'] =  'indexed';
+                $numPalette =  mb_strlen($pdata, '8bit')/3;
+                $trans =  0;
+
+                for  ($i =  $chunkLen;$i >=  0;$i--) {
+                  if  (ord($data[$p+8+$i]) ==  0) {
+                    $trans =  $i;
+                  }
+                }
 
-            $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
-            // grayscale
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  $trans;
+              } elseif ($info['colorType'] ==  0) {
+                // grayscale
+                /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
-            $transparency['type'] =  'indexed';
+                //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
+                $transparency['type'] =  'indexed';
 
-            $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
-            // truecolor
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  ord($data[$p+8+1]);
+              } elseif ($info['colorType'] ==  2) {
+                // truecolor
+                /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
              Green: 2 bytes, range 0 .. (2^bitdepth)-1
              Blue: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
-            // r from truecolor
-            $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
-            // g from truecolor
-            $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
-            // b from truecolor
-
-            $transparency['type'] = 'color-key';
+                $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
+                // r from truecolor
+                $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
+                // g from truecolor
+                $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
+                // b from truecolor
+
+                $transparency['type'] = 'color-key';
             
-          } else {
-            //unsupported transparency type
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
-          }
-          // KS End new code
-          break;
+              } else {
+                //unsupported transparency type
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
+              }
+              // KS End new code
+              break;
 
-        default:
-          break;
+            default:
+              break;
         }
 
         $p+=  $chunkLen+12;
@@ -4168,20 +4168,20 @@ 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {
         switch  ($info['colorType']) {
-        case  3:
-          $color =  'DeviceRGB';
-          $ncolor =  1;
-          break;
+            case  3:
+              $color =  'DeviceRGB';
+              $ncolor =  1;
+              break;
 
-        case  2:
-          $color =  'DeviceRGB';
-          $ncolor =  3;
-          break;
+            case  2:
+              $color =  'DeviceRGB';
+              $ncolor =  3;
+              break;
 
-        case  0:
-          $color =  'DeviceGray';
-          $ncolor =  1;
-          break;
+            case  0:
+              $color =  'DeviceGray';
+              $ncolor =  1;
+              break;
         }
       }
     }
@@ -4469,48 +4469,48 @@ 
    */
   function  transaction($action) {
     switch  ($action) {
-    case  'start':
-      // store all the data away into the checkpoint variable
-      $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
-      unset($data);
-      break;
+        case  'start':
+          // store all the data away into the checkpoint variable
+          $data =  get_object_vars($this);
+          $this->checkpoint =  $data;
+          unset($data);
+          break;
 
-    case  'commit':
-      if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
-        $tmp =  $this->checkpoint['checkpoint'];
-        $this->checkpoint =  $tmp;
-        unset($tmp);
-      } else {
-        $this->checkpoint =  '';
-      }
-      break;
+        case  'commit':
+          if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
+            $tmp =  $this->checkpoint['checkpoint'];
+            $this->checkpoint =  $tmp;
+            unset($tmp);
+          } else {
+            $this->checkpoint =  '';
+          }
+          break;
 
-    case  'rewind':
-      // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        case  'rewind':
+          // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
 
-        foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
-            $this->$k =  $v;
+            foreach ($tmp as  $k => $v) {
+              if  ($k !==  'checkpoint') {
+                $this->$k =  $v;
+              }
+            }
+            unset($tmp);
           }
-        }
-        unset($tmp);
-      }
-      break;
+          break;
 
-    case  'abort':
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
-        foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
-        }
-        unset($tmp);
-      }
-      break;
+        case  'abort':
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
+            foreach ($tmp as  $k => $v) {
+              $this->$k =  $v;
+            }
+            unset($tmp);
+          }
+          break;
     }
   }
 }

Spacing +1069 added lines, -1069 removed lines

@@ -57,7 +57,7 @@ 
   /**
    * this array contains all of the pdf objects, ready for final assembly
    */
-  public  $objects =  array();
+  public  $objects = array();
 
   /**
    * the objectId (number within the objects array) of the document catalog
@@ -114,7 +114,7 @@ 
   /**
    * Number of graphic state resources used
    */
-  private  $numStates =  0;
+  private  $numStates = 0;
 
 
   /**
@@ -146,12 +146,12 @@ 
    * an array which is used to save the state of the document, mainly the colours and styles
    * it is used to temporarily change to another state, the change back to what it was before
    */
-  public  $stateStack =  array();
+  public  $stateStack = array();
 
   /**
    * number of elements within the state stack
    */
-  public  $nStateStack =  0;
+  public  $nStateStack = 0;
 
   /**
    * number of page objects within the document
@@ -217,7 +217,7 @@ 
    * this used so that the code knows which font is the bold version of another font, etc.
    * the value of this array is initialised in the constuctor function.
    */
-  public  $fontFamilies =  array();
+  public  $fontFamilies = array();
  
   /**
    * folder for php serialized formats of font metrics files.
@@ -245,7 +245,7 @@ 
   /**
    * track if the current font is bolded or italicised
    */
-  public  $currentTextState =  '';
+  public  $currentTextState = '';
 
   /**
    * messages are stored here during processing, these can be selected afterwards to give some useful debug information
@@ -280,25 +280,25 @@ 
   /**
    * array which forms a stack to keep track of nested callback functions
    */
-  public  $callback =  array();
+  public  $callback = array();
 
   /**
    * the number of callback functions in the callback array
    */
-  public  $nCallback =  0;
+  public  $nCallback = 0;
 
   /**
    * store label->id pairs for named destinations, these will be used to replace internal links
    * done this way so that destinations can be defined after the location that links to them
    */
-  public  $destinations =  array();
+  public  $destinations = array();
 
   /**
    * store the stack for the transaction commands, each item in here is a record of the values of all the
    * publiciables within the class, so that the user can rollback at will (from each 'start' command)
    * note that this includes the objects array, so these can be large.
    */
-  public  $checkpoint =  '';
+  public  $checkpoint = '';
 
   /* Table of Image origin filenames and image labels which were already added with o_image().
    * Allows to merge identical images
@@ -318,7 +318,7 @@ 
    * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
    * @var boolean whether text will be treated as Unicode or not.
    */
-  function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
+  function  Cpdf($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
     $this->isUnicode = $isUnicode;
     $this->fontcache = $fontcache;
     $this->tmp = $tmp;
@@ -349,33 +349,33 @@ 
    *destination object, used to specify the location for the user to jump to, presently on opening
    */
   protected function  o_destination($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
+      $tmp = '';
+      switch ($options['type']) {
       case  'XYZ':
       case  'FitR':
-        $tmp =   ' '.$options['p3'].$tmp;
+        $tmp = ' '.$options['p3'].$tmp;
       case  'FitH':
       case  'FitV':
       case  'FitBH':
       case  'FitBV':
-        $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
+        $tmp = ' '.$options['p1'].' '.$options['p2'].$tmp;
       case  'Fit':
       case  'FitB':
-        $tmp =   $options['type'].$tmp;
+        $tmp = $options['type'].$tmp;
         $this->objects[$id]['info']['string'] = $tmp;
         $this->objects[$id]['info']['page'] = $options['page'];
       }
       break;
 
     case  'out':
-      $tmp =  $o['info'];
+      $tmp = $o['info'];
       $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
       return  $res;
     }
@@ -386,18 +386,18 @@ 
    * set the viewer preferences
    */
   protected function  o_viewerPreferences($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
       break;
 
     case  'add':
-      foreach($options as  $k=>$v) {
-        switch  ($k) {
+      foreach ($options as  $k=>$v) {
+        switch ($k) {
         case  'HideToolbar':
         case  'HideMenubar':
         case  'HideWindowUI':
@@ -413,10 +413,10 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\n";
+      $res .= "\n>>\n";
       return  $res;
     }
   }
@@ -426,11 +426,11 @@ 
    * define the document catalog, the overall controller for the document
    */
   protected function  o_catalog($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
       $this->catalogId = $id;
@@ -444,13 +444,13 @@ 
       break;
 
     case  'viewerPreferences':
-      if  (!isset($o['info']['viewerPreferences'])) {
+      if (!isset($o['info']['viewerPreferences'])) {
         $this->numObj++;
         $this->o_viewerPreferences($this->numObj, 'new');
         $o['info']['viewerPreferences'] = $this->numObj;
       }
 
-      $vp =  $o['info']['viewerPreferences'];
+      $vp = $o['info']['viewerPreferences'];
       $this->o_viewerPreferences($vp, 'add', $options);
 
       break;
@@ -458,31 +458,31 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
+      foreach ($o['info'] as  $k=>$v) {
         switch ($k) {
         case  'outlines':
-          $res.= "\n".'/Outlines '.$v.' 0 R';
+          $res .= "\n".'/Outlines '.$v.' 0 R';
           break;
           
         case  'pages':
-          $res.= "\n".'/Pages '.$v.' 0 R';
+          $res .= "\n".'/Pages '.$v.' 0 R';
           break;
 
         case  'viewerPreferences':
-          $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
+          $res .= "\n".'/ViewerPreferences '.$v.' 0 R';
           break;
 
         case  'openHere':
-          $res.= "\n".'/OpenAction '.$v.' 0 R';
+          $res .= "\n".'/OpenAction '.$v.' 0 R';
           break;
 
         case  'javascript':
-          $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
+          $res .= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
           break;
         }
       }
 
-      $res.= " >>\nendobj";
+      $res .= " >>\nendobj";
       return  $res;
     }
   }
@@ -492,36 +492,36 @@ 
    * object which is a parent to the pages in the document
    */
   protected function  o_pages($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'pages', 'info'=>array());
       $this->o_catalog($this->catalogId, 'pages', $id);
       break;
 
     case  'page':
-      if  (!is_array($options)) {
+      if (!is_array($options)) {
         // then it will just be the id of the new page
         $o['info']['pages'][] = $options;
       } else {
         // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
         // and pos is either 'before' or 'after', saying where this page will fit.
-        if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+        if (isset($options['id']) && isset($options['rid']) && isset($options['pos'])) {
+          $i = array_search($options['rid'], $o['info']['pages']);
+          if (isset($o['info']['pages'][$i]) && $o['info']['pages'][$i] == $options['rid']) {
 
             // then there is a match
             // make a space
-            switch  ($options['pos']) {
+            switch ($options['pos']) {
             case  'before':
-              $k =  $i;
+              $k = $i;
               break;
 
             case  'after':
-              $k = $i+1;
+              $k = $i + 1;
               break;
 
             default:
@@ -529,9 +529,9 @@ 
               break;
             }
 
-            if  ($k >= 0) {
-              for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
-                $o['info']['pages'][$j+1] = $o['info']['pages'][$j];
+            if ($k >= 0) {
+              for ($j = count($o['info']['pages']) - 1; $j >= $k; $j--) {
+                $o['info']['pages'][$j + 1] = $o['info']['pages'][$j];
               }
 
               $o['info']['pages'][$k] = $options['id'];
@@ -555,7 +555,7 @@ 
       break;
 
     case  'extGState':
-      $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
+      $o['info']['extGStates'][] = array('objNum' => $options['objNum'], 'stateNum' => $options['stateNum']);
       break;
 
     case  'xObject':
@@ -563,55 +563,55 @@ 
       break;
 
     case  'out':
-      if  (count($o['info']['pages'])) {
+      if (count($o['info']['pages'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
-        foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
+        foreach ($o['info']['pages'] as  $k=>$v) {
+          $res .= $v." 0 R\n";
         }
 
-        $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
+        $res .= "]\n/Count ".count($this->objects[$id]['info']['pages']);
 
-        if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
+        if ((isset($o['info']['fonts']) && count($o['info']['fonts'])) ||
               isset($o['info']['procset']) ||
-              (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+              (isset($o['info']['extGStates']) && count($o['info']['extGStates']))) {
+          $res .= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
-            $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
+          if (isset($o['info']['procset'])) {
+            $res .= "\n/ProcSet ".$o['info']['procset']." 0 R";
           }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
-            $res.= "\n/Font << ";
-            foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+          if (isset($o['info']['fonts']) && count($o['info']['fonts'])) {
+            $res .= "\n/Font << ";
+            foreach ($o['info']['fonts'] as  $finfo) {
+              $res .= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
             }
-            $res.= "\n>>";
+            $res .= "\n>>";
           }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
-            $res.= "\n/XObject << ";
-            foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+          if (isset($o['info']['xObjects']) && count($o['info']['xObjects'])) {
+            $res .= "\n/XObject << ";
+            foreach ($o['info']['xObjects'] as  $finfo) {
+              $res .= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
             }
-            $res.= "\n>>";
+            $res .= "\n>>";
           }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
-            $res.=  "\n/ExtGState << ";
+          if (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) {
+            $res .= "\n/ExtGState << ";
             foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+              $res .= "\n/GS".$gstate['stateNum']." ".$gstate['objNum']." 0 R";
             }
-            $res.=  "\n>>";
+            $res .= "\n>>";
           }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
+          $res .= "\n>>";
+          if (isset($o['info']['mediaBox'])) {
             $tmp = $o['info']['mediaBox'];
-            $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+            $res .= "\n/MediaBox [".sprintf('%.3F', $tmp[0]).' '.sprintf('%.3F', $tmp[1]).' '.sprintf('%.3F', $tmp[2]).' '.sprintf('%.3F', $tmp[3]).']';
           }
         }
 
-        $res.= "\n >>\nendobj";
+        $res .= "\n >>\nendobj";
       } else {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
       }
@@ -625,11 +625,11 @@ 
    * define the outlines in the doc, empty for now
    */
   protected function  o_outlines($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
       $this->o_catalog($this->catalogId, 'outlines', $id);
@@ -640,13 +640,13 @@ 
       break;
 
     case  'out':
-      if  (count($o['info']['outlines'])) {
+      if (count($o['info']['outlines'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
-        foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
+        foreach ($o['info']['outlines'] as  $k=>$v) {
+          $res .= $v." 0 R ";
         }
 
-        $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
+        $res .= "] /Count ".count($o['info']['outlines'])." >>\nendobj";
       } else {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
       }
@@ -660,40 +660,40 @@ 
    * an object to hold the font description
    */
   protected function  o_font($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
+      $this->objects[$id] = array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
+      $fontNum = $this->numFonts;
+      $this->objects[$id]['info']['fontNum'] = $fontNum;
 
       // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
+      if (isset($options['differences'])) {
         // then we'll need an encoding dictionary
         $this->numObj++;
         $this->o_fontEncoding($this->numObj, 'new', $options);
-        $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
+        $this->objects[$id]['info']['encodingDictionary'] = $this->numObj;
+      } else  if (isset($options['encoding'])) {
         // we can specify encoding here
         switch ($options['encoding']) {
         case  'WinAnsiEncoding':
         case  'MacRomanEncoding':
         case  'MacExpertEncoding':
-          $this->objects[$id]['info']['encoding'] =  $options['encoding'];
+          $this->objects[$id]['info']['encoding'] = $options['encoding'];
           break;
 
         case  'none':
           break;
 
         default:
-          $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+          $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
           break;
         }
       } else {
-        $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+        $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
       }
 
       if ($this->fonts[$options['fontFileName']]['isUnicode']) {
@@ -709,29 +709,29 @@ 
         $this->o_contents($toUnicodeId, 'new', 'raw');
         $this->objects[$id]['info']['toUnicode'] = $toUnicodeId;
         
-        $stream =  "/CIDInit /ProcSet findresource begin\n";
-        $stream.=  "12 dict begin\n";
-        $stream.=  "begincmap\n";
-        $stream.=  "/CIDSystemInfo\n";
-        $stream.=  "<</Registry (Adobe)\n";
-        $stream.=  "/Ordering (UCS)\n";
-        $stream.=  "/Supplement 0\n";
-        $stream.=  ">> def\n";
-        $stream.=  "/CMapName /Adobe-Identity-UCS def\n";
-        $stream.=  "/CMapType 2 def\n";
-        $stream.=  "1 begincodespacerange\n";
-        $stream.=  "<0000> <FFFF>\n";
-        $stream.=  "endcodespacerange\n";
-        $stream.=  "1 beginbfrange\n";
-        $stream.=  "<0000> <FFFF> <0000>\n";
-        $stream.=  "endbfrange\n";
-        $stream.=  "endcmap\n";
-        $stream.=  "CMapName currentdict /CMap defineresource pop\n";
-        $stream.=  "end\n";
-        $stream.=  "end\n";
-
-        $res =   "<</Length " . mb_strlen($stream, '8bit') . " >>\n";
-        $res .=  "stream\n" . $stream . "endstream";
+        $stream = "/CIDInit /ProcSet findresource begin\n";
+        $stream .= "12 dict begin\n";
+        $stream .= "begincmap\n";
+        $stream .= "/CIDSystemInfo\n";
+        $stream .= "<</Registry (Adobe)\n";
+        $stream .= "/Ordering (UCS)\n";
+        $stream .= "/Supplement 0\n";
+        $stream .= ">> def\n";
+        $stream .= "/CMapName /Adobe-Identity-UCS def\n";
+        $stream .= "/CMapType 2 def\n";
+        $stream .= "1 begincodespacerange\n";
+        $stream .= "<0000> <FFFF>\n";
+        $stream .= "endcodespacerange\n";
+        $stream .= "1 beginbfrange\n";
+        $stream .= "<0000> <FFFF> <0000>\n";
+        $stream .= "endbfrange\n";
+        $stream .= "endcmap\n";
+        $stream .= "CMapName currentdict /CMap defineresource pop\n";
+        $stream .= "end\n";
+        $stream .= "end\n";
+
+        $res = "<</Length ".mb_strlen($stream, '8bit')." >>\n";
+        $res .= "stream\n".$stream."endstream";
 
         $this->objects[$toUnicodeId]['c'] = $res;
 
@@ -746,9 +746,9 @@ 
 
     case  'add':
       foreach ($options as  $k => $v) {
-        switch  ($k) {
+        switch ($k) {
         case  'BaseFont':
-          $o['info']['name'] =  $v;
+          $o['info']['name'] = $v;
           break;
         case  'FirstChar':
         case  'LastChar':
@@ -756,7 +756,7 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
+          $o['info'][$k] = $v;
           break;
         }
       }
@@ -777,47 +777,47 @@ 
         // All of this code is adapted from the excellent changes made to
         // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
 
-        $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
-        $res.=  "/BaseFont /".$o['info']['name']."\n";
+        $res = "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
+        $res .= "/BaseFont /".$o['info']['name']."\n";
 
         // The horizontal identity mapping for 2-byte CIDs; may be used
         // with CIDFonts using any Registry, Ordering, and Supplement values.
-        $res.=  "/Encoding /Identity-H\n";
-        $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
-        $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
-        $res.=  ">>\n";
-        $res.=  "endobj";
+        $res .= "/Encoding /Identity-H\n";
+        $res .= "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
+        $res .= "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
+        $res .= ">>\n";
+        $res .= "endobj";
       } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
+      $res = "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+      $res .= "/Name /F".$o['info']['fontNum']."\n";
+      $res .= "/BaseFont /".$o['info']['name']."\n";
 
-      if  (isset($o['info']['encodingDictionary'])) {
+      if (isset($o['info']['encodingDictionary'])) {
         // then place a reference to the dictionary
-        $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
+        $res .= "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
+      } else  if (isset($o['info']['encoding'])) {
         // use the specified encoding
-        $res.=  "/Encoding /".$o['info']['encoding']."\n";
+        $res .= "/Encoding /".$o['info']['encoding']."\n";
       }
 
-      if  (isset($o['info']['FirstChar'])) {
-        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+      if (isset($o['info']['FirstChar'])) {
+        $res .= "/FirstChar ".$o['info']['FirstChar']."\n";
       }
 
-      if  (isset($o['info']['LastChar'])) {
-        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+      if (isset($o['info']['LastChar'])) {
+        $res .= "/LastChar ".$o['info']['LastChar']."\n";
       }
 
-      if  (isset($o['info']['Widths'])) {
-        $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
+      if (isset($o['info']['Widths'])) {
+        $res .= "/Widths ".$o['info']['Widths']." 0 R\n";
       }
 
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+      if (isset($o['info']['FontDescriptor'])) {
+        $res .= "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
       }
 
-        $res.=  ">>\n";
-        $res.=  "endobj";
+        $res .= ">>\n";
+        $res .= "endobj";
       }
 
       return  $res;
@@ -829,11 +829,11 @@ 
    * a font descriptor, needed for including additional fonts
    */
   protected function  o_fontDescriptor($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
       break;
@@ -841,7 +841,7 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
       foreach ($o['info'] as  $label => $value) {
-        switch  ($label) {
+        switch ($label) {
         case  'Ascent':
         case  'CapHeight':
         case  'Descent':
@@ -855,28 +855,28 @@ 
         case  'StemH':
         case  'XHeight':
         case  'CharSet':
-          if  (mb_strlen($value, '8bit')) {
-            $res.= '/'.$label.' '.$value."\n";
+          if (mb_strlen($value, '8bit')) {
+            $res .= '/'.$label.' '.$value."\n";
           }
 
           break;
         case  'FontFile':
         case  'FontFile2':
         case  'FontFile3':
-          $res.= '/'.$label.' '.$value." 0 R\n";
+          $res .= '/'.$label.' '.$value." 0 R\n";
           break;
 
         case  'FontBBox':
-          $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
+          $res .= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
           break;
 
         case  'FontName':
-          $res.= '/'.$label.' /'.$value."\n";
+          $res .= '/'.$label.' /'.$value."\n";
           break;
         }
       }
 
-      $res.= ">>\nendobj";
+      $res .= ">>\nendobj";
 
       return  $res;
     }
@@ -887,11 +887,11 @@ 
    * the font encoding
    */
   protected function  o_fontEncoding($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       // the options array should contain 'differences' and maybe 'encoding'
       $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
@@ -899,30 +899,30 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
+      if (!isset($o['info']['encoding'])) {
         $o['info']['encoding'] = 'WinAnsiEncoding';
       }
 
-      if  ($o['info']['encoding'] !== 'none') {
-        $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
+      if ($o['info']['encoding'] !== 'none') {
+        $res .= "/BaseEncoding /".$o['info']['encoding']."\n";
       }
 
-      $res.= "/Differences \n[";
+      $res .= "/Differences \n[";
 
       $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
-        if  ($num != $onum+1) {
+      foreach ($o['info']['differences'] as  $num=>$label) {
+        if ($num != $onum + 1) {
           // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
+          $res .= "\n".$num." /".$label;
         } else {
-          $res.=  " /".$label;
+          $res .= " /".$label;
         }
 
         $onum = $num;
       }
 
-      $res.= "\n]\n>>\nendobj";
+      $res .= "\n]\n>>\nendobj";
       return  $res;
     }
   }
@@ -932,22 +932,22 @@ 
    * a descendent cid font,  needed for unicode fonts
    */
   protected function  o_fontDescendentCID($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
+      $this->objects[$id] = array('t'=>'fontDescendentCID', 'info'=>$options);
 
       // we need a CID system info section
       $cidSystemInfoId = ++$this->numObj;
       $this->o_contents($cidSystemInfoId, 'new', 'raw');
       $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
+      $res = "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+      $res .= "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+      $res .= "/Supplement 0\n"; // The supplement number of the character collection.
+      $res .= ">>";
       $this->objects[$cidSystemInfoId]['c'] = $res;
 
       // and a CID to GID map
@@ -958,9 +958,9 @@ 
 
     case  'add':
       foreach ($options as  $k => $v) {
-        switch  ($k) {
+        switch ($k) {
         case  'BaseFont':
-          $o['info']['name'] =  $v;
+          $o['info']['name'] = $v;
           break;
 
         case  'FirstChar':
@@ -969,7 +969,7 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
+          $o['info'][$k] = $v;
           break;
         }
       }
@@ -979,11 +979,11 @@ 
       break;
 
     case  'out':
-      $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+      $res = "\n".$id." 0 obj\n";
+      $res .= "<</Type /Font\n";
+      $res .= "/Subtype /CIDFontType2\n";
+      $res .= "/BaseFont /".$o['info']['name']."\n";
+      $res .= "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
 //      if  (isset($o['info']['FirstChar'])) {
 //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
 //      }
@@ -991,26 +991,26 @@ 
 //      if  (isset($o['info']['LastChar'])) {
 //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
 //      }
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+      if (isset($o['info']['FontDescriptor'])) {
+        $res .= "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
       }
 
-      if  (isset($o['info']['MissingWidth'])) {
-        $res.=  "/DW ".$o['info']['MissingWidth']."\n";
+      if (isset($o['info']['MissingWidth'])) {
+        $res .= "/DW ".$o['info']['MissingWidth']."\n";
       }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+      if (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
         $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
         $w = '';
         foreach ($cid_widths as $cid => $width) {
           $w .= $cid.' ['.$width.'] ';
         }
-        $res.=  "/W [".$w."]\n";
+        $res .= "/W [".$w."]\n";
       }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+      $res .= "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+      $res .= ">>\n";
+      $res .= "endobj";
 
       return  $res;
     }
@@ -1021,13 +1021,13 @@ 
    * a font glyph to character map,  needed for unicode fonts
    */
   protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
+      $this->objects[$id] = array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
       break;
 
     case  'out':
@@ -1036,24 +1036,24 @@ 
       $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
                     $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
-        $res.= $tmp;
+      if (!$compressed && isset($o['raw'])) {
+        $res .= $tmp;
       } else {
-        $res.=  "<<";
+        $res .= "<<";
 
-        if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
+        if (!$compressed && function_exists('gzcompress') && $this->options['compression']) {
           // then implement ZLIB based compression on this content stream
           $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
+          $tmp = gzcompress($tmp, 6);
         }
         if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
+          $res .= "\n/Filter /FlateDecode";
         }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
+        $res .= "\n/Length ".mb_strlen($tmp, '8bit').">>\nstream\n".$tmp."\nendstream";
       }
 
-      $res.= "\nendobj";
+      $res .= "\nendobj";
       return  $res;
     }
   }
@@ -1063,11 +1063,11 @@ 
    * the document procset, solves some problems with printing to old PS printers
    */
   protected function  o_procset($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
       $this->o_pages($this->currentNode, 'procset', $id);
@@ -1077,7 +1077,7 @@ 
     case  'add':
       // this is to add new items to the procset list, despite the fact that this is considered
       // obselete, the items are required for printing to some postscript printers
-      switch  ($options) {
+      switch ($options) {
       case  'ImageB':
       case  'ImageC':
       case  'ImageI':
@@ -1089,9 +1089,9 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n[";
       foreach ($o['info'] as  $label=>$val) {
-        $res.= '/'.$label.' ';
+        $res .= '/'.$label.' ';
       }
-      $res.= "]\nendobj";
+      $res .= "]\nendobj";
       return  $res;
     }
   }
@@ -1101,11 +1101,11 @@ 
    * define the document information
    */
   protected function  o_info($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->infoObject = $id;
       $date = 'D:'.@date('Ymd');
@@ -1124,26 +1124,26 @@ 
       break;
 
     case  'out':
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
       }
 
       $res = "\n".$id." 0 obj\n<<\n";
       foreach ($o['info'] as  $k=>$v) {
-        $res.= '/'.$k.' (';
+        $res .= '/'.$k.' (';
         // dates must be outputted as-is, without Unicode transformations
         $raw = ($k === 'CreationDate' || $k === 'ModDate');
         $c = $v;
 
-        if  ($this->encrypted) {
+        if ($this->encrypted) {
           $c = $this->ARC4($c);
         }
 
-        $res.= ($raw) ? $c : $this->filterText($c);
-        $res.= ")\n";
+        $res .= ($raw) ? $c : $this->filterText($c);
+        $res .= ")\n";
       }
 
-      $res.= ">>\nendobj";
+      $res .= ">>\nendobj";
       return  $res;
     }
   }
@@ -1153,13 +1153,13 @@ 
    * an action object, used to link to URLS initially
    */
   protected function  o_action($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      if  (is_array($options)) {
+      if (is_array($options)) {
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
       } else {
         // then assume a URI action
@@ -1168,7 +1168,7 @@ 
       break;
 
     case  'out':
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
       }
 
@@ -1176,22 +1176,22 @@ 
       switch ($o['type']) {
       case  'ilink':
         // there will be an 'label' setting, this is the name of the destination
-        $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+        $res .= "\n/S /GoTo\n/D ".$this->destinations[(string) $o['info']['label']]." 0 R";
         break;
 
       case  'URI':
-        $res.= "\n/S /URI\n/URI (";
-        if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
+        $res .= "\n/S /URI\n/URI (";
+        if ($this->encrypted) {
+          $res .= $this->filterText($this->ARC4($o['info']));
         } else {
-          $res.= $this->filterText($o['info']);
+          $res .= $this->filterText($o['info']);
         }
 
-        $res.= ")";
+        $res .= ")";
         break;
       }
 
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1202,14 +1202,14 @@ 
    * initially will support just link annotations
    */
   protected function  o_annotation($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       // add the annotation to the current page
-      $pageId =  $this->currentPage;
+      $pageId = $this->currentPage;
       $this->o_page($pageId, 'annot', $id);
 
       // and add the action object which is going to be required
@@ -1223,7 +1223,7 @@ 
 
       case  'ilink':
         // this is to a named internal link
-        $label =  $options['label'];
+        $label = $options['label'];
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
         $this->numObj++;
         $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
@@ -1237,20 +1237,20 @@ 
       switch ($o['info']['type']) {
       case  'link':
       case  'ilink':
-        $res.=  "\n/Subtype /Link";
+        $res .= "\n/Subtype /Link";
         break;
       }
-      $res.= "\n/A ".$o['info']['actionId']." 0 R";
-      $res.= "\n/Border [0 0 0]";
-      $res.= "\n/H /I";
-      $res.= "\n/Rect [ ";
+      $res .= "\n/A ".$o['info']['actionId']." 0 R";
+      $res .= "\n/Border [0 0 0]";
+      $res .= "\n/H /I";
+      $res .= "\n/Rect [ ";
 
-      foreach($o['info']['rect'] as  $v) {
-        $res.=  sprintf("%.4F ", $v);
+      foreach ($o['info']['rect'] as  $v) {
+        $res .= sprintf("%.4F ", $v);
       }
 
-      $res.= "]";
-      $res.= "\n>>\nendobj";
+      $res .= "]";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1260,16 +1260,16 @@ 
    * a page object, it also creates a contents object to hold its contents
    */
   protected function  o_page($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->numPages++;
       $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
 
-      if  (is_array($options)) {
+      if (is_array($options)) {
         // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
         $options['id'] = $id;
         $this->o_pages($this->currentNode, 'page', $options);
@@ -1285,9 +1285,9 @@ 
       $this->objects[$id]['info']['contents'] = array();
       $this->objects[$id]['info']['contents'][] = $this->numObj;
 
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
-        if  ($target === 'all' || $match === $target) {
+      $match = ($this->numPages % 2 ? 'odd' : 'even');
+      foreach ($this->addLooseObjects as  $oId=>$target) {
+        if ($target === 'all' || $match === $target) {
           $this->objects[$id]['info']['contents'][] = $oId;
         }
       }
@@ -1299,7 +1299,7 @@ 
 
     case  'annot':
       // add an annotation to this page
-      if  (!isset($o['info']['annot'])) {
+      if (!isset($o['info']['annot'])) {
         $o['info']['annot'] = array();
       }
 
@@ -1309,32 +1309,32 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+      $res .= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
-        $res.= "\n/Annots [";
-        foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
+      if (isset($o['info']['annot'])) {
+        $res .= "\n/Annots [";
+        foreach ($o['info']['annot'] as  $aId) {
+          $res .= " ".$aId." 0 R";
         }
-        $res.= " ]";
+        $res .= " ]";
       }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
-        $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
-        $res.= "\n/Contents [\n";
+      $count = count($o['info']['contents']);
+      if ($count == 1) {
+        $res .= "\n/Contents ".$o['info']['contents'][0]." 0 R";
+      } else  if ($count > 1) {
+        $res .= "\n/Contents [\n";
 
         // reverse the page contents so added objects are below normal content
         //foreach (array_reverse($o['info']['contents']) as  $cId) {
         // Back to normal now that I've got transparency working --Benj
         foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
+          $res .= $cId." 0 R\n";
         }
-        $res.= "]";
+        $res .= "]";
       }
 
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1344,17 +1344,17 @@ 
    * the contents objects hold all of the content which appears on pages
    */
   protected function  o_contents($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
+      if (mb_strlen($options, '8bit') && intval($options)) {
         // then this contents is the primary for a page
         $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
+      } else  if ($options === 'raw') {
         // then this page contains some other type of system object
         $this->objects[$id]['raw'] = 1;
       }
@@ -1368,63 +1368,63 @@ 
 
     case  'out':
       $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+      $res = "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
-        $res.= $tmp;
+      if (isset($this->objects[$id]['raw'])) {
+        $res .= $tmp;
       } else {
-        $res.=  "<<";
-        if  (function_exists('gzcompress') &&  $this->options['compression']) {
+        $res .= "<<";
+        if (function_exists('gzcompress') && $this->options['compression']) {
           // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
+          $res .= " /Filter /FlateDecode";
+          $tmp = gzcompress($tmp, 6);
         }
 
-        if  ($this->encrypted) {
+        if ($this->encrypted) {
           $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
+          $tmp = $this->ARC4($tmp);
         }
 
-        foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
+        foreach ($o['info'] as  $k=>$v) {
+          $res .= "\n/".$k.' '.$v;
         }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
+        $res .= "\n/Length ".mb_strlen($tmp, '8bit')." >>\nstream\n".$tmp."\nendstream";
       }
 
-      $res.= "\nendobj";
+      $res .= "\nendobj";
       return  $res;
     }
   }
 
   protected function  o_embedjs($id, $action, $code = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
-        'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
+        'Names' => '[(EmbeddedJS) '.($id + 1).' 0 R]'
       ));
       break;
 
     case  'out':
       $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
   
   protected function  o_javascript($id, $action, $code = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
         'S' => '/JavaScript',
@@ -1434,10 +1434,10 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1446,7 +1446,7 @@ 
    * an image object, will be an XObject in the document, includes description and data
    */
   protected function  o_image($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
@@ -1459,8 +1459,8 @@ 
       $this->objects[$id]['info']['Width'] = $options['iw'];
       $this->objects[$id]['info']['Height'] = $options['ih'];
 
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
-        if  (!isset($options['channels'])) {
+      if (!isset($options['type']) || $options['type'] === 'jpg') {
+        if (!isset($options['channels'])) {
           $options['channels'] = 3;
         }
 
@@ -1476,30 +1476,30 @@ 
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
-      } else  if  ($options['type'] === 'png') {
+      } else  if ($options['type'] === 'png') {
         $this->objects[$id]['info']['Filter'] = '/FlateDecode';
         $this->objects[$id]['info']['DecodeParms'] = '<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
 
-        if  (mb_strlen($options['pdata'], '8bit')) {
-          $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
+        if (mb_strlen($options['pdata'], '8bit')) {
+          $tmp = ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') / 3 - 1).' ';
           $this->numObj++;
           $this->o_contents($this->numObj, 'new');
           $this->objects[$this->numObj]['c'] = $options['pdata'];
-          $tmp.= $this->numObj.' 0 R';
-          $tmp.= ' ]';
-          $this->objects[$id]['info']['ColorSpace'] =  $tmp;
-          if  (isset($options['transparency'])) {
+          $tmp .= $this->numObj.' 0 R';
+          $tmp .= ' ]';
+          $this->objects[$id]['info']['ColorSpace'] = $tmp;
+          if (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
+              $this->objects[$id]['info']['Mask'] = $tmp;
               break;
 
             case 'color-key':
               $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                $options['transparency']['r'].' '.$options['transparency']['r'].
+                $options['transparency']['g'].' '.$options['transparency']['g'].
+                $options['transparency']['b'].' '.$options['transparency']['b'].
                 ' ] ';
               $this->objects[$id]['info']['Mask'] = $tmp;
               pre_r($tmp);
@@ -1508,18 +1508,18 @@ 
             }
           }
         } else {
-          if  (isset($options['transparency'])) {
+          if (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
+              $this->objects[$id]['info']['Mask'] = $tmp;
               break;
 
             case 'color-key':
               $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                $options['transparency']['r'].' '.$options['transparency']['r'].' '.
+                $options['transparency']['g'].' '.$options['transparency']['g'].' '.
+                $options['transparency']['b'].' '.$options['transparency']['b'].
                 ' ] ';
               $this->objects[$id]['info']['Mask'] = $tmp;
               break;              
@@ -1541,18 +1541,18 @@ 
 
     case  'out':
       $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+      $res = "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
 
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
-        $tmp =  $this->ARC4($tmp);
+        $tmp = $this->ARC4($tmp);
       }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+      $res .= "\n/Length ".mb_strlen($tmp, '8bit').">>\nstream\n".$tmp."\nendstream\nendobj";
 
       return  $res;
     }
@@ -1562,39 +1562,39 @@ 
   /**
    * graphics state object
    */
-  protected function  o_extGState($id,  $action,  $options = "") {
-    static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
-                                   "D",  "RI",  "OP",  "op",  "OPM",
-                                   "Font",  "BG",  "BG2",  "UCR",
-                                   "TR",  "TR2",  "HT",  "FL",
-                                   "SM",  "SA",  "BM",  "SMask",
-                                   "CA",  "ca",  "AIS",  "TK");
+  protected function  o_extGState($id, $action, $options = "") {
+    static  $valid_params = array("LW", "LC", "LC", "LJ", "ML",
+                                   "D", "RI", "OP", "op", "OPM",
+                                   "Font", "BG", "BG2", "UCR",
+                                   "TR", "TR2", "HT", "FL",
+                                   "SM", "SA", "BM", "SMask",
+                                   "CA", "ca", "AIS", "TK");
 
-    if  ($action !==  "new") {
+    if ($action !== "new") {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  "new":
-      $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
+      $this->objects[$id] = array('t' => 'extGState', 'info' => $options);
 
       // Tell the pages about the new resource
       $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+      $this->o_pages($this->currentNode, 'extGState', array("objNum" => $id, "stateNum" => $this->numStates));
       break;
 
     case  "out":
       $res =
-        "\n" . $id . " 0 obj\n".
+        "\n".$id." 0 obj\n".
         "<< /Type /ExtGState\n";
 
       foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
+        if (!in_array($parameter, $valid_params))
           continue;
-        $res.=  "/$parameter $value\n";
+        $res .= "/$parameter $value\n";
       }
 
-      $res.=
+      $res .=
         ">>\n".
         "endobj";
       return  $res;
@@ -1606,7 +1606,7 @@ 
    * encryption object.
    */
   protected function  o_encryption($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
@@ -1617,38 +1617,38 @@ 
       $this->arc4_objnum = $id;
 
       // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
+      $pad = chr(0x28).chr(0xBF).chr(0x4E).chr(0x5E).chr(0x4E).chr(0x75).chr(0x8A).chr(0x41).chr(0x64).chr(0x00).chr(0x4E).chr(0x56).chr(0xFF).chr(0xFA).chr(0x01).chr(0x08).chr(0x2E).chr(0x2E).chr(0x00).chr(0xB6).chr(0xD0).chr(0x68).chr(0x3E).chr(0x80).chr(0x2F).chr(0x0C).chr(0xA9).chr(0xFE).chr(0x64).chr(0x53).chr(0x69).chr(0x7A);
+      $len = mb_strlen($options['owner'], '8bit');
 
-      if  ($len>32) {
-        $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
-        $owner =  $options['owner'].substr($pad, 0, 32-$len);
+      if ($len > 32) {
+        $owner = substr($options['owner'], 0, 32);
+      } else  if ($len < 32) {
+        $owner = $options['owner'].substr($pad, 0, 32 - $len);
       } else {
-        $owner =  $options['owner'];
+        $owner = $options['owner'];
       }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
-        $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
-        $user =  $options['user'].substr($pad, 0, 32-$len);
+      $len = mb_strlen($options['user'], '8bit');
+      if ($len > 32) {
+        $user = substr($options['user'], 0, 32);
+      } else  if ($len < 32) {
+        $user = $options['user'].substr($pad, 0, 32 - $len);
       } else {
-        $user =  $options['user'];
+        $user = $options['user'];
       }
 
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
+      $tmp = $this->md5_16($owner);
+      $okey = substr($tmp, 0, 5);
       $this->ARC4_init($okey);
       $ovalue = $this->ARC4($user);
       $this->objects[$id]['info']['O'] = $ovalue;
 
       // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+      $tmp = $this->md5_16($user.$ovalue.chr($options['p']).chr(255).chr(255).chr(255).$this->fileIdentifier);
 
-      $ukey =  substr($tmp, 0, 5);
+      $ukey = substr($tmp, 0, 5);
       $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
+      $this->encryptionKey = $ukey;
       $this->encrypted = 1;
       $uvalue = $this->ARC4($pad);
       $this->objects[$id]['info']['U'] = $uvalue;
@@ -1657,16 +1657,16 @@ 
       break;
 
     case  'out':
-      $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+      $res = "\n".$id." 0 obj\n<<";
+      $res .= "\n/Filter /Standard";
+      $res .= "\n/V 1";
+      $res .= "\n/R 2";
+      $res .= "\n/O (".$this->filterText($o['info']['O']).')';
+      $res .= "\n/U (".$this->filterText($o['info']['U']).')';
       // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
+      $o['info']['p'] = (($o['info']['p'] ^ 255) + 1) * -1;
+      $res .= "\n/P ".($o['info']['p']);
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1681,10 +1681,10 @@ 
    * calculate the 16 byte version of the 128 bit md5 digest of the string
    */
   function  md5_16($string) {
-    $tmp =  md5($string);
+    $tmp = md5($string);
     $out = '';
-    for  ($i = 0;$i <= 30;$i = $i+2) {
-      $out.= chr(hexdec(substr($tmp, $i, 2)));
+    for ($i = 0; $i <= 30; $i = $i + 2) {
+      $out .= chr(hexdec(substr($tmp, $i, 2)));
     }
     return  $out;
   }
@@ -1694,13 +1694,13 @@ 
    * initialize the encryption for processing a particular object
    */
   function  encryptInit($id) {
-    $tmp =  $this->encryptionKey;
-    $hex =  dechex($id);
-    if  (mb_strlen($hex, '8bit') <6) {
-      $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
+    $tmp = $this->encryptionKey;
+    $hex = dechex($id);
+    if (mb_strlen($hex, '8bit') < 6) {
+      $hex = substr('000000', 0, 6 - mb_strlen($hex, '8bit')).$hex;
     }
-    $tmp.=  chr(hexdec(substr($hex, 4, 2))) .chr(hexdec(substr($hex, 2, 2))) .chr(hexdec(substr($hex, 0, 2))) .chr(0) .chr(0);
-    $key =  $this->md5_16($tmp);
+    $tmp .= chr(hexdec(substr($hex, 4, 2))).chr(hexdec(substr($hex, 2, 2))).chr(hexdec(substr($hex, 0, 2))).chr(0).chr(0);
+    $key = $this->md5_16($tmp);
     $this->ARC4_init(substr($key, 0, 10));
   }
 
@@ -1709,28 +1709,28 @@ 
    * initialize the ARC4 encryption
    */
   function  ARC4_init($key = '') {
-    $this->arc4 =  '';
+    $this->arc4 = '';
 
     // setup the control array
-    if  (mb_strlen($key, '8bit') == 0) {
+    if (mb_strlen($key, '8bit') == 0) {
       return;
     }
 
-    $k =  '';
-    while (mb_strlen($k, '8bit') <256) {
-      $k.= $key;
+    $k = '';
+    while (mb_strlen($k, '8bit') < 256) {
+      $k .= $key;
     }
 
     $k = substr($k, 0, 256);
-    for  ($i = 0;$i<256;$i++) {
-      $this->arc4.=  chr($i);
+    for ($i = 0; $i < 256; $i++) {
+      $this->arc4 .= chr($i);
     }
 
     $j = 0;
 
-    for  ($i = 0;$i<256;$i++) {
-      $t =  $this->arc4[$i];
-      $j =  ($j + ord($t)  + ord($k[$i])) %256;
+    for ($i = 0; $i < 256; $i++) {
+      $t = $this->arc4[$i];
+      $j = ($j + ord($t) + ord($k[$i])) % 256;
       $this->arc4[$i] = $this->arc4[$j];
       $this->arc4[$j] = $t;
     }
@@ -1744,16 +1744,16 @@ 
     $len = mb_strlen($text, '8bit');
     $a = 0;
     $b = 0;
-    $c =  $this->arc4;
+    $c = $this->arc4;
     $out = '';
-    for  ($i = 0;$i<$len;$i++) {
-      $a =  ($a+1) %256;
-      $t =  $c[$a];
-      $b =  ($b+ord($t)) %256;
+    for ($i = 0; $i < $len; $i++) {
+      $a = ($a + 1) % 256;
+      $t = $c[$a];
+      $b = ($b + ord($t)) % 256;
       $c[$a] = $c[$b];
       $c[$b] = $t;
-      $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
-      $out.= chr(ord($text[$i])  ^ $k);
+      $k = ord($c[(ord($c[$a]) + ord($c[$b])) % 256]);
+      $out .= chr(ord($text[$i]) ^ $k);
     }
     return  $out;
   }
@@ -1768,7 +1768,7 @@ 
    */
   function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
-    $info =  array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
+    $info = array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
   }
 
@@ -1778,7 +1778,7 @@ 
    */
   function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
-    $info =  array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
+    $info = array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
   }
 
@@ -1791,21 +1791,21 @@ 
   function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
     $p = bindec(11000000);
 
-    $options =  array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
+    $options = array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
 
-    foreach($pc as  $k=>$v) {
-      if  ($v &&  isset($options[$k])) {
-        $p+= $options[$k];
-      } else  if  (isset($options[$v])) {
-        $p+= $options[$v];
+    foreach ($pc as  $k=>$v) {
+      if ($v && isset($options[$k])) {
+        $p += $options[$k];
+      } else  if (isset($options[$v])) {
+        $p += $options[$v];
       }
     }
 
     // implement encryption on the document
-    if  ($this->arc4_objnum ==  0) {
+    if ($this->arc4_objnum == 0) {
       // then the block does not exist already, add it.
       $this->numObj++;
-      if  (mb_strlen($ownerPass) == 0) {
+      if (mb_strlen($ownerPass) == 0) {
         $ownerPass = $userPass;
       }
 
@@ -1825,7 +1825,7 @@ 
    * return the pdf stream as a string returned from the function
    */
   function  output($debug = false) {
-    if  ($debug) {
+    if ($debug) {
       // turn compression off
       $this->options['compression'] = 0;
     }
@@ -1837,12 +1837,12 @@ 
       $this->o_embedjs($js_id, 'new');
       $this->o_javascript(++$this->numObj, 'new', $this->javascript);
       
-      $id =  $this->catalogId;
+      $id = $this->catalogId;
       
       $this->o_catalog($id, 'javascript', $js_id);
     }
 
-    if  ($this->arc4_objnum) {
+    if ($this->arc4_objnum) {
       $this->ARC4_init($this->encryptionKey);
     }
 
@@ -1853,32 +1853,32 @@ 
     $content = '%PDF-1.3';
     $pos = mb_strlen($content, '8bit');
 
-    foreach($this->objects as  $k=>$v) {
+    foreach ($this->objects as  $k=>$v) {
       $tmp = 'o_'.$v['t'];
       $cont = $this->$tmp($k, 'out');
-      $content.= $cont;
+      $content .= $cont;
       $xref[] = $pos;
-      $pos+= mb_strlen($cont, '8bit');
+      $pos += mb_strlen($cont, '8bit');
     }
 
-    $content.= "\nxref\n0 ".(count($xref) +1) ."\n0000000000 65535 f \n";
+    $content .= "\nxref\n0 ".(count($xref) + 1)."\n0000000000 65535 f \n";
 
-    foreach($xref as  $p) {
-      $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
+    foreach ($xref as  $p) {
+      $content .= str_pad($p, 10, "0", STR_PAD_LEFT)." 00000 n \n";
     }
 
-    $content.= "trailer\n<<\n/Size ".(count($xref) +1) ."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
+    $content .= "trailer\n<<\n/Size ".(count($xref) + 1)."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
 
     // if encryption has been applied to this document then add the marker for this dictionary
-    if  ($this->arc4_objnum > 0) {
-      $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
+    if ($this->arc4_objnum > 0) {
+      $content .= "/Encrypt ".$this->arc4_objnum." 0 R\n";
     }
 
-    if  (mb_strlen($this->fileIdentifier, '8bit')) {
-      $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
+    if (mb_strlen($this->fileIdentifier, '8bit')) {
+      $content .= "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
     }
 
-    $content.=  ">>\nstartxref\n".$pos."\n%%EOF\n";
+    $content .= ">>\nstartxref\n".$pos."\n%%EOF\n";
 
     return  $content;
   }
@@ -1892,7 +1892,7 @@ 
    */
   function  newDocument($pageSize = array(0, 0, 612, 792)) {
     $this->numObj = 0;
-    $this->objects =  array();
+    $this->objects = array();
 
     $this->numObj++;
     $this->o_catalog($this->numObj, 'new');
@@ -1904,7 +1904,7 @@ 
     $this->o_pages($this->numObj, 'new');
 
     $this->o_pages($this->numObj, 'mediaBox', $pageSize);
-    $this->currentNode =  3;
+    $this->currentNode = 3;
 
     $this->numObj++;
     $this->o_procset($this->numObj, 'new');
@@ -1917,7 +1917,7 @@ 
 
     // need to store the first page id as there is no way to get it to the user during
     // startup
-    $this->firstPageId =  $this->currentContents;
+    $this->firstPageId = $this->currentContents;
   }
 
   /**
@@ -1933,12 +1933,12 @@ 
     // assume that $font contains the path and file but not the extension
     $pos = strrpos($font, '/');
 
-    if  ($pos === false) {
-      $dir =  './';
-      $name =  $font;
+    if ($pos === false) {
+      $dir = './';
+      $name = $font;
     } else {
-      $dir = substr($font, 0, $pos+1);
-      $name = substr($font, $pos+1);
+      $dir = substr($font, 0, $pos + 1);
+      $name = substr($font, $pos + 1);
     }
     
     $fontcache = $this->fontcache;
@@ -1954,31 +1954,31 @@ 
     
     $this->addMessage('openFont: '.$font.' - '.$name);
 
-    $metrics_name = $name . (($this->isUnicode) ? '.ufm' : '.afm');
+    $metrics_name = $name.(($this->isUnicode) ? '.ufm' : '.afm');
     
     // Core fonts don't currently work with composite fonts (for Unicode support).
     // The .ufm files have been removed so we need to check whether or not to use the
     // .ufm or .afm.
-    if ($this->isUnicode && !file_exists($dir . '/' . $metrics_name)) { $metrics_name = $name . '.afm'; }
+    if ($this->isUnicode && !file_exists($dir.'/'.$metrics_name)) { $metrics_name = $name.'.afm'; }
     
-    $cache_name = 'php_' . $metrics_name;
+    $cache_name = 'php_'.$metrics_name;
     $this->addMessage('metrics: '.$metrics_name.', cache: '.$cache_name);
-    if  (file_exists($fontcache . $cache_name)) {
-      $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
-      $tmp =  file_get_contents($fontcache . $cache_name);
+    if (file_exists($fontcache.$cache_name)) {
+      $this->addMessage('openFont: php file exists '.$fontcache.$cache_name);
+      $tmp = file_get_contents($fontcache.$cache_name);
       eval($tmp);
 
-      if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
+      if (!isset($this->fonts[$font]['_version_']) || $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
         // if the font file is old, then clear it out and prepare for re-creation
         $this->addMessage('openFont: clear out, make way for new version.');
         unset($this->fonts[$font]);
       }
     }
 
-    if  (!isset($this->fonts[$font]) &&  file_exists($dir . $metrics_name)) {
+    if (!isset($this->fonts[$font]) && file_exists($dir.$metrics_name)) {
       // then rebuild the php_<font>.afm file from the <font>.afm file
-      $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
-      $data =  array();
+      $this->addMessage('openFont: build php file from '.$dir.$metrics_name);
+      $data = array();
       
       // Since we're not going to enable Unicode for the core fonts we need to use a font-based
       // setting for Unicode support rather than a global setting.
@@ -1986,19 +1986,19 @@ 
       
       $cidtogid = '';
       if ($data['isUnicode']) {
-        $cidtogid = str_pad('', 256*256*2, "\x00");
+        $cidtogid = str_pad('', 256 * 256 * 2, "\x00");
       }
 
-      $file =  file($dir . $metrics_name);
+      $file = file($dir.$metrics_name);
 
       foreach ($file as  $rowA) {
         $row = trim($rowA);
         $pos = strpos($row, ' ');
 
-        if  ($pos) {
+        if ($pos) {
           // then there must be some keyword
-          $key =  substr($row, 0, $pos);
-          switch  ($key) {
+          $key = substr($row, 0, $pos);
+          switch ($key) {
           case  'FontName':
           case  'FullName':
           case  'FamilyName':
@@ -2030,29 +2030,29 @@ 
             $bits = explode(';', trim($row));
             $dtmp = array();
 
-            foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
-                if  (count($bits2) >2) {
+            foreach ($bits as  $bit) {
+              $bits2 = explode(' ', trim($bit));
+              if (mb_strlen($bits2[0], '8bit')) {
+                if (count($bits2) > 2) {
                   $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
+                  for ($i = 1; $i < count($bits2); $i++) {
                     $dtmp[$bits2[0]][] = $bits2[$i];
                   }
-                } else  if  (count($bits2) == 2) {
+                } else  if (count($bits2) == 2) {
                   $dtmp[$bits2[0]] = $bits2[1];
                 }
               }
             }
 
-            $cc = (int)$dtmp['C'];
-            if  ($cc >= 0) {
+            $cc = (int) $dtmp['C'];
+            if ($cc >= 0) {
               $data['C'][$dtmp['C']] = $dtmp;
               $data['C'][$dtmp['N']] = $dtmp;
             } else {
               $data['C'][$dtmp['N']] = $dtmp;
             }
 
-            if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+            if (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
               $data['MissingWidth'] = $width;
             }
             
@@ -2064,28 +2064,28 @@ 
               $bits = explode(';', trim($row));
               $dtmp = array();
 
-              foreach($bits as  $bit) {
-                $bits2 =  explode(' ', trim($bit));
-                if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
+              foreach ($bits as  $bit) {
+                $bits2 = explode(' ', trim($bit));
+                if (mb_strlen($bits2[0], '8bit')) {
+                  if (count($bits2) > 2) {
                     $dtmp[$bits2[0]] = array();
-                    for  ($i = 1;$i<count($bits2);$i++) {
+                    for ($i = 1; $i < count($bits2); $i++) {
                       $dtmp[$bits2[0]][] = $bits2[$i];
                     }
-                  } else  if  (count($bits2) == 2) {
+                  } else  if (count($bits2) == 2) {
                     $dtmp[$bits2[0]] = $bits2[1];
                   }
                 }
               }
 
-              $cc = (int)$dtmp['U'];
+              $cc = (int) $dtmp['U'];
               $glyph = $dtmp['G'];
               $width = $dtmp['WX'];
-              if  ($cc >= 0) {
+              if ($cc >= 0) {
                 // Set values in CID to GID map
                 if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                  $cidtogid[$cc * 2] = chr($glyph >> 8);
+                  $cidtogid[$cc * 2 + 1] = chr($glyph & 0xFF);
                 }
 
                 $data['C'][$dtmp['U']] = $dtmp;
@@ -2094,7 +2094,7 @@ 
                 $data['C'][$dtmp['N']] = $dtmp;
               }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+              if (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
                 $data['MissingWidth'] = $width;
               }
             }
@@ -2110,10 +2110,10 @@ 
       }
 
       //    echo $cidtogid; die("CIDtoGID Displayed!");
-      if  (function_exists('gzcompress') &&  $this->options['compression']) {
+      if (function_exists('gzcompress') && $this->options['compression']) {
         // then implement ZLIB based compression on CIDtoGID string
         $data['CIDtoGID_Compressed'] = true;
-        $cidtogid =  gzcompress($cidtogid,  6);
+        $cidtogid = gzcompress($cidtogid, 6);
       }
       $data['CIDtoGID'] = base64_encode($cidtogid);
       $data['_version_'] = $this->fontcacheVersion;
@@ -2121,12 +2121,12 @@ 
 
       //Because of potential trouble with php safe mode, expect that the folder already exists.
       //If not existing, this will hit performance because of missing cached results.
-      if ( is_dir(substr($fontcache,0,-1)) ) {
-        file_put_contents($fontcache . $cache_name,  '$this->fonts[$font]=' . var_export($data,  true)  . ';');
+      if (is_dir(substr($fontcache, 0, -1))) {
+        file_put_contents($fontcache.$cache_name, '$this->fonts[$font]='.var_export($data, true).';');
       }
     }
     
-    if  (!isset($this->fonts[$font])) {
+    if (!isset($this->fonts[$font])) {
       $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
       //echo 'Font not Found '.$font;
     }
@@ -2142,59 +2142,59 @@ 
    * and 'differences' => an array of mappings between numbers 0->255 and character names.
    *
    */
-  function  selectFont($fontName, $encoding =  '', $set =  true) {
+  function  selectFont($fontName, $encoding = '', $set = true) {
     $ext = substr($fontName, -4);
-    if  ($ext === '.afm' || $ext === '.ufm') {
-      $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
+    if ($ext === '.afm' || $ext === '.ufm') {
+      $fontName = substr($fontName, 0, mb_strlen($fontName) - 4);
     }
 
-    if  (!isset($this->fonts[$fontName])) {
+    if (!isset($this->fonts[$fontName])) {
       $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
 
       // load the file
       $this->openFont($fontName);
 
-      if  (isset($this->fonts[$fontName])) {
+      if (isset($this->fonts[$fontName])) {
         $this->numObj++;
         $this->numFonts++;
 
         //$this->numFonts = md5($fontName);
-        $pos =  strrpos($fontName, '/');
+        $pos = strrpos($fontName, '/');
         //      $dir = substr($fontName,0,$pos+1);
-        $name =  substr($fontName, $pos+1);
-        $options =  array('name' => $name, 'fontFileName' => $fontName);
+        $name = substr($fontName, $pos + 1);
+        $options = array('name' => $name, 'fontFileName' => $fontName);
 
-        if  (is_array($encoding)) {
+        if (is_array($encoding)) {
           // then encoding and differences might be set
-          if  (isset($encoding['encoding'])) {
-            $options['encoding'] =  $encoding['encoding'];
+          if (isset($encoding['encoding'])) {
+            $options['encoding'] = $encoding['encoding'];
           }
 
-          if  (isset($encoding['differences'])) {
-            $options['differences'] =  $encoding['differences'];
+          if (isset($encoding['differences'])) {
+            $options['differences'] = $encoding['differences'];
           }
-        } else  if  (mb_strlen($encoding, '8bit')) {
+        } else  if (mb_strlen($encoding, '8bit')) {
           // then perhaps only the encoding has been set
-          $options['encoding'] =  $encoding;
+          $options['encoding'] = $encoding;
         }
 
-        $fontObj =  $this->numObj;
+        $fontObj = $this->numObj;
         $this->o_font($this->numObj, 'new', $options);
-        $this->fonts[$fontName]['fontNum'] =  $this->numFonts;
+        $this->fonts[$fontName]['fontNum'] = $this->numFonts;
 
         // if this is a '.afm' font, and there is a '.pfa' file to go with it ( as there
         // should be for all non-basic fonts), then load it into an object and put the
         // references into the font object
-        $basefile =  $fontName;
-        if  (file_exists($basefile.'.pfb')) {
-          $fbtype =  'pfb';
-        } else  if  (file_exists($basefile.'.ttf')) {
-          $fbtype =  'ttf';
+        $basefile = $fontName;
+        if (file_exists($basefile.'.pfb')) {
+          $fbtype = 'pfb';
+        } else  if (file_exists($basefile.'.ttf')) {
+          $fbtype = 'ttf';
         } else {
-          $fbtype =  '';
+          $fbtype = '';
         }
 
-        $fbfile =  $basefile.'.'.$fbtype;
+        $fbfile = $basefile.'.'.$fbtype;
 
         //      $pfbfile = substr($fontName,0,strlen($fontName)-4).'.pfb';
         //      $ttffile = substr($fontName,0,strlen($fontName)-4).'.ttf';
@@ -2202,60 +2202,60 @@ 
 
         // OAR - I don't understand this old check
         // if  (substr($fontName, -4) ===  '.afm' &&  strlen($fbtype)) {
-        if  (mb_strlen($fbtype, '8bit')) {
-          $adobeFontName =  $this->fonts[$fontName]['FontName'];
+        if (mb_strlen($fbtype, '8bit')) {
+          $adobeFontName = $this->fonts[$fontName]['FontName'];
           //        $fontObj = $this->numObj;
           $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
 
           // find the array of font widths, and put that into an object.
-          $firstChar =  -1;
-          $lastChar =  0;
-          $widths =  array();
+          $firstChar = -1;
+          $lastChar = 0;
+          $widths = array();
           $cid_widths = array();
 
           foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
-            if  (intval($num) >0 ||  $num ==  '0') {
+            if (intval($num) > 0 || $num == '0') {
               if (!$this->fonts[$fontName]['isUnicode']) {
                 // With Unicode, widths array isn't used
-                if  ($lastChar>0 &&  $num>$lastChar+1) {
-                  for ($i =  $lastChar+1;$i<$num;$i++) {
-                    $widths[] =  0;
+                if ($lastChar > 0 && $num > $lastChar + 1) {
+                  for ($i = $lastChar + 1; $i < $num; $i++) {
+                    $widths[] = 0;
                   }
                 }
               }
 
-              $widths[] =  $d['WX'];
+              $widths[] = $d['WX'];
 
               if ($this->fonts[$fontName]['isUnicode']) {
-                $cid_widths[$num] =  $d['WX'];
+                $cid_widths[$num] = $d['WX'];
               }
 
-              if  ($firstChar ==  -1) {
-                $firstChar =  $num;
+              if ($firstChar == -1) {
+                $firstChar = $num;
               }
 
-              $lastChar =  $num;
+              $lastChar = $num;
             }
           }
 
           // also need to adjust the widths for the differences array
-          if  (isset($options['differences'])) {
-            foreach($options['differences'] as  $charNum => $charName) {
-              if  ($charNum > $lastChar) {
+          if (isset($options['differences'])) {
+            foreach ($options['differences'] as  $charNum => $charName) {
+              if ($charNum > $lastChar) {
                 if (!$this->fonts[$fontName]['isUnicode']) {
                   // With Unicode, widths array isn't used
-                  for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
-                    $widths[] =  0;
+                  for ($i = $lastChar + 1; $i <= $charNum; $i++) {
+                    $widths[] = 0;
                   }
                 }
 
-                $lastChar =  $charNum;
+                $lastChar = $charNum;
               }
 
-              if  (isset($this->fonts[$fontName]['C'][$charName])) {
-                $widths[$charNum-$firstChar] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+              if (isset($this->fonts[$fontName]['C'][$charName])) {
+                $widths[$charNum - $firstChar] = $this->fonts[$fontName]['C'][$charName]['WX'];
                 if ($this->fonts[$fontName]['isUnicode']) {
-                  $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+                  $cid_widths[$charName] = $this->fonts[$fontName]['C'][$charName]['WX'];
                 }
               }
             }
@@ -2275,21 +2275,21 @@ 
 
             $this->numObj++;
             $this->o_contents($this->numObj, 'new', 'raw');
-            $this->objects[$this->numObj]['c'].=  '[';
+            $this->objects[$this->numObj]['c'] .= '[';
 
-            foreach($widths as  $width) {
-              $this->objects[$this->numObj]['c'].=  ' '.$width;
+            foreach ($widths as  $width) {
+              $this->objects[$this->numObj]['c'] .= ' '.$width;
             }
 
-            $this->objects[$this->numObj]['c'].=  ' ]';
-            $widthid =  $this->numObj;
+            $this->objects[$this->numObj]['c'] .= ' ]';
+            $widthid = $this->numObj;
           }
 
           $missing_width = 500;
           $stemV = 70;
 
           if (isset($this->fonts[$fontName]['MissingWidth'])) {
-            $missing_width =  $this->fonts[$fontName]['MissingWidth'];
+            $missing_width = $this->fonts[$fontName]['MissingWidth'];
           }
           if (isset($this->fonts[$fontName]['StdVW'])) {
             $stemV = $this->fonts[$fontName]['StdVW'];
@@ -2300,28 +2300,28 @@ 
           // load the pfb file, and put that into an object too.
           // note that pdf supports only binary format type 1 font files, though there is a
           // simple utility to convert them from pfa to pfb.
-          $data =  file_get_contents($fbfile);
+          $data = file_get_contents($fbfile);
 
           // create the font descriptor
           $this->numObj++;
-          $fontDescriptorId =  $this->numObj;
+          $fontDescriptorId = $this->numObj;
 
           $this->numObj++;
-          $pfbid =  $this->numObj;
+          $pfbid = $this->numObj;
 
           // determine flags (more than a little flakey, hopefully will not matter much)
-          $flags =  0;
+          $flags = 0;
 
-          if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
-            $flags+=  pow(2, 6);
+          if ($this->fonts[$fontName]['ItalicAngle'] != 0) {
+            $flags += pow(2, 6);
           }
 
-          if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
-            $flags+=  1;
+          if ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
+            $flags += 1;
           }
 
-          $flags+=  pow(2, 5); // assume non-sybolic
-          $list =  array(
+          $flags += pow(2, 5); // assume non-sybolic
+          $list = array(
             'Ascent' => 'Ascender', 
             'CapHeight' => 'CapHeight', 
             'MissingWidth' => 'MissingWidth', 
@@ -2329,51 +2329,51 @@ 
             'FontBBox' => 'FontBBox', 
             'ItalicAngle' => 'ItalicAngle'
           );
-          $fdopt =  array(
+          $fdopt = array(
             'Flags' => $flags, 
             'FontName' => $adobeFontName, 
             'StemV' => $stemV
           );
 
-          foreach($list as  $k => $v) {
-            if  (isset($this->fonts[$fontName][$v])) {
-              $fdopt[$k] =  $this->fonts[$fontName][$v];
+          foreach ($list as  $k => $v) {
+            if (isset($this->fonts[$fontName][$v])) {
+              $fdopt[$k] = $this->fonts[$fontName][$v];
             }
           }
 
-          if  ($fbtype === 'pfb') {
-            $fdopt['FontFile'] =  $pfbid;
-          } else  if  ($fbtype === 'ttf') {
-            $fdopt['FontFile2'] =  $pfbid;
+          if ($fbtype === 'pfb') {
+            $fdopt['FontFile'] = $pfbid;
+          } else  if ($fbtype === 'ttf') {
+            $fdopt['FontFile2'] = $pfbid;
           }
 
           $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
 
           // embed the font program
           $this->o_contents($this->numObj, 'new');
-          $this->objects[$pfbid]['c'].=  $data;
+          $this->objects[$pfbid]['c'] .= $data;
 
           // determine the cruicial lengths within this file
-          if  ($fbtype === 'pfb') {
-            $l1 =  strpos($data, 'eexec') +6;
-            $l2 =  strpos($data, '00000000') -$l1;
-            $l3 =  mb_strlen($data, '8bit') -$l2-$l1;
+          if ($fbtype === 'pfb') {
+            $l1 = strpos($data, 'eexec') + 6;
+            $l2 = strpos($data, '00000000') - $l1;
+            $l3 = mb_strlen($data, '8bit') - $l2 - $l1;
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1, 'Length2' => $l2, 'Length3' => $l3));
-          } else  if  ($fbtype == 'ttf') {
-            $l1 =  mb_strlen($data, '8bit');
+          } else  if ($fbtype == 'ttf') {
+            $l1 = mb_strlen($data, '8bit');
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1));
           }
 
           // tell the font object about all this new stuff
-          $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
+          $tmp = array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
 
-          if  ($fbtype === 'ttf') {
-            $tmp['SubType'] =  'TrueType';
+          if ($fbtype === 'ttf') {
+            $tmp['SubType'] = 'TrueType';
           }
 
           $this->addMessage('adding extra info to font.('.$fontObj.')');
 
-          foreach($tmp as  $fk => $fv) {
+          foreach ($tmp as  $fk => $fv) {
             $this->addMessage($fk." : ".$fv);
           }
 
@@ -2384,20 +2384,20 @@ 
 
         // also set the differences here, note that this means that these will take effect only the
         //first time that a font is selected, else they are ignored
-        if  (isset($options['differences'])) {
-          $this->fonts[$fontName]['differences'] =  $options['differences'];
+        if (isset($options['differences'])) {
+          $this->fonts[$fontName]['differences'] = $options['differences'];
         }
       }
     }
 
-    if  ($set &&  isset($this->fonts[$fontName])) {
+    if ($set && isset($this->fonts[$fontName])) {
       // so if for some reason the font was not set in the last one then it will not be selected
-      $this->currentBaseFont =  $fontName;
+      $this->currentBaseFont = $fontName;
 
       // the next lines mean that if a new font is selected, then the current text state will be
       // applied to it as well.
-      $this->currentFont =  $this->currentBaseFont;
-      $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+      $this->currentFont = $this->currentBaseFont;
+      $this->currentFontNum = $this->fonts[$this->currentFont]['fontNum'];
 
       //$this->setCurrentFont();
     }
@@ -2437,8 +2437,8 @@ 
     //   } else {
     //     // the this font must not have the right family member for the current state
     //     // simply assume the base font
-    $this->currentFont =  $this->currentBaseFont;
-    $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+    $this->currentFont = $this->currentBaseFont;
+    $this->currentFontNum = $this->fonts[$this->currentFont]['fontNum'];
     //  }
   }
 
@@ -2458,17 +2458,17 @@ 
    * @access private
    */
   function  addContent($content) {
-    $this->objects[$this->currentContents]['c'].=  $content;
+    $this->objects[$this->currentContents]['c'] .= $content;
   }
 
 
   /**
    * sets the colour for fill operations
    */
-  function  setColor($r, $g, $b, $force =  0) {
-    if  ($r >=  0 &&  ($force ||  $r !=  $this->currentColour['r'] ||  $g !=  $this->currentColour['g'] ||  $b !=  $this->currentColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
-      $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+  function  setColor($r, $g, $b, $force = 0) {
+    if ($r >= 0 && ($force || $r != $this->currentColour['r'] || $g != $this->currentColour['g'] || $b != $this->currentColour['b'])) {
+      $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' rg';
+      $this->currentColour = array('r' => $r, 'g' => $g, 'b' => $b);
     }
   }
 
@@ -2476,10 +2476,10 @@ 
   /**
    * sets the colour for stroke operations
    */
-  function  setStrokeColor($r, $g, $b, $force =  0) {
-    if  ($r >=  0 &&  ($force ||  $r !=  $this->currentStrokeColour['r'] ||  $g !=  $this->currentStrokeColour['g'] ||  $b !=  $this->currentStrokeColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
-      $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+  function  setStrokeColor($r, $g, $b, $force = 0) {
+    if ($r >= 0 && ($force || $r != $this->currentStrokeColour['r'] || $g != $this->currentStrokeColour['g'] || $b != $this->currentStrokeColour['b'])) {
+      $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' RG';
+      $this->currentStrokeColour = array('r' => $r, 'g' => $g, 'b' => $b);
     }
   }
 
@@ -2491,8 +2491,8 @@ 
     // Create a new graphics state object
     // FIXME: should actually keep track of states that have already been created...
     $this->numObj++;
-    $this->o_extGState($this->numObj,  'new',  $parameters);
-    $this->objects[ $this->currentContents ]['c'].=  "\n/GS" . $this->numStates . " gs";
+    $this->o_extGState($this->numObj, 'new', $parameters);
+    $this->objects[$this->currentContents]['c'] .= "\n/GS".$this->numStates." gs";
   }
 
 
@@ -2514,16 +2514,16 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
+    if (!in_array($mode, $blend_modes))
       $mode = "Normal";
     
     // Only create a new graphics state if required
-    if ( $mode == $this->currentLineTransparency["mode"]  &&
-         $opacity == $this->currentLineTransparency["opacity"] )
+    if ($mode == $this->currentLineTransparency["mode"] &&
+         $opacity == $this->currentLineTransparency["opacity"])
       return;
 
     $options = array("BM" => "/$mode",
-                     "CA" => (float)$opacity);
+                     "CA" => (float) $opacity);
 
     $this->setGraphicsState($options);
   }
@@ -2546,15 +2546,15 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
+    if (!in_array($mode, $blend_modes))
       $mode = "Normal";
 
-    if ( $mode == $this->currentFillTransparency["mode"]  &&
-         $opacity == $this->currentFillTransparency["opacity"] )
+    if ($mode == $this->currentFillTransparency["mode"] &&
+         $opacity == $this->currentFillTransparency["opacity"])
       return;
 
     $options = array("BM" => "/$mode",
-                     "ca" => (float)$opacity);
+                     "ca" => (float) $opacity);
     
     $this->setGraphicsState($options);
   }
@@ -2564,7 +2564,7 @@ 
    */
   function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
+      "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' m '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' l S';
   }
 
 
@@ -2575,17 +2575,17 @@ 
     // in the current line style, draw a bezier curve from (x0,y0) to (x3,y3) using the other two points
     // as the control points for the curve.
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
+      "\n".sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' m '.sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1);
 
     $this->objects[$this->currentContents]['c'] .=
-      ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
+      ' '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' '.sprintf('%.3F', $x3).' '.sprintf('%.3F', $y3).' c S';
   }
 
 
   /**
    * draw a part of an ellipse
    */
-  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
+  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 = 0, $angle = 0, $nSeg = 8) {
     $this->ellipse($x0, $y0, $r1, $r2, $angle, $nSeg, $astart, $afinish, 0);
   }
 
@@ -2593,8 +2593,8 @@ 
   /**
    * draw a filled ellipse
    */
-  function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
-    return  $this->ellipse($x0, $y0, $r1, $r2 =  0, $angle, $nSeg, $astart, $afinish, 1, 1);
+  function  filledEllipse($x0, $y0, $r1, $r2 = 0, $angle = 0, $nSeg = 8, $astart = 0, $afinish = 360) {
+    return  $this->ellipse($x0, $y0, $r1, $r2 = 0, $angle, $nSeg, $astart, $afinish, 1, 1);
   }
 
 
@@ -2608,78 +2608,78 @@ 
    * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
    * pretty crappy shape at 2, as we are approximating with bezier curves.
    */
-  function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
-    if  ($r1 ==  0) {
+  function  ellipse($x0, $y0, $r1, $r2 = 0, $angle = 0, $nSeg = 8, $astart = 0, $afinish = 360, $close = 1, $fill = 0) {
+    if ($r1 == 0) {
       return;
     }
 
-    if  ($r2 ==  0) {
-      $r2 =  $r1;
+    if ($r2 == 0) {
+      $r2 = $r1;
     }
 
-    if  ($nSeg < 2) {
-      $nSeg =  2;
+    if ($nSeg < 2) {
+      $nSeg = 2;
     }
 
-    $astart =  deg2rad((float)$astart);
-    $afinish =  deg2rad((float)$afinish);
-    $totalAngle = $afinish-$astart;
+    $astart = deg2rad((float) $astart);
+    $afinish = deg2rad((float) $afinish);
+    $totalAngle = $afinish - $astart;
 
-    $dt =  $totalAngle/$nSeg;
-    $dtm =  $dt/3;
+    $dt = $totalAngle / $nSeg;
+    $dtm = $dt / 3;
 
-    if  ($angle !=  0) {
-      $a =  -1*deg2rad((float)$angle);
+    if ($angle != 0) {
+      $a = -1 * deg2rad((float) $angle);
 
-      $tmp  =  "\n q ";
-      $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
+      $tmp  = "\n q ";
+      $tmp .= sprintf('%.3F', cos($a)).' '.sprintf('%.3F', (-1.0 * sin($a))).' '.sprintf('%.3F', sin($a)).' '.sprintf('%.3F', cos($a)).' ';
+      $tmp .= sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' cm';
 
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+      $this->objects[$this->currentContents]['c'] .= $tmp;
 
-      $x0 =  0;
-      $y0 =  0;
+      $x0 = 0;
+      $y0 = 0;
     }
 
-    $t1 =  $astart;
-    $a0 =  $x0 + $r1*cos($t1);
-    $b0 =  $y0 + $r2*sin($t1);
-    $c0 =  -$r1 * sin($t1);
-    $d0 =  $r2 * cos($t1);
+    $t1 = $astart;
+    $a0 = $x0 + $r1 * cos($t1);
+    $b0 = $y0 + $r2 * sin($t1);
+    $c0 = -$r1 * sin($t1);
+    $d0 = $r2 * cos($t1);
 
-    $this->objects[$this->currentContents]['c'] .=  "\n".sprintf('%.3F', $a0) .' '.sprintf('%.3F', $b0) .' m ';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $a0).' '.sprintf('%.3F', $b0).' m ';
 
-    for  ($i = 1; $i <=  $nSeg; $i++) {
+    for ($i = 1; $i <= $nSeg; $i++) {
       // draw this bit of the total curve
-      $t1 =  $i * $dt + $astart;
-      $a1 =  $x0 + $r1 * cos($t1);
-      $b1 =  $y0 + $r2 * sin($t1);
+      $t1 = $i * $dt + $astart;
+      $a1 = $x0 + $r1 * cos($t1);
+      $b1 = $y0 + $r2 * sin($t1);
       $c1 = -$r1 * sin($t1);
-      $d1 =  $r2 * cos($t1);
+      $d1 = $r2 * cos($t1);
 
       $this->objects[$this->currentContents]['c']
-        .=  "\n".sprintf('%.3F', ($a0+$c0*$dtm)) .' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
+        .=  "\n".sprintf('%.3F', ($a0 + $c0 * $dtm)).' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
 
       $this->objects[$this->currentContents]['c'] .=
-        ' '.sprintf('%.3F', ($a1-$c1*$dtm)) .' '.sprintf('%.3F', ($b1-$d1*$dtm)) .' '.sprintf('%.3F', $a1) .' '.sprintf('%.3F', $b1) .' c';
+        ' '.sprintf('%.3F', ($a1 - $c1 * $dtm)).' '.sprintf('%.3F', ($b1 - $d1 * $dtm)).' '.sprintf('%.3F', $a1).' '.sprintf('%.3F', $b1).' c';
 
-      $a0 =  $a1;
-      $b0 =  $b1;
-      $c0 =  $c1;
-      $d0 =  $d1;
+      $a0 = $a1;
+      $b0 = $b1;
+      $c0 = $c1;
+      $d0 = $d1;
     }
 
-    if  ($fill) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+    if ($fill) {
+      $this->objects[$this->currentContents]['c'] .= ' f';
     } else if ($close) {
-        $this->objects[$this->currentContents]['c'].=  ' s';
+        $this->objects[$this->currentContents]['c'] .= ' s';
         // small 's' signifies closing the path as well
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+      $this->objects[$this->currentContents]['c'] .= ' S';
     }
 
-    if  ($angle !=  0) {
-      $this->objects[$this->currentContents]['c'].=  ' Q';
+    if ($angle != 0) {
+      $this->objects[$this->currentContents]['c'] .= ' Q';
     }
   }
 
@@ -2697,38 +2697,38 @@ 
    *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
    * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
    */
-  function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
+  function  setLineStyle($width = 1, $cap = '', $join = '', $dash = '', $phase = 0) {
     // this is quite inefficient in that it sets all the parameters whenever 1 is changed, but will fix another day
-    $string =  '';
+    $string = '';
 
-    if  ($width>0) {
-      $string.=  $width.' w';
+    if ($width > 0) {
+      $string .= $width.' w';
     }
 
-    $ca =  array('butt' => 0, 'round' => 1, 'square' => 2);
+    $ca = array('butt' => 0, 'round' => 1, 'square' => 2);
 
-    if  (isset($ca[$cap])) {
-      $string.=  ' '.$ca[$cap].' J';
+    if (isset($ca[$cap])) {
+      $string .= ' '.$ca[$cap].' J';
     }
 
-    $ja =  array('miter' => 0, 'round' => 1, 'bevel' => 2);
+    $ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
 
-    if  (isset($ja[$join])) {
-      $string.=  ' '.$ja[$join].' j';
+    if (isset($ja[$join])) {
+      $string .= ' '.$ja[$join].' j';
     }
 
-    if  (is_array($dash)) {
-      $string.=  ' [';
+    if (is_array($dash)) {
+      $string .= ' [';
 
       foreach ($dash as  $len) {
-        $string.=  ' '.$len;
+        $string .= ' '.$len;
       }
 
-      $string.=  ' ] '.$phase.' d';
+      $string .= ' ] '.$phase.' d';
     }
 
-    $this->currentLineStyle =  $string;
-    $this->objects[$this->currentContents]['c'].=  "\n".$string;
+    $this->currentLineStyle = $string;
+    $this->objects[$this->currentContents]['c'] .= "\n".$string;
   }
 
 
@@ -2736,18 +2736,18 @@ 
   /**
    * draw a polygon, the syntax for this is similar to the GD polygon command
    */
-  function  polygon($p, $np, $f =  0) {
-    $this->objects[$this->currentContents]['c'].=  "\n";
-    $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[0]) .' '.sprintf('%.3F', $p[1]) .' m ';
+  function  polygon($p, $np, $f = 0) {
+    $this->objects[$this->currentContents]['c'] .= "\n";
+    $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[0]).' '.sprintf('%.3F', $p[1]).' m ';
 
-    for  ($i =  2; $i < $np * 2; $i =  $i + 2) {
-      $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
+    for ($i = 2; $i < $np * 2; $i = $i + 2) {
+      $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[$i]).' '.sprintf('%.3F', $p[$i + 1]).' l ';
     }
 
-    if  ($f ==  1) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+    if ($f == 1) {
+      $this->objects[$this->currentContents]['c'] .= ' f';
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+      $this->objects[$this->currentContents]['c'] .= ' S';
     }
   }
 
@@ -2757,7 +2757,7 @@ 
    * the coordinates of the upper-right corner
    */
   function  filledRectangle($x1, $y1, $width, $height) {
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re f';
   }
 
 
@@ -2766,7 +2766,7 @@ 
    * the coordinates of the upper-right corner
    */
   function  rectangle($x1, $y1, $width, $height) {
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re S';
   }
 
 
@@ -2774,47 +2774,47 @@ 
    * add a new page to the document
    * this also makes the new page the current active object
    */
-  function  newPage($insert =  0, $id =  0, $pos =  'after') {
+  function  newPage($insert = 0, $id = 0, $pos = 'after') {
     // if there is a state saved, then go up the stack closing them
     // then on the new page, re-open them with the right setings
 
-    if  ($this->nStateStack) {
-      for  ($i =  $this->nStateStack;$i >=  1;$i--) {
+    if ($this->nStateStack) {
+      for ($i = $this->nStateStack; $i >= 1; $i--) {
         $this->restoreState($i);
       }
     }
 
     $this->numObj++;
 
-    if  ($insert) {
+    if ($insert) {
       // the id from the ezPdf class is the id of the contents of the page, not the page object itself
       // query that object to find the parent
-      $rid =  $this->objects[$id]['onPage'];
-      $opt =  array('rid' => $rid, 'pos' => $pos);
+      $rid = $this->objects[$id]['onPage'];
+      $opt = array('rid' => $rid, 'pos' => $pos);
       $this->o_page($this->numObj, 'new', $opt);
     } else {
       $this->o_page($this->numObj, 'new');
     }
 
     // if there is a stack saved, then put that onto the page
-    if  ($this->nStateStack) {
-      for  ($i =  1;$i <=  $this->nStateStack;$i++) {
+    if ($this->nStateStack) {
+      for ($i = 1; $i <= $this->nStateStack; $i++) {
         $this->saveState($i);
       }
     }
 
     // and if there has been a stroke or fill colour set, then transfer them
-    if  ($this->currentColour['r'] >=  0) {
+    if ($this->currentColour['r'] >= 0) {
       $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
     }
 
-    if  ($this->currentStrokeColour['r'] >=  0) {
+    if ($this->currentStrokeColour['r'] >= 0) {
       $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
     }
 
     // if there is a line style set, then put this in too
-    if  (mb_strlen($this->currentLineStyle, '8bit')) {
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
+    if (mb_strlen($this->currentLineStyle, '8bit')) {
+      $this->objects[$this->currentContents]['c'] .= "\n".$this->currentLineStyle;
     }
 
     // the call to the o_page object set currentContents to the present page, so this can be returned as the page id
@@ -2826,7 +2826,7 @@ 
    * output the pdf code, streaming it to the browser
    * the relevant headers are set so that hopefully the browser will recognise it
    */
-  function  stream($options =  '') {
+  function  stream($options = '') {
     // setting the options allows the adjustment of the headers
     // values at the moment are:
     // 'Content-Disposition' => 'filename'  - sets the filename, though not too sure how well this will
@@ -2836,36 +2836,36 @@ 
     //    them, so I am leaving it off by default.
     // 'compress' = > 1 or 0 - apply content stream compression, this is on (1) by default
     // 'Attachment' => 1 or 0 - if 1, force the browser to open a download dialog
-    if  (!is_array($options)) {
-      $options =  array();
+    if (!is_array($options)) {
+      $options = array();
     }
 
-    if  ( headers_sent())
+    if (headers_sent())
       die("Unable to stream pdf: headers already sent");
 
-    if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
-      $tmp =  ltrim($this->output(1));
+    if (isset($options['compress']) && $options['compress'] == 0) {
+      $tmp = ltrim($this->output(1));
     } else {
-      $tmp =  ltrim($this->output());
+      $tmp = ltrim($this->output());
     }
 
     header("Cache-Control: private");
     header("Content-type: application/pdf");
 
     //FIXME: I don't know that this is sufficient for determining content length (i.e. what about transport compression?)
-    header("Content-Length: " . mb_strlen($tmp, '8bit'));
-    $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
+    header("Content-Length: ".mb_strlen($tmp, '8bit'));
+    $fileName = (isset($options['Content-Disposition']) ? $options['Content-Disposition'] : 'file.pdf');
 
-    if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+    if (!isset($options["Attachment"]))
+      $options["Attachment"] = true;
 
-    $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
+    $attachment = $options["Attachment"] ? "attachment" : "inline";
 
     header("Content-Disposition: $attachment; filename=\"$fileName\"");
 
-    if  (isset($options['Accept-Ranges']) &&  $options['Accept-Ranges'] ==  1) {
+    if (isset($options['Accept-Ranges']) && $options['Accept-Ranges'] == 1) {
       //FIXME: Is this the correct value ... spec says 1#range-unit
-      header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
+      header("Accept-Ranges: ".mb_strlen($tmp, '8bit'));
     }
 
     echo  $tmp;
@@ -2877,12 +2877,12 @@ 
    * return the height in units of the current font in the given size
    */
   function  getFontHeight($size) {
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
     
     // for the current font, and the given size, what is the height of the font in user units
-    $h =  $this->fonts[$this->currentFont]['FontBBox'][3]-$this->fonts[$this->currentFont]['FontBBox'][1];
+    $h = $this->fonts[$this->currentFont]['FontBBox'][3] - $this->fonts[$this->currentFont]['FontBBox'][1];
 
     // have to adjust by a font offset for Windows fonts.  unfortunately it looks like
     // the bounding box calculations are wrong and I don't know why.
@@ -2894,10 +2894,10 @@ 
       // Courier font.
       //
       // Both have been added manually to the .afm and .ufm files.
-      $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
+      $h += (int) $this->fonts[$this->currentFont]['FontHeightOffset'];
     }
 
-    return  $size*$h/1000;
+    return  $size * $h / 1000;
   }
 
 
@@ -2908,14 +2908,14 @@ 
    */
   function  getFontDescender($size) {
     // note that this will most likely return a negative value
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     //$h = $this->fonts[$this->currentFont]['FontBBox'][1];
     $h = $this->fonts[$this->currentFont]['Descender'];
 
-    return  $size*$h/1000;
+    return  $size * $h / 1000;
   }
 
 
@@ -2933,7 +2933,7 @@ 
   	$cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
       $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-      $text =  $this->utf8toUtf16BE($text, $bom);
+      $text = $this->utf8toUtf16BE($text, $bom);
     } else {
       if (in_array('Windows-1252', mb_list_encodings())) {
         $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
@@ -3034,7 +3034,7 @@ 
    * @return string UTF-16 result string
    */
   function  utf8toUtf16BE(&$text, $bom = true) {
-    $cf =  $this->currentFont;
+    $cf = $this->currentFont;
     if (!$this->fonts[$cf]['isUnicode']) return $text;
     $out = $bom ? "\xFE\xFF" : '';
     
@@ -3067,15 +3067,15 @@ 
    */
   function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
-    $w =  $this->getTextWidth($size, $text);
+    $w = $this->getTextWidth($size, $text);
 
     // need to adjust for the number of spaces in this text
-    $words =  explode(' ', $text);
-    $nspaces =  count($words) -1;
-    $w+=  $wa*$nspaces;
-    $a =  deg2rad((float)$angle);
+    $words = explode(' ', $text);
+    $nspaces = count($words) - 1;
+    $w += $wa * $nspaces;
+    $a = deg2rad((float) $angle);
 
-    return  array(cos($a) *$w+$x, -sin($a) *$w+$y);
+    return  array(cos($a) * $w + $x, -sin($a) * $w + $y);
   }
 
 
@@ -3086,8 +3086,8 @@ 
    */
   function  PRVTcheckTextDirective(&$text, $i, &$f) {
     return  0;
-    $x =  0;
-    $y =  0;
+    $x = 0;
+    $y = 0;
     return  $this->PRVTcheckTextDirective1($text, $i, $f, 0, $x, $y);
   }
 
@@ -3101,16 +3101,16 @@ 
    *
    * @access private
    */
-  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
+  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size = 0, $angle = 0, $wordSpaceAdjust = 0) {
     return  0;
-    $directive =  0;
-    $j =  $i;
-    if  ($text[$j] === '<') {
+    $directive = 0;
+    $j = $i;
+    if ($text[$j] === '<') {
       $j++;
       switch ($text[$j]) {
       case  '/':
         $j++;
-        if  (mb_strlen($text) <=  $j) {
+        if (mb_strlen($text) <= $j) {
           return  $directive;
         }
 
@@ -3118,60 +3118,60 @@ 
         case  'b':
         case  'i':
           $j++;
-          if  ($text[$j] === '>') {
-            $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
+          if ($text[$j] === '>') {
+            $p = mb_strrpos($this->currentTextState, $text[$j - 1]);
 
-            if  ($p !==  false) {
+            if ($p !== false) {
               // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+              $this->currentTextState = mb_substr($this->currentTextState, 0, $p).substr($this->currentTextState, $p + 1);
             }
 
-            $directive =  $j-$i+1;
+            $directive = $j - $i + 1;
           }
           break;
 
         case  'c':
           // this this might be a callback function
           $j++;
-          $k =  mb_strpos($text, '>', $j);
+          $k = mb_strpos($text, '>', $j);
 
-          if  ($k !==  false &&  $text[$j] === ':') {
+          if ($k !== false && $text[$j] === ':') {
             // then this will be treated as a callback directive
-            $directive =  $k-$i+1;
-            $f =  0;
+            $directive = $k - $i + 1;
+            $f = 0;
             // split the remainder on colons to get the function name and the paramater
-            $tmp =  mb_substr($text, $j+1, $k-$j-1);
-            $b1 =  mb_strpos($tmp, ':');
+            $tmp = mb_substr($text, $j + 1, $k - $j - 1);
+            $b1 = mb_strpos($tmp, ':');
 
-            if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
+            if ($b1 !== false) {
+              $func = mb_substr($tmp, 0, $b1);
+              $parm = mb_substr($tmp, $b1 + 1);
             } else {
-              $func =  $tmp;
-              $parm =  '';
+              $func = $tmp;
+              $parm = '';
             }
 
-            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
+            if (!isset($func) || !mb_strlen(trim($func), '8bit')) {
+              $directive = 0;
             } else {
               // only call the function if this is the final call
-              if  ($final) {
+              if ($final) {
                 // need to assess the text position, calculate the text width to this point
                 // can use getTextWidth to find the text width I think
-                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+                $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-                $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
-                $x =  $tmp[0];
-                $y =  $tmp[1];
-                $ret =  $this->$func($info);
+                $info = array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
+                $x = $tmp[0];
+                $y = $tmp[1];
+                $ret = $this->$func($info);
 
-                if  (is_array($ret)) {
+                if (is_array($ret)) {
                   // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
+                  foreach ($ret as  $rk => $rv) {
                     switch ($rk) {
                     case  'x':
                     case  'y':
-                      $$rk =  $rv;
+                      $$rk = $rv;
                       break;
                     }
                   }
@@ -3180,8 +3180,8 @@ 
                 // also remove from to the stack
                 // for simplicity, just take from the end, fix this another day
                 $this->nCallback--;
-                if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
+                if ($this->nCallback < 0) {
+                  $this->nCallBack = 0;
                 }
               }
             }
@@ -3193,49 +3193,49 @@ 
       case  'b':
       case  'i':
         $j++;
-        if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
+        if ($text[$j] === '>') {
+          $this->currentTextState .= $text[$j - 1];
+          $directive = $j - $i + 1;
         }
         break;
 
       case  'C':
-        $noClose =  1;
+        $noClose = 1;
       case  'c':
         // this this might be a callback function
         $j++;
-        $k =  mb_strpos($text, '>', $j);
+        $k = mb_strpos($text, '>', $j);
 
-        if  ($k !==  false &&  $text[$j] ===  ':') {
+        if ($k !== false && $text[$j] === ':') {
           // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+          $directive = $k - $i + 1;
 
-          $f =  0;
+          $f = 0;
 
           // split the remainder on colons to get the function name and the paramater
           //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+          $tmp = mb_substr($text, $j + 1, $k - $j - 1);
+          $b1 = mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
-            $func =  mb_substr($tmp, 0, $b1);
-            $parm =  mb_substr($tmp, $b1+1);
+          if ($b1 !== false) {
+            $func = mb_substr($tmp, 0, $b1);
+            $parm = mb_substr($tmp, $b1 + 1);
           } else {
-            $func =  $tmp;
-            $parm =  '';
+            $func = $tmp;
+            $parm = '';
           }
 
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-            $directive =  0;
+          if (!isset($func) || !mb_strlen(trim($func), '8bit')) {
+            $directive = 0;
           } else {
             // only call the function if this is the final call, ie, the one actually doing printing, not measurement
-            if  ($final) {
+            if ($final) {
               // need to assess the text position, calculate the text width to this point
               // can use getTextWidth to find the text width I think
               // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+              $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-              $info =  array(
+              $info = array(
                 'x' => $tmp[0], 
                 'y' => $tmp[1], 
                 'angle' => $angle, 
@@ -3245,24 +3245,24 @@ 
                 'height' => $this->getFontHeight($size), 
                 'descender' => $this->getFontDescender($size)
               );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
+              $x = $tmp[0];
+              $y = $tmp[1];
 
-              if  (!isset($noClose) ||  !$noClose) {
+              if (!isset($noClose) || !$noClose) {
                 // only add to the stack if this is a small 'c', therefore is a start-stop pair
                 $this->nCallback++;
-                $info['nCallback'] =  $this->nCallback;
-                $this->callback[$this->nCallback] =  $info;
+                $info['nCallback'] = $this->nCallback;
+                $this->callback[$this->nCallback] = $info;
               }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
+              $ret = $this->$func($info);
+              if (is_array($ret)) {
                 // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                foreach($ret as  $rk => $rv) {
+                foreach ($ret as  $rk => $rv) {
                   switch ($rk) {
                   case  'x':
                   case  'y':
-                    $$rk =  $rv;
+                    $$rk = $rv;
                     break;
                   }
                 }
@@ -3281,16 +3281,16 @@ 
   /**
    * add text to the document, at a specified location, size and angle on the page
    */
-  function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
-    if  (!$this->numFonts) {
+  function  addText($x, $y, $size, $text, $angle = 0, $wordSpaceAdjust = 0) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     // if there are any open callbacks, then they should be called, to show the start of the line
-    if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+    if ($this->nCallback > 0) {
+      for ($i = $this->nCallback; $i > 0; $i--) {
         // call each function
-        $info =  array('x' => $x,
+        $info = array('x' => $x,
                        'y' => $y,
                        'angle' => $angle,
                        'status' => 'sol',
@@ -3299,28 +3299,28 @@ 
                        'height' => $this->callback[$i]['height'],
                        'descender' => $this->callback[$i]['descender']);
 
-        $func =  $this->callback[$i]['f'];
+        $func = $this->callback[$i]['f'];
         $this->$func($info);
       }
     }
 
-    if  ($angle ==  0) {
-      $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
+    if ($angle == 0) {
+      $this->objects[$this->currentContents]['c'] .= "\n".'BT '.sprintf('%.3F', $x).' '.sprintf('%.3F', $y).' Td';
     } else {
-      $a =  deg2rad((float)$angle);
-      $tmp =  "\n".'BT ';
-      $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+      $a = deg2rad((float) $angle);
+      $tmp = "\n".'BT ';
+      $tmp .= sprintf('%.3F', cos($a)).' '.sprintf('%.3F', (-1.0 * sin($a))).' '.sprintf('%.3F', sin($a)).' '.sprintf('%.3F', cos($a)).' ';
+      $tmp .= sprintf('%.3F', $x).' '.sprintf('%.3F', $y).' Tm';
+      $this->objects[$this->currentContents]['c'] .= $tmp;
     }
 
-    if  ($wordSpaceAdjust !=  0 ||  $wordSpaceAdjust !=  $this->wordSpaceAdjust) {
-      $this->wordSpaceAdjust =  $wordSpaceAdjust;
-      $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
+    if ($wordSpaceAdjust != 0 || $wordSpaceAdjust != $this->wordSpaceAdjust) {
+      $this->wordSpaceAdjust = $wordSpaceAdjust;
+      $this->objects[$this->currentContents]['c'] .= ' '.sprintf('%.3F', $wordSpaceAdjust).' Tw';
     }
 
-    $len =  mb_strlen($text);
-    $start =  0;
+    $len = mb_strlen($text);
+    $start = 0;
 
     /*
      for ($i = 0;$i<$len;$i++){
@@ -3365,20 +3365,20 @@ 
 
      }
     */
-    if  ($start < $len) {
-      $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
-      $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
-      $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
+    if ($start < $len) {
+      $part = $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
+      $this->objects[$this->currentContents]['c'] .= ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size).' Tf ';
+      $this->objects[$this->currentContents]['c'] .= ' ('.$this->filterText($part, false).') Tj';
     }
 
-    $this->objects[$this->currentContents]['c'].=  ' ET';
+    $this->objects[$this->currentContents]['c'] .= ' ET';
 
     // if there are any open callbacks, then they should be called, to show the end of the line
-    if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+    if ($this->nCallback > 0) {
+      for ($i = $this->nCallback; $i > 0; $i--) {
         // call each function
-        $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
-        $info =  array(
+        $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
+        $info = array(
           'x' => $tmp[0], 
           'y' => $tmp[1], 
           'angle' => $angle,
@@ -3388,7 +3388,7 @@ 
           'height' => $this->callback[$i]['height'], 
           'descender' => $this->callback[$i]['descender']
         );
-        $func =  $this->callback[$i]['f'];
+        $func = $this->callback[$i]['f'];
         $this->$func($info);
       }
     }
@@ -3399,68 +3399,68 @@ 
    * calculate how wide a given text string will be on a page, at a given size.
    * this can be called externally, but is alse used by the other class functions
    */
-  function  getTextWidth($size, $text, $spacing =  0) {
+  function  getTextWidth($size, $text, $spacing = 0) {
     // this function should not change any of the settings, though it will need to
     // track any directives which change during calculation, so copy them at the start
     // and put them back at the end.
-    $store_currentTextState =  $this->currentTextState;
+    $store_currentTextState = $this->currentTextState;
 
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     // converts a number or a float to a string so it can get the width
-    $text =  "$text";
+    $text = "$text";
 
     // hmm, this is where it all starts to get tricky - use the font information to
     // calculate the width of each character, add them up and convert to user units
-    $w =  0;
-    $cf =  $this->currentFont;
-    $space_scale =  1000 / $size;
-    if ( $this->fonts[$cf]['isUnicode']) {
+    $w = 0;
+    $cf = $this->currentFont;
+    $space_scale = 1000 / $size;
+    if ($this->fonts[$cf]['isUnicode']) {
       // for Unicode, use the code points array to calculate width rather
       // than just the string itself
-      $unicode =  $this->utf8toCodePointsArray($text);
+      $unicode = $this->utf8toCodePointsArray($text);
 
       foreach ($unicode as $char) {
         // check if we have to replace character
-      if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+      if (isset($this->fonts[$cf]['differences'][$char])) {
+          $char = $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
-        if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+        if (isset($this->fonts[$cf]['C'][$char]['WX'])) {
+          $w += $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
-        if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+        if ($char == 32) {  // Space
+          $w += $spacing * $space_scale;
         }
       }
 
     } else {
-      $len =  mb_strlen($text, 'Windows-1252');
+      $len = mb_strlen($text, 'Windows-1252');
 
-      for  ($i =  0; $i < $len; $i++) {
-        $char =  ord($text[$i]);
+      for ($i = 0; $i < $len; $i++) {
+        $char = ord($text[$i]);
         // check if we have to replace character
-        if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+        if (isset($this->fonts[$cf]['differences'][$char])) {
+          $char = $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
-        if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-        $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+        if (isset($this->fonts[$cf]['C'][$char]['WX'])) {
+        $w += $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
-        if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+        if ($char == 32) {  // Space
+          $w += $spacing * $space_scale;
         }
       }
     }
 
-    $this->currentTextState =  $store_currentTextState;
+    $this->currentTextState = $store_currentTextState;
     $this->setCurrentFont();
 
-    return  $w*$size/1000;
+    return  $w * $size / 1000;
   }
 
 
@@ -3470,28 +3470,28 @@ 
    * @access private
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
-    switch  ($justification) {
+    switch ($justification) {
     case  'left':
       return;
 
     case  'right':
-      $x+=  $width-$actual;
+      $x += $width - $actual;
       break;
 
     case  'center':
     case  'centre':
-      $x+=  ($width-$actual) /2;
+      $x += ($width - $actual) / 2;
       break;
 
     case  'full':
       // count the number of words
-      $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+      $words = explode(' ', $text);
+      $nspaces = count($words) - 1;
 
-      if  ($nspaces>0) {
-        $adjust =  ($width-$actual) /$nspaces;
+      if ($nspaces > 0) {
+        $adjust = ($width - $actual) / $nspaces;
       } else {
-        $adjust =  0;
+        $adjust = 0;
       }
       break;
     }
@@ -3504,9 +3504,9 @@ 
    * and return the remainder.
    * justification and angle can also be specified for the text
    */
-  function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
+  function  addTextWrap($x, $y, $width, $size, $text, $justification = 'left', $angle = 0, $test = 0) {
   	// TODO - need to support Unicode
-    $cf =  $this->currentFont;
+    $cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
         die("addTextWrap does not support Unicode yet!");
     }
@@ -3518,89 +3518,89 @@ 
 
     // need to store the initial text state, as this will change during the width calculation
     // but will need to be re-set before printing, so that the chars work out right
-    $store_currentTextState =  $this->currentTextState;
+    $store_currentTextState = $this->currentTextState;
 
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
-    if  ($width <=  0) {
+    if ($width <= 0) {
       // error, pretend it printed ok, otherwise risking a loop
       return  '';
     }
 
-    $w =  0;
-    $break =  0;
-    $breakWidth =  0;
-    $len =  mb_strlen($text);
-    $cf =  $this->currentFont;
-    $tw =  $width/$size*1000;
+    $w = 0;
+    $break = 0;
+    $breakWidth = 0;
+    $len = mb_strlen($text);
+    $cf = $this->currentFont;
+    $tw = $width / $size * 1000;
 
-    for  ($i =  0;$i<$len;$i++) {
-      $f =  1;
-      $directive =  0;
+    for ($i = 0; $i < $len; $i++) {
+      $f = 1;
+      $directive = 0;
       //$this->PRVTcheckTextDirective($text,$i,$f);
-      if  ($directive) {
-        if  ($f) {
+      if ($directive) {
+        if ($f) {
           $this->setCurrentFont();
-          $cf =  $this->currentFont;
+          $cf = $this->currentFont;
         }
 
-        $i =  $i+$directive-1;
+        $i = $i + $directive - 1;
       } else {
-        $cOrd =  ord($text[$i]);
+        $cOrd = ord($text[$i]);
 
-        if  (isset($this->fonts[$cf]['differences'][$cOrd])) {
+        if (isset($this->fonts[$cf]['differences'][$cOrd])) {
           // then this character is being replaced by another
-          $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
+          $cOrd2 = $this->fonts[$cf]['differences'][$cOrd];
         } else {
-          $cOrd2 =  $cOrd;
+          $cOrd2 = $cOrd;
         }
 
-        if  (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
+        if (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
+          $w += $this->fonts[$cf]['C'][$cOrd2]['WX'];
         }
 
-        if  ($w>$tw) {
+        if ($w > $tw) {
           // then we need to truncate this line
-          if  ($break>0) {
+          if ($break > 0) {
             // then we have somewhere that we can split :)
-            if  ($text[$break] ===  ' ') {
-              $tmp =  mb_substr($text, 0, $break);
+            if ($text[$break] === ' ') {
+              $tmp = mb_substr($text, 0, $break);
             } else {
-              $tmp =  mb_substr($text, 0, $break+1);
+              $tmp = mb_substr($text, 0, $break + 1);
             }
 
-            $adjust =  0;
+            $adjust = 0;
             $this->PRVTadjustWrapText($tmp, $breakWidth, $width, $x, $adjust, $justification);
 
             // reset the text state
-            $this->currentTextState =  $store_currentTextState;
+            $this->currentTextState = $store_currentTextState;
             $this->setCurrentFont();
 
-            if  (!$test) {
+            if (!$test) {
               $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
-            return  mb_substr($text, $break+1);
+            return  mb_substr($text, $break + 1);
           } else {
             // just split before the current character
-            $tmp =  mb_substr($text, 0, $i);
-            $adjust =  0;
-            $ctmp =  ord($text[$i]);
+            $tmp = mb_substr($text, 0, $i);
+            $adjust = 0;
+            $ctmp = ord($text[$i]);
 
-            if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-              $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+            if (isset($this->fonts[$cf]['differences'][$ctmp])) {
+              $ctmp = $this->fonts[$cf]['differences'][$ctmp];
             }
 
-            $tmpw =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+            $tmpw = ($w - $this->fonts[$cf]['C'][$ctmp]['WX']) * $size / 1000;
             $this->PRVTadjustWrapText($tmp, $tmpw, $width, $x, $adjust, $justification);
 
             // reset the text state
-            $this->currentTextState =  $store_currentTextState;
+            $this->currentTextState = $store_currentTextState;
             $this->setCurrentFont();
 
-            if  (!$test) {
+            if (!$test) {
               $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
@@ -3608,39 +3608,39 @@ 
           }
         }
 
-        if  ($text[$i] ===  '-') {
-          $break =  $i;
-          $breakWidth =  $w*$size/1000;
+        if ($text[$i] === '-') {
+          $break = $i;
+          $breakWidth = $w * $size / 1000;
         }
 
-        if  ($text[$i] ===  ' ') {
-          $break =  $i;
-          $ctmp =  ord($text[$i]);
+        if ($text[$i] === ' ') {
+          $break = $i;
+          $ctmp = ord($text[$i]);
 
-          if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-            $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+          if (isset($this->fonts[$cf]['differences'][$ctmp])) {
+            $ctmp = $this->fonts[$cf]['differences'][$ctmp];
           }
 
-          $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+          $breakWidth = ($w - $this->fonts[$cf]['C'][$ctmp]['WX']) * $size / 1000;
         }
       }
     }
 
     // then there was no need to break this line
-    if  ($justification ===  'full') {
-      $justification =  'left';
+    if ($justification === 'full') {
+      $justification = 'left';
     }
 
-    $adjust =  0;
-    $tmpw =  $w*$size/1000;
+    $adjust = 0;
+    $tmpw = $w * $size / 1000;
 
     $this->PRVTadjustWrapText($text, $tmpw, $width, $x, $adjust, $justification);
 
     // reset the text state
-    $this->currentTextState =  $store_currentTextState;
+    $this->currentTextState = $store_currentTextState;
     $this->setCurrentFont();
 
-    if  (!$test) {
+    if (!$test) {
       $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
     }
 
@@ -3654,45 +3654,45 @@ 
    * This is to get around not being able to have open 'q' across pages
    *
    */
-  function  saveState($pageEnd =  0) {
-    if  ($pageEnd) {
+  function  saveState($pageEnd = 0) {
+    if ($pageEnd) {
       // this will be called at a new page to return the state to what it was on the
       // end of the previous page, before the stack was closed down
       // This is to get around not being able to have open 'q' across pages
-      $opt =  $this->stateStack[$pageEnd];
+      $opt = $this->stateStack[$pageEnd];
       // ok to use this as stack starts numbering at 1
       $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
       $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
-      $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
+      $this->objects[$this->currentContents]['c'] .= "\n".$opt['lin'];
       //    $this->currentLineStyle = $opt['lin'];
     } else {
       $this->nStateStack++;
-      $this->stateStack[$this->nStateStack] =  array(
+      $this->stateStack[$this->nStateStack] = array(
         'col' => $this->currentColour, 
         'str' => $this->currentStrokeColour, 
         'lin' => $this->currentLineStyle
       );
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
   }
 
 
   /**
    * restore a previously saved state
    */
-  function  restoreState($pageEnd =  0) {
-    if  (!$pageEnd) {
-      $n =  $this->nStateStack;
-      $this->currentColour =  $this->stateStack[$n]['col'];
-      $this->currentStrokeColour =  $this->stateStack[$n]['str'];
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
-      $this->currentLineStyle =  $this->stateStack[$n]['lin'];
+  function  restoreState($pageEnd = 0) {
+    if (!$pageEnd) {
+      $n = $this->nStateStack;
+      $this->currentColour = $this->stateStack[$n]['col'];
+      $this->currentStrokeColour = $this->stateStack[$n]['str'];
+      $this->objects[$this->currentContents]['c'] .= "\n".$this->stateStack[$n]['lin'];
+      $this->currentLineStyle = $this->stateStack[$n]['lin'];
       unset($this->stateStack[$n]);
       $this->nStateStack--;
     }
     
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
@@ -3704,12 +3704,12 @@ 
    */
   function  openObject() {
     $this->nStack++;
-    $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
+    $this->stack[$this->nStack] = array('c' => $this->currentContents, 'p' => $this->currentPage);
     // add a new object of the content type, to hold the data flow
     $this->numObj++;
     $this->o_contents($this->numObj, 'new');
-    $this->currentContents =  $this->numObj;
-    $this->looseObjects[$this->numObj] =  1;
+    $this->currentContents = $this->numObj;
+    $this->looseObjects[$this->numObj] = 1;
 
     return  $this->numObj;
   }
@@ -3720,12 +3720,12 @@ 
    */
   function  reopenObject($id) {
     $this->nStack++;
-    $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
-    $this->currentContents =  $id;
+    $this->stack[$this->nStack] = array('c' => $this->currentContents, 'p' => $this->currentPage);
+    $this->currentContents = $id;
 
     // also if this object is the primary contents for a page, then set the current page to its parent
-    if  (isset($this->objects[$id]['onPage'])) {
-      $this->currentPage =  $this->objects[$id]['onPage'];
+    if (isset($this->objects[$id]['onPage'])) {
+      $this->currentPage = $this->objects[$id]['onPage'];
     }
   }
 
@@ -3736,9 +3736,9 @@ 
   function  closeObject() {
     // close the object, as long as there was one open in the first place, which will be indicated by
     // an objectId on the stack.
-    if  ($this->nStack>0) {
-      $this->currentContents =  $this->stack[$this->nStack]['c'];
-      $this->currentPage =  $this->stack[$this->nStack]['p'];
+    if ($this->nStack > 0) {
+      $this->currentContents = $this->stack[$this->nStack]['c'];
+      $this->currentPage = $this->stack[$this->nStack]['p'];
       $this->nStack--;
       // easier to probably not worry about removing the old entries, they will be overwritten
       // if there are new ones.
@@ -3752,8 +3752,8 @@ 
   function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
     // be the last one that could contian it.
-    if  (isset($this->addLooseObjects[$id])) {
-      $this->addLooseObjects[$id] =  '';
+    if (isset($this->addLooseObjects[$id])) {
+      $this->addLooseObjects[$id] = '';
     }
   }
 
@@ -3761,18 +3761,18 @@ 
   /**
    * after an object has been created, it wil only show if it has been added, using this function.
    */
-  function  addObject($id, $options =  'add') {
+  function  addObject($id, $options = 'add') {
     // add the specified object to the page
-    if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
+    if (isset($this->looseObjects[$id]) && $this->currentContents != $id) {
       // then it is a valid object, and it is not being added to itself
       switch ($options) {
       case  'all':
         // then this object is to be added to this page (done in the next block) and
         // all future new pages.
-        $this->addLooseObjects[$id] =  'all';
+        $this->addLooseObjects[$id] = 'all';
 
       case  'add':
-        if  (isset($this->objects[$this->currentContents]['onPage'])) {
+        if (isset($this->objects[$this->currentContents]['onPage'])) {
           // then the destination contents is the primary for the page
           // (though this object is actually added to that page)
           $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
@@ -3780,33 +3780,33 @@ 
         break;
 
       case  'even':
-        $this->addLooseObjects[$id] =  'even';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
+        $this->addLooseObjects[$id] = 'even';
+        $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+        if ($this->objects[$pageObjectId]['info']['pageNum'] % 2 == 0) {
           $this->addObject($id);
           // hacky huh :)
         }
         break;
 
       case  'odd':
-        $this->addLooseObjects[$id] =  'odd';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
+        $this->addLooseObjects[$id] = 'odd';
+        $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+        if ($this->objects[$pageObjectId]['info']['pageNum'] % 2 == 1) {
           $this->addObject($id);
           // hacky huh :)
         }
         break;
 
       case  'next':
-        $this->addLooseObjects[$id] =  'all';
+        $this->addLooseObjects[$id] = 'all';
         break;
 
       case  'nexteven':
-        $this->addLooseObjects[$id] =  'even';
+        $this->addLooseObjects[$id] = 'even';
         break;
 
       case  'nextodd':
-        $this->addLooseObjects[$id] =  'odd';
+        $this->addLooseObjects[$id] = 'odd';
         break;
       }
     }
@@ -3817,8 +3817,8 @@ 
    * return a storable representation of a specific object
    */
   function  serializeObject($id) {
-    if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
+    if (array_key_exists($id, $this->objects))
+      return  var_export($this->objects[$id], true);
   }
 
 
@@ -3826,8 +3826,8 @@ 
    * restore an object from its stored representation.  returns its new object id.
    */
   function  restoreSerializedObject($obj) {
-    $obj_id =  $this->openObject();
-    eval('$this->objects[$obj_id] = ' . $obj . ';');
+    $obj_id = $this->openObject();
+    eval('$this->objects[$obj_id] = '.$obj.';');
     $this->closeObject();
     return  $obj_id;
   }
@@ -3836,12 +3836,12 @@ 
   /**
    * add content to the documents info object
    */
-  function  addInfo($label, $value =  0) {
+  function  addInfo($label, $value = 0) {
     // this will only work if the label is one of the valid ones.
     // modify this so that arrays can be passed as well.
     // if $label is an array then assume that it is key => value pairs
     // else assume that they are both scalar, anything else will probably error
-    if  (is_array($label)) {
+    if (is_array($label)) {
       foreach ($label as  $l => $v) {
         $this->o_info($this->infoObject, $l, $v);
       }
@@ -3854,9 +3854,9 @@ 
   /**
    * set the viewer preferences of the document, it is up to the browser to obey these.
    */
-  function  setPreferences($label, $value =  0) {
+  function  setPreferences($label, $value = 0) {
     // this will only work if the label is one of the valid ones.
-    if  (is_array($label)) {
+    if (is_array($label)) {
       foreach ($label as  $l => $v) {
         $this->o_catalog($this->catalogId, 'viewerPreferences', array($l => $v));
       }
@@ -3873,10 +3873,10 @@ 
    */
   function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
-    $ret =  0;
-    for  ($i =  0;$i<$num;$i++) {
-      $ret =  $ret*256;
-      $ret+=  ord($data[$pos+$i]);
+    $ret = 0;
+    for ($i = 0; $i < $num; $i++) {
+      $ret = $ret * 256;
+      $ret += ord($data[$pos + $i]);
     }
 
     return  $ret;
@@ -3887,9 +3887,9 @@ 
    * add a PNG image into the document, from a GD object
    * this should work with remote files
    */
-  function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
+  function addImagePng($file, $x, $y, $w = 0, $h = 0, &$img) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
+	if (isset($this->imagelist[$file])) {
 	  $data = null;
 	} else {
   	  // Example for transparency handling on new image. Retain for current image
@@ -3905,7 +3905,7 @@ 
 	  //default, but explicitely set to ensure pdf compatibility
       imagesavealpha($img, false);
       
-      $error =  0;
+      $error = 0;
       //DEBUG_IMG_TEMP
       //debugpng
       if (DEBUGPNG) print '[addImagePng '.$file.']';
@@ -3923,7 +3923,7 @@ 
         if (DEBUGPNG) print 'trouble writing file from GD';
 	  }
 
-      if  ($error) {
+      if ($error) {
         $this->addMessage('PNG error - ('.$file.') '.$errormsg);
         return;
       }
@@ -3937,9 +3937,9 @@ 
    * add a PNG image into the document, from a file
    * this should work with remote files
    */
-  function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
+  function  addPngFromFile($file, $x, $y, $w = 0, $h = 0) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
+	if (isset($this->imagelist[$file])) {
 	  $img = null;
 	} else {
       //png files typically contain an alpha channel.
@@ -3958,18 +3958,18 @@ 
       }
       $sx = imagesx($imgtmp);
       $sy = imagesy($imgtmp);
-      $img = imagecreatetruecolor($sx,$sy);
+      $img = imagecreatetruecolor($sx, $sy);
       imagealphablending($img, true);
   	  $ti = imagecolortransparent($imgtmp);
 	  if ($ti >= 0) {
-	    $tc = imagecolorsforindex($imgtmp,$ti);
-        $ti = imagecolorallocate($img,$tc['red'],$tc['green'],$tc['blue']);
-        imagefill($img,0,0,$ti);
+	    $tc = imagecolorsforindex($imgtmp, $ti);
+        $ti = imagecolorallocate($img, $tc['red'], $tc['green'], $tc['blue']);
+        imagefill($img, 0, 0, $ti);
         imagecolortransparent($img, $ti);
       } else {
-        imagefill($img,1,1,imagecolorallocate($img,255,255,255));
+        imagefill($img, 1, 1, imagecolorallocate($img, 255, 255, 255));
       }
-      imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
+      imagecopy($img, $imgtmp, 0, 0, 0, 0, $sx, $sy);
       imagedestroy($imgtmp);
     }
     $this->addImagePng($file, $x, $y, $w, $h, $img);
@@ -3979,8 +3979,8 @@ 
   /**
    * add a PNG image into the document, from a memory buffer of the file
    */
-  function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
-	if ( isset($this->imagelist[$file]) ) {
+  function  addPngFromBuf($file, $x, $y, $w = 0, $h = 0, &$data) {
+	if (isset($this->imagelist[$file])) {
       //debugpng
       //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
 	  $data = null;
@@ -3995,81 +3995,81 @@ 
       }
       //debugpng
       //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
-    $error =  0;
+    $error = 0;
 
-    if  (!$error) {
-      $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
-      if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
-        $error =  1;
+    if (!$error) {
+      $header = chr(137).chr(80).chr(78).chr(71).chr(13).chr(10).chr(26).chr(10);
+      if (mb_substr($data, 0, 8, '8bit') != $header) {
+        $error = 1;
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
 
-        $errormsg =  'this file does not have a valid header';
+        $errormsg = 'this file does not have a valid header';
       }
     }
 
 
-    if  (!$error) {
+    if (!$error) {
       // set pointer
-      $p =  8;
-      $len =  mb_strlen($data, '8bit');
+      $p = 8;
+      $len = mb_strlen($data, '8bit');
 
       // cycle through the file, identifying chunks
-      $haveHeader =  0;
-      $info =  array();
-      $idata =  '';
-      $pdata =  '';
-
-      while  ($p < $len) {
-        $chunkLen =  $this->PRVT_getBytes($data, $p, 4);
-        $chunkType =  mb_substr($data, $p+4, 4, '8bit');
+      $haveHeader = 0;
+      $info = array();
+      $idata = '';
+      $pdata = '';
+
+      while ($p < $len) {
+        $chunkLen = $this->PRVT_getBytes($data, $p, 4);
+        $chunkType = mb_substr($data, $p + 4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
         switch ($chunkType) {
         case  'IHDR':
           // this is where all the file information comes from
-          $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
+          $info['width'] = $this->PRVT_getBytes($data, $p + 8, 4);
+          $info['height'] = $this->PRVT_getBytes($data, $p + 12, 4);
+          $info['bitDepth'] = ord($data[$p + 16]);
+          $info['colorType'] = ord($data[$p + 17]);
+          $info['compressionMethod'] = ord($data[$p + 18]);
+          $info['filterMethod'] = ord($data[$p + 19]);
+          $info['interlaceMethod'] = ord($data[$p + 20]);
 
           //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
-            $error =  1;
+          $haveHeader = 1;
+          if ($info['compressionMethod'] != 0) {
+            $error = 1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
 
-            $errormsg =  'unsupported compression method';
+            $errormsg = 'unsupported compression method';
           }
 
-          if  ($info['filterMethod'] !=  0) {
-            $error =  1;
+          if ($info['filterMethod'] != 0) {
+            $error = 1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
-            $errormsg =  'unsupported filter method';
+            $errormsg = 'unsupported filter method';
           }
           break;
 
         case  'PLTE':
-          $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+          $pdata .= mb_substr($data, $p + 8, $chunkLen, '8bit');
           break;
 
         case  'IDAT':
-          $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+          $idata .= mb_substr($data, $p + 8, $chunkLen, '8bit');
           break;
 
         case  'tRNS':
           //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
           //print "tRNS found, color type = ".$info['colorType']."\n";
-          $transparency =  array();
+          $transparency = array();
 
-          if  ($info['colorType'] ==  3) {
+          if ($info['colorType'] == 3) {
             // indexed color, rbg
             /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
@@ -4078,38 +4078,38 @@ 
             */
             // there will be one entry for each palette entry. up until the last non-opaque entry.
             // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
-            $transparency['type'] =  'indexed';
-            $numPalette =  mb_strlen($pdata, '8bit')/3;
-            $trans =  0;
+            $transparency['type'] = 'indexed';
+            $numPalette = mb_strlen($pdata, '8bit') / 3;
+            $trans = 0;
 
-            for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
-                $trans =  $i;
+            for ($i = $chunkLen; $i >= 0; $i--) {
+              if (ord($data[$p + 8 + $i]) == 0) {
+                $trans = $i;
               }
             }
 
-            $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
+            $transparency['data'] = $trans;
+          } elseif ($info['colorType'] == 0) {
             // grayscale
             /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
             */
             //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
-            $transparency['type'] =  'indexed';
+            $transparency['type'] = 'indexed';
 
-            $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
+            $transparency['data'] = ord($data[$p + 8 + 1]);
+          } elseif ($info['colorType'] == 2) {
             // truecolor
             /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
              Green: 2 bytes, range 0 .. (2^bitdepth)-1
              Blue: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
+            $transparency['r'] = $this->PRVT_getBytes($data, $p + 8, 2);
             // r from truecolor
-            $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
+            $transparency['g'] = $this->PRVT_getBytes($data, $p + 10, 2);
             // g from truecolor
-            $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
+            $transparency['b'] = $this->PRVT_getBytes($data, $p + 12, 2);
             // b from truecolor
 
             $transparency['type'] = 'color-key';
@@ -4126,67 +4126,67 @@ 
           break;
         }
 
-        $p+=  $chunkLen+12;
+        $p += $chunkLen + 12;
       }
 
 
       if (!$haveHeader) {
-        $error =  1;
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
 
-        $errormsg =  'information header is missing';
+        $errormsg = 'information header is missing';
       }
 
-      if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
-        $error =  1;
+      if (isset($info['interlaceMethod']) && $info['interlaceMethod']) {
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
 
-        $errormsg =  'There appears to be no support for interlaced images in pdf.';
+        $errormsg = 'There appears to be no support for interlaced images in pdf.';
       }
     }
 
-    if  (!$error &&  $info['bitDepth'] > 8) {
-      $error =  1;
+    if (!$error && $info['bitDepth'] > 8) {
+      $error = 1;
 
       //debugpng
       if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
 
-      $errormsg =  'only bit depth of 8 or less is supported';
+      $errormsg = 'only bit depth of 8 or less is supported';
     }
 
-    if  (!$error) {
-      if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
-        $error =  1;
+    if (!$error) {
+      if ($info['colorType'] != 2 && $info['colorType'] != 0 && $info['colorType'] != 3) {
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
 
-        $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
+        $errormsg = 'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {
-        switch  ($info['colorType']) {
+        switch ($info['colorType']) {
         case  3:
-          $color =  'DeviceRGB';
-          $ncolor =  1;
+          $color = 'DeviceRGB';
+          $ncolor = 1;
           break;
 
         case  2:
-          $color =  'DeviceRGB';
-          $ncolor =  3;
+          $color = 'DeviceRGB';
+          $ncolor = 3;
           break;
 
         case  0:
-          $color =  'DeviceGray';
-          $ncolor =  1;
+          $color = 'DeviceGray';
+          $ncolor = 1;
           break;
         }
       }
     }
 
-    if  ($error) {
+    if ($error) {
       $this->addMessage('PNG error - ('.$file.') '.$errormsg);
       return;
     }
@@ -4194,84 +4194,84 @@ 
       //print_r($info);
       // so this image is ok... add it in.
       $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
+      $im = $this->numImages;
+      $label = 'I'.$im;
       $this->numObj++;
 
       //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
-      $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
+      $options = array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
 
-      if  (isset($transparency)) {
-        $options['transparency'] =  $transparency;
+      if (isset($transparency)) {
+        $options['transparency'] = $transparency;
       }
 
       $this->o_image($this->numObj, 'new', $options);
       $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
     }
 
-    if  ($w <=  0 && $h <=  0) {
-      $w =  $info['width'];
-      $h =  $info['height'];
+    if ($w <= 0 && $h <= 0) {
+      $w = $info['width'];
+      $h = $info['height'];
     }
 
-    if  ($w <=  0) {
-      $w =  $h/$info['height']*$info['width'];
+    if ($w <= 0) {
+      $w = $h / $info['height'] * $info['width'];
     }
 
-    if  ($h <=  0) {
-      $h =  $w*$info['height']/$info['width'];
+    if ($h <= 0) {
+      $h = $w * $info['height'] / $info['width'];
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
-    $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+    $this->objects[$this->currentContents]['c'] .= "\n/".$label.' Do';
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
   /**
    * add a JPEG image into the document, from a file
    */
-  function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
+  function  addJpegFromFile($img, $x, $y, $w = 0, $h = 0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
     // note that this function is unable to operate on a remote file.
 
-    if  (!file_exists($img)) {
+    if (!file_exists($img)) {
       return;
     }
 
-	if ( isset($this->imagelist[$img]) ) {
+	if (isset($this->imagelist[$img])) {
 	  $data = null;
       $imageWidth = $this->imagelist[$img]['w'];
       $imageHeight = $this->imagelist[$img]['h'];
-      $channels =  $this->imagelist[$img]['c'];
+      $channels = $this->imagelist[$img]['c'];
 	} else {
-      $tmp =  getimagesize($img);
-      $imageWidth =  $tmp[0];
-      $imageHeight =  $tmp[1];
+      $tmp = getimagesize($img);
+      $imageWidth = $tmp[0];
+      $imageHeight = $tmp[1];
 
-      if  (isset($tmp['channels'])) {
-        $channels =  $tmp['channels'];
+      if (isset($tmp['channels'])) {
+        $channels = $tmp['channels'];
       } else {
-        $channels =  3;
+        $channels = 3;
       }
 
       //$fp = fopen($img,'rb');
-      $data =  file_get_contents($img);
+      $data = file_get_contents($img);
       //fread($fp,filesize($img));
       //fclose($fp);
     }
 
-    if  ($w <=  0 &&  $h <=  0) {
-      $w =  $imageWidth;
+    if ($w <= 0 && $h <= 0) {
+      $w = $imageWidth;
     }
 
-    if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+    if ($w == 0) {
+      $w = $h / $imageHeight * $imageWidth;
     }
 
-    if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+    if ($h == 0) {
+      $h = $w * $imageHeight / $imageWidth;
     }
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $channels, $img);
@@ -4283,7 +4283,7 @@ 
    * this function is not all that reliable, and I would probably encourage people to use
    * the file based functions
    */
-  function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
+  function  addImage(&$img, $x, $y, $w = 0, $h = 0, $quality = 75) {
     /* Todo:
      * Pass in original filename as $imgname
      * If already cached like image_iscached(), allow empty $img
@@ -4302,25 +4302,25 @@ 
 
     // there seems to be some problem here in that images that have quality set above 75 do not appear
     // not too sure why this is, but in the meantime I have restricted this to 75.
-    if  ($quality>75) {
-      $quality =  75;
+    if ($quality > 75) {
+      $quality = 75;
     }
 
     // if the width or height are set to zero, then set the other one based on keeping the image
     // height/width ratio the same, if they are both zero, then give up :)
-    $imageWidth =  imagesx($img);
-    $imageHeight =  imagesy($img);
+    $imageWidth = imagesx($img);
+    $imageHeight = imagesy($img);
 
-    if  ($w <=  0 &&  $h <=  0) {
+    if ($w <= 0 && $h <= 0) {
       return;
     }
 
-    if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+    if ($w == 0) {
+      $w = $h / $imageHeight * $imageWidth;
     }
 
-    if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+    if ($h == 0) {
+      $h = $w * $imageHeight / $imageWidth;
     }
 
     // gotta get the data out of the img..
@@ -4346,8 +4346,8 @@ 
    *
    * @access private
    */
-  function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
-    if ( isset($this->imagelist[$imgname]) ) {
+  function  addJpegImage_common(&$data, $x, $y, $w = 0, $h = 0, $imageWidth, $imageHeight, $channels = 3, $imgname) {
+    if (isset($this->imagelist[$imgname])) {
       $label = $this->imagelist[$imgname]['label'];
       //debugpng
       //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
@@ -4361,24 +4361,24 @@ 
       // note that this function is not to be called externally
       // it is just the common code between the GD and the file options
       $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
+      $im = $this->numImages;
+      $label = 'I'.$im;
       $this->numObj++;
       $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
-      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
+      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels);
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
-    $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+    $this->objects[$this->currentContents]['c'] .= "\n/".$label.' Do';
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
   /**
    * specify where the document should open when it first starts
    */
-  function  openHere($style, $a =  0, $b =  0, $c =  0) {
+  function  openHere($style, $a = 0, $b = 0, $c = 0) {
     // this function will open the document at a specified page, in a specified style
     // the values for style, and the required paramters are:
     // 'XYZ'  left, top, zoom
@@ -4391,7 +4391,7 @@ 
     // 'FitBV' left
     $this->numObj++;
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
-    $id =  $this->catalogId;
+    $id = $this->catalogId;
     $this->o_catalog($id, 'openHere', $this->numObj);
   }
   
@@ -4403,16 +4403,16 @@ 
   /**
    * create a labelled destination within the document
    */
-  function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
+  function  addDestination($label, $style, $a = 0, $b = 0, $c = 0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
     // it has been linked to
     // styles are the same as the 'openHere' function
     $this->numObj++;
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
-    $id =  $this->numObj;
+    $id = $this->numObj;
 
     // store the label->idf relationship, note that this means that labels can be used only once
-    $this->destinations["$label"] =  $id;
+    $this->destinations["$label"] = $id;
   }
 
 
@@ -4421,9 +4421,9 @@ 
    * and for the user to add new ones for their fonts. The default bahavious can be overridden should
    * that be desired.
    */
-  function  setFontFamily($family, $options =  '') {
-    if  (!is_array($options)) {
-      if  ($family ===  'init') {
+  function  setFontFamily($family, $options = '') {
+    if (!is_array($options)) {
+      if ($family === 'init') {
         // set the known family groups
         // these font families will be used to enable bold and italic markers to be included
         // within text streams. html forms will be used... <b></b> <i></i>
@@ -4449,8 +4449,8 @@ 
 
       // the user is trying to set a font family
       // note that this can also be used to set the base ones to something else
-      if  (mb_strlen($family)) {
-        $this->fontFamilies[$family] =  $options;
+      if (mb_strlen($family)) {
+        $this->fontFamilies[$family] = $options;
       }
     }
   }
@@ -4460,7 +4460,7 @@ 
    * used to add messages for use in debugging
    */
   function  addMessage($message) {
-    $this->messages.=  $message."\n";
+    $this->messages .= $message."\n";
   }
 
 
@@ -4468,33 +4468,33 @@ 
    * a few functions which should allow the document to be treated transactionally.
    */
   function  transaction($action) {
-    switch  ($action) {
+    switch ($action) {
     case  'start':
       // store all the data away into the checkpoint variable
-      $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
+      $data = get_object_vars($this);
+      $this->checkpoint = $data;
       unset($data);
       break;
 
     case  'commit':
-      if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
-        $tmp =  $this->checkpoint['checkpoint'];
-        $this->checkpoint =  $tmp;
+      if (is_array($this->checkpoint) && isset($this->checkpoint['checkpoint'])) {
+        $tmp = $this->checkpoint['checkpoint'];
+        $this->checkpoint = $tmp;
         unset($tmp);
       } else {
-        $this->checkpoint =  '';
+        $this->checkpoint = '';
       }
       break;
 
     case  'rewind':
       // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
-      if  (is_array($this->checkpoint)) {
+      if (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        $tmp = $this->checkpoint;
 
         foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
-            $this->$k =  $v;
+          if ($k !== 'checkpoint') {
+            $this->$k = $v;
           }
         }
         unset($tmp);
@@ -4502,11 +4502,11 @@ 
       break;
 
     case  'abort':
-      if  (is_array($this->checkpoint)) {
+      if (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        $tmp = $this->checkpoint;
         foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
+          $this->$k = $v;
         }
         unset($tmp);
       }

Braces +57 added lines, -27 removed lines

@@ -1589,8 +1589,9 @@ 
         "<< /Type /ExtGState\n";
 
       foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
-          continue;
+        if  ( !in_array($parameter,  $valid_params)) {
+                  continue;
+        }
         $res.=  "/$parameter $value\n";
       }
 
@@ -2514,13 +2515,15 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+    if ( !in_array($mode, $blend_modes) ) {
+          $mode = "Normal";
+    }
     
     // Only create a new graphics state if required
     if ( $mode == $this->currentLineTransparency["mode"]  &&
-         $opacity == $this->currentLineTransparency["opacity"] )
-      return;
+         $opacity == $this->currentLineTransparency["opacity"] ) {
+          return;
+    }
 
     $options = array("BM" => "/$mode",
                      "CA" => (float)$opacity);
@@ -2546,12 +2549,14 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+    if ( !in_array($mode, $blend_modes) ) {
+          $mode = "Normal";
+    }
 
     if ( $mode == $this->currentFillTransparency["mode"]  &&
-         $opacity == $this->currentFillTransparency["opacity"] )
-      return;
+         $opacity == $this->currentFillTransparency["opacity"] ) {
+          return;
+    }
 
     $options = array("BM" => "/$mode",
                      "ca" => (float)$opacity);
@@ -2840,8 +2845,9 @@ 
       $options =  array();
     }
 
-    if  ( headers_sent())
-      die("Unable to stream pdf: headers already sent");
+    if  ( headers_sent()) {
+          die("Unable to stream pdf: headers already sent");
+    }
 
     if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
       $tmp =  ltrim($this->output(1));
@@ -2856,8 +2862,9 @@ 
     header("Content-Length: " . mb_strlen($tmp, '8bit'));
     $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
 
-    if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+    if  ( !isset($options["Attachment"])) {
+          $options["Attachment"] =  true;
+    }
 
     $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
 
@@ -3035,7 +3042,9 @@ 
    */
   function  utf8toUtf16BE(&$text, $bom = true) {
     $cf =  $this->currentFont;
-    if (!$this->fonts[$cf]['isUnicode']) return $text;
+    if (!$this->fonts[$cf]['isUnicode']) {
+        return $text;
+    }
     $out = $bom ? "\xFE\xFF" : '';
     
     $unicode = $this->utf8toCodePointsArray($text);
@@ -3817,8 +3826,9 @@ 
    * return a storable representation of a specific object
    */
   function  serializeObject($id) {
-    if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
+    if  ( array_key_exists($id,  $this->objects)) {
+          return  var_export($this->objects[$id],  true);
+    }
   }
 
 
@@ -3908,7 +3918,9 @@ 
       $error =  0;
       //DEBUG_IMG_TEMP
       //debugpng
-      if (DEBUGPNG) print '[addImagePng '.$file.']';
+      if (DEBUGPNG) {
+          print '[addImagePng '.$file.']';
+      }
 
       ob_start();
       @imagepng($img);
@@ -3920,7 +3932,9 @@ 
         $errormsg = 'trouble writing file from GD';
         //DEBUG_IMG_TEMP
         //debugpng
-        if (DEBUGPNG) print 'trouble writing file from GD';
+        if (DEBUGPNG) {
+            print 'trouble writing file from GD';
+        }
 	  }
 
       if  ($error) {
@@ -4002,7 +4016,9 @@ 
       if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
         $error =  1;
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile this file does not have a valid header '.$file.']';
+        }
 
         $errormsg =  'this file does not have a valid header';
       }
@@ -4041,7 +4057,9 @@ 
             $error =  1;
 
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported compression method '.$file.']';
+            }
 
             $errormsg =  'unsupported compression method';
           }
@@ -4050,7 +4068,9 @@ 
             $error =  1;
 
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported filter method '.$file.']';
+            }
 
             $errormsg =  'unsupported filter method';
           }
@@ -4117,7 +4137,9 @@ 
           } else {
             //unsupported transparency type
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported transparency type '.$file.']';
+            }
           }
           // KS End new code
           break;
@@ -4134,7 +4156,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile information header is missing '.$file.']';
+        }
 
         $errormsg =  'information header is missing';
       }
@@ -4143,7 +4167,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
+        }
 
         $errormsg =  'There appears to be no support for interlaced images in pdf.';
       }
@@ -4153,7 +4179,9 @@ 
       $error =  1;
 
       //debugpng
-      if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+      if (DEBUGPNG) {
+          print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+      }
 
       $errormsg =  'only bit depth of 8 or less is supported';
     }
@@ -4163,7 +4191,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
+        }
 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {