chamilo / chamilo-lms

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

Spacing +14 added lines, -14 removed lines

@@ -63,10 +63,10 @@ 
 
     // Handle list-style-image
     // If list style image is requested but missing, fall back to predefined types
-    if ( $style->list_style_image !== "none" &&
-         strcmp($img = $frame->get_image_url(), DOMPDF_LIB_DIR . "/res/broken_image.png") != 0) {
+    if ($style->list_style_image !== "none" &&
+         strcmp($img = $frame->get_image_url(), DOMPDF_LIB_DIR."/res/broken_image.png") != 0) {
 
-      list($x,$y) = $frame->get_position();
+      list($x, $y) = $frame->get_position();
       
       //For expected size and aspect, instead of box size, use image natural size scaled to DPI.
       // Resample the bullet image to be consistent with 'auto' sized images
@@ -75,13 +75,13 @@ 
       //$w = $frame->get_width();
       //$h = $frame->get_height();
       list($width, $height) = getimagesize($img);
-      $w = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-      $h = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+      $w = (((float) rtrim($width, "px")) * 72) / DOMPDF_DPI;
+      $h = (((float) rtrim($height, "px")) * 72) / DOMPDF_DPI;
       
       $x -= $w;
-      $y -= ($line_height - $font_size)/2; //Reverse hinting of list_bullet_positioner
+      $y -= ($line_height - $font_size) / 2; //Reverse hinting of list_bullet_positioner
 
-      $this->_canvas->image( $img, $frame->get_image_ext(), $x, $y, $w, $h);
+      $this->_canvas->image($img, $frame->get_image_ext(), $x, $y, $w, $h);
 
     } else {
 
@@ -96,19 +96,19 @@ 
         $fill = true;
 
       case "circle":
-        list($x,$y) = $frame->get_position();
-        $r = ($font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE /*-List_Bullet_Frame_Decorator::BULLET_THICKNESS*/ ))/2;
-        $x -= $font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE/2);
-        $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT))/2;
-        $o = $font_size*List_Bullet_Frame_Decorator::BULLET_THICKNESS;
+        list($x, $y) = $frame->get_position();
+        $r = ($font_size * (List_Bullet_Frame_Decorator::BULLET_SIZE /*-List_Bullet_Frame_Decorator::BULLET_THICKNESS*/)) / 2;
+        $x -= $font_size * (List_Bullet_Frame_Decorator::BULLET_SIZE / 2);
+        $y += ($font_size * (1 - List_Bullet_Frame_Decorator::BULLET_DESCENT)) / 2;
+        $o = $font_size * List_Bullet_Frame_Decorator::BULLET_THICKNESS;
         $this->_canvas->circle($x, $y, $r, $style->color, $o, null, $fill);
         break;
 
       case "square":
         list($x, $y) = $frame->get_position();
-        $w = $font_size*List_Bullet_Frame_Decorator::BULLET_SIZE;
+        $w = $font_size * List_Bullet_Frame_Decorator::BULLET_SIZE;
         $x -= $w;
-        $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT-List_Bullet_Frame_Decorator::BULLET_SIZE))/2;
+        $y += ($font_size * (1 - List_Bullet_Frame_Decorator::BULLET_DESCENT - List_Bullet_Frame_Decorator::BULLET_SIZE)) / 2;
         $this->_canvas->filled_rectangle($x, $y, $w, $w, $style->color);
         break;
       

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

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 {

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

Spacing +5 added lines, -5 removed lines

@@ -69,8 +69,8 @@ 
     $cells = $cellmap->get_spanned_cells($this->_frame);
 
     $w = 0;
-    foreach ( $cells["columns"] as $i ) {
-      $col = $cellmap->get_column( $i );
+    foreach ($cells["columns"] as $i) {
+      $col = $cellmap->get_column($i);
       $w += $col["used-width"];
     }
 
@@ -110,15 +110,15 @@ 
     $this->_frame->set_current_line($line_y);
     
     // Set the containing blocks and reflow each child
-    foreach ( $this->_frame->get_children() as $child ) {
+    foreach ($this->_frame->get_children() as $child) {
       
-      if ( $page->is_full() )
+      if ($page->is_full())
         break;
     
       $child->set_containing_block($content_x, $content_y, $cb_w, $h);
       $child->reflow();
 
-      $this->_frame->add_frame_to_line( $child );
+      $this->_frame->add_frame_to_line($child);
 
     }
 

main/inc/lib/phpdocx/pdf/include/functions.inc.php

Spacing +77 added lines, -77 removed lines

@@ -61,16 +61,16 @@ 
  * @param bool $return
  *
  */
-if ( !function_exists("pre_r") ) {
+if (!function_exists("pre_r")) {
 function pre_r($mixed, $return = false) {
   if ($return)
-    return "<pre>" . print_r($mixed, true) . "</pre>";
+    return "<pre>".print_r($mixed, true)."</pre>";
 
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo ("<pre>");
   print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("</pre>");
   else
     echo ("\n");
@@ -87,12 +87,12 @@ 
  *
  * @param mixed $mixed variable or expression to display.
  */
-if ( !function_exists("pre_var_dump") ) {
+if (!function_exists("pre_var_dump")) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("<pre>");
   var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("</pre>");
 }
 }
@@ -115,13 +115,13 @@ 
  * is appended (o.k. also for Windows)
  */
 function build_url($protocol, $host, $base_path, $url) {
-  if ( mb_strlen($url) == 0 ) {
+  if (mb_strlen($url) == 0) {
     //return $protocol . $host . rtrim($base_path, "/\\") . "/";
-    return $protocol . $host . $base_path;
+    return $protocol.$host.$base_path;
   }
 
   // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
+  if (mb_strpos($url, "://") !== false)
     return $url;
 
   $ret = $protocol;
@@ -140,13 +140,13 @@ 
   }
 
   //remote urls with backslash in html/css are not really correct, but lets be genereous
-  if ( $url[0] === '/' || $url[0] === '\\' ) {
+  if ($url[0] === '/' || $url[0] === '\\') {
     // Absolute path
-    $ret .= $host . $url;
+    $ret .= $host.$url;
   } else {
     // Relative path
     //$base_path = $base_path !== "" ? rtrim($base_path, "/\\") . "/" : "";
-    $ret .= $host . $base_path . $url;
+    $ret .= $host.$base_path.$url;
   }
 
   return $ret;
@@ -168,48 +168,48 @@ 
 
   $arr = parse_url($url);
 
-  if ( isset($arr["scheme"]) &&
+  if (isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
-       mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
+       mb_strlen($arr["scheme"]) > 1) // Exclude windows drive letters...
     {
-    $protocol = $arr["scheme"] . "://";
+    $protocol = $arr["scheme"]."://";
 
-    if ( isset($arr["user"]) ) {
+    if (isset($arr["user"])) {
       $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
-        $host .= "@" . $arr["pass"];
+      if (isset($arr["pass"]))
+        $host .= "@".$arr["pass"];
 
       $host .= ":";
     }
 
-    if ( isset($arr["host"]) )
+    if (isset($arr["host"]))
       $host .= $arr["host"];
 
-    if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+    if (isset($arr["port"]))
+      $host .= ":".$arr["port"];
 
-    if ( isset($arr["path"]) && $arr["path"] !== "" ) {
+    if (isset($arr["path"]) && $arr["path"] !== "") {
       // Do we have a trailing slash?
-      if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
+      if ($arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/") {
         $path = $arr["path"];
         $file = "";
       } else {
-        $path = dirname($arr["path"]) . "/";
+        $path = dirname($arr["path"])."/";
         $file = basename($arr["path"]);
       }
     }
 
-    if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+    if (isset($arr["query"]))
+      $file .= "?".$arr["query"];
 
-    if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+    if (isset($arr["fragment"]))
+      $file .= "#".$arr["fragment"];
 
   } else {
 
     $i = mb_strpos($url, "file://");
-    if ( $i !== false)
+    if ($i !== false)
       $url = mb_substr($url, $i + 7);
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
@@ -221,7 +221,7 @@ 
     $path = dirname($url);
 
     // Check that the path exists
-    if ( $path !== false ) {
+    if ($path !== false) {
       $path .= '/';
 
     } else {
@@ -230,10 +230,10 @@ 
 
       $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
 
-      if ( substr($arr["path"], 0, 1) === '/' ) {
+      if (substr($arr["path"], 0, 1) === '/') {
         $path = dirname($arr["path"]);
       } else {
-        $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"];
+        $path = '/'.rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/').'/'.$arr["path"];
       }
     }
   }
@@ -262,13 +262,13 @@ 
                        "dc", "dcc", "dccc", "cm");
   static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
+  if (!is_numeric($num))
     throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
 
-  if ( $num > 4000 || $num < 0 )
+  if ($num > 4000 || $num < 0)
     return "(out of range)";
 
-  $num = strrev((string)$num);
+  $num = strrev((string) $num);
 
   $ret = "";
   switch (mb_strlen($num)) {
@@ -304,8 +304,8 @@ 
  * mb_string compatibility
  */
 
-if ( !function_exists("mb_convert_encoding") ) {
-  function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
+if (!function_exists("mb_convert_encoding")) {
+  function mb_convert_encoding($data, $to_encoding, $from_encoding = 'UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
       return utf8_encode($data);
     } else {
@@ -314,20 +314,20 @@ 
   }
 }
 
-if ( !function_exists("mb_detect_encoding") ) {
-  function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
+if (!function_exists("mb_detect_encoding")) {
+  function mb_detect_encoding($data, $encoding_list = array('iso-8859-1'), $strict = false) {
     return 'iso-8859-1';
   }
 }
 
-if ( !function_exists("mb_detect_order") ) {
-  function mb_detect_order($encoding_list=array('iso-8859-1')) {
+if (!function_exists("mb_detect_order")) {
+  function mb_detect_order($encoding_list = array('iso-8859-1')) {
     return 'iso-8859-1';
   }
 }
 
-if ( !function_exists("mb_internal_encoding") ) {
-  function mb_internal_encoding($encoding=NULL) {
+if (!function_exists("mb_internal_encoding")) {
+  function mb_internal_encoding($encoding = NULL) {
     if (isset($encoding)) {
       return true;
     } else {
@@ -336,8 +336,8 @@ 
   }
 }
 
-if ( !function_exists("mb_strlen") ) {
-  function mb_strlen($str, $encoding='iso-8859-1') {
+if (!function_exists("mb_strlen")) {
+  function mb_strlen($str, $encoding = 'iso-8859-1') {
     if (str_replace('-', '', strtolower($encoding)) == 'utf8') {
       return strlen(utf8_encode($data));
     } else {
@@ -346,40 +346,40 @@ 
   }
 }
 
-if ( !function_exists("mb_strpos") ) {
+if (!function_exists("mb_strpos")) {
   function mb_strpos($haystack, $needle, $offset = 0) {
     return strpos($haystack, $needle, $offset);
   }
 }
 
-if ( !function_exists("mb_strrpos") ) {
+if (!function_exists("mb_strrpos")) {
   function mb_strrpos($haystack, $needle, $offset = 0) {
     return strrpos($haystack, $needle, $offset);
   }
 }
 
-if ( !function_exists("mb_strtolower") ) {
+if (!function_exists("mb_strtolower")) {
   function mb_strtolower($str) {
     return strtolower($str);
   }
 }
 
-if ( !function_exists("mb_strtoupper") ) {
+if (!function_exists("mb_strtoupper")) {
   function mb_strtoupper($str) {
     return strtoupper($str);
   }
 }
 
-if ( !function_exists("mb_substr") ) {
-  function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
-    if ( is_null($length) )
+if (!function_exists("mb_substr")) {
+  function mb_substr($str, $start, $length = null, $encoding = 'iso-8859-1') {
+    if (is_null($length))
       return substr($str, $start);
     else
       return substr($str, $start, $length);
   }
 }
 
-if ( !function_exists("mb_substr_count") ) {
+if (!function_exists("mb_substr_count")) {
   function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
   }
@@ -402,14 +402,14 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
-    throw new DOMPDF_Exception($errstr . " $errno");
+  if (!($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING))) // Not a warning or notice
+    throw new DOMPDF_Exception($errstr." $errno");
 
   global $_dompdf_warnings;
   global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
-    echo $errstr . "\n";
+  if ($_dompdf_show_warnings)
+    echo $errstr."\n";
 
   $_dompdf_warnings[] = $errstr;
 }
@@ -425,14 +425,14 @@ 
 
   $i = 0;
   foreach ($bt as $call) {
-    $file = basename($call["file"]) . " (" . $call["line"] . ")";
-    if ( isset($call["class"]) ) {
-      $func = $call["class"] . "->" . $call["function"] . "()";
+    $file = basename($call["file"])." (".$call["line"].")";
+    if (isset($call["class"])) {
+      $func = $call["class"]."->".$call["function"]."()";
     } else {
-      $func = $call["function"] . "()";
+      $func = $call["function"]."()";
     }
 
-    echo "#" . str_pad($i, 2, " ", STR_PAD_RIGHT) . ": " . str_pad($file.":", 42) . " $func\n";
+    echo "#".str_pad($i, 2, " ", STR_PAD_RIGHT).": ".str_pad($file.":", 42)." $func\n";
     $i++;
   }
   echo "\n";
@@ -447,10 +447,10 @@ 
   global $_DOMPDF_DEBUG_TYPES;
   global $_dompdf_show_warnings;
   global $_dompdf_debug;
-  if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
+  if (isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug)) {
     $arr = debug_backtrace();
 
-    echo basename($arr[0]["file"]) . " (" . $arr[0]["line"] ."): " . $arr[1]["function"] . ": ";
+    echo basename($arr[0]["file"])." (".$arr[0]["line"]."): ".$arr[1]["function"].": ";
     pre_r($msg);
   }
 }
@@ -458,29 +458,29 @@ 
 /**
  * Dump memory usage
  */
-if ( !function_exists("print_memusage") ) {
+if (!function_exists("print_memusage")) {
 function print_memusage() {
   global $memusage;
   echo ("Memory Usage\n");
   $prev = 0;
   $initial = reset($memusage);
-  echo (str_pad("Initial:", 40) . $initial . "\n\n");
+  echo (str_pad("Initial:", 40).$initial."\n\n");
 
   foreach ($memusage as $key=>$mem) {
     $mem -= $initial;
-    echo (str_pad("$key:" , 40));
-    echo (str_pad("$mem", 12) . "(diff: " . ($mem - $prev) . ")\n");
+    echo (str_pad("$key:", 40));
+    echo (str_pad("$mem", 12)."(diff: ".($mem - $prev).")\n");
     $prev = $mem;
   }
 
-  echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
+  echo ("\n".str_pad("Total:", 40).memory_get_usage())."\n";
 }
 }
 
 /**
  * Initialize memory profiling code
  */
-if ( !function_exists("enable_mem_profile") ) {
+if (!function_exists("enable_mem_profile")) {
 function enable_mem_profile() {
     global $memusage;
     $memusage = array("Startup" => memory_get_usage());
@@ -493,10 +493,10 @@ 
  *
  * @param string $location a meaningful location
  */
-if ( !function_exists("mark_memusage") ) {
+if (!function_exists("mark_memusage")) {
 function mark_memusage($location) {
   global $memusage;
-  if ( isset($memusage) )
+  if (isset($memusage))
     $memusage[$location] = memory_get_usage();
 }
 }
@@ -506,12 +506,12 @@ 
  *
  * @link http://us.php.net/manual/en/function.sys-get-temp-dir.php#85261
  */
-if ( !function_exists('sys_get_temp_dir')) {
+if (!function_exists('sys_get_temp_dir')) {
   function sys_get_temp_dir() {
     if (!empty($_ENV['TMP'])) { return realpath($_ENV['TMP']); }
-    if (!empty($_ENV['TMPDIR'])) { return realpath( $_ENV['TMPDIR']); }
-    if (!empty($_ENV['TEMP'])) { return realpath( $_ENV['TEMP']); }
-    $tempfile=tempnam(uniqid(rand(),TRUE),'');
+    if (!empty($_ENV['TMPDIR'])) { return realpath($_ENV['TMPDIR']); }
+    if (!empty($_ENV['TEMP'])) { return realpath($_ENV['TEMP']); }
+    $tempfile = tempnam(uniqid(rand(), TRUE), '');
     if (file_exists($tempfile)) {
     unlink($tempfile);
     return realpath(dirname($tempfile));

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

Spacing +24 added lines, -24 removed lines

@@ -52,7 +52,7 @@ 
   protected $_lines; // array( [num] => array([frames] => array(<frame list>),
                      //                 y, w, h) )
   protected $_counters; // array([id] => counter_value) (for generated content)
-  protected $_cl;    // current line index
+  protected $_cl; // current line index
 
   //........................................................................
 
@@ -87,7 +87,7 @@ 
 
   function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
-    if ( isset($i) )
+    if (isset($i))
       return $cl[$i];
     return $cl;
   }
@@ -102,13 +102,13 @@ 
   }
 
   function clear_line($i) {
-    if ( isset($this->_lines[$i]) )
+    if (isset($this->_lines[$i]))
       unset($this->_lines[$i]);
   }
 
   function set_line($lineno, $y = null, $w = null, $h = null) {
 
-    if ( is_array($y) )
+    if (is_array($y))
       extract($y);
 
     if (is_numeric($y))
@@ -126,37 +126,37 @@ 
   function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
-    if ( $frame instanceof Inline_Frame_Decorator ) {
+    if ($frame instanceof Inline_Frame_Decorator) {
 
       // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
-        $this->maximize_line_height( $frame->get_style()->length_in_pt($frame->get_style()->line_height) );
+      if ($frame->get_node()->nodeName === "br") {
+        $this->maximize_line_height($frame->get_style()->length_in_pt($frame->get_style()->line_height));
         $this->add_line();
         return;
       }
 
       // Add each child of the inline frame to the line individually
       foreach ($frame->get_children() as $child)
-        $this->add_frame_to_line( $child );
+        $this->add_frame_to_line($child);
 
       return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
     // but what can you do...
-    if ( $this->_lines[$this->_cl]["w"] == 0 &&
+    if ($this->_lines[$this->_cl]["w"] == 0 &&
          $frame->get_node()->nodeName === "#text" &&
          ($frame->get_style()->white_space !== "pre" ||
-          $frame->get_style()->white_space !== "pre-wrap") ) {
+          $frame->get_style()->white_space !== "pre-wrap")) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
+      $frame->set_text(ltrim($frame->get_text()));
       $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
-    if ( $w == 0 )
+    if ($w == 0)
       return;
 
     // Debugging code:
@@ -184,7 +184,7 @@ 
 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
-    if ( $frame->get_node()->nodeName === "#text")
+    if ($frame->get_node()->nodeName === "#text")
       $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
@@ -197,12 +197,12 @@ 
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
+      if (($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false)
         break;
       $i--;
     }
 
-    if ( $j === false )
+    if ($j === false)
       return;
 
     // Remove $frame and all frames that follow
@@ -215,22 +215,22 @@ 
     // Recalculate the height of the line
     $h = 0;
     foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+      $h = max($h, $f->get_margin_height());
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
     while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+      unset($this->_lines[$this->_cl--]);
 
   }
 
   function increase_line_width($w) {
-    $this->_lines[ $this->_cl ]["w"] += $w;
+    $this->_lines[$this->_cl]["w"] += $w;
   }
 
   function maximize_line_height($val) {
-    $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
+    $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $val);
   }
 
   function add_line() {
@@ -240,7 +240,7 @@ 
 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
-    $this->_lines[ ++$this->_cl ] = array("frames" => array(),
+    $this->_lines[ ++$this->_cl] = array("frames" => array(),
                                           "wc" => 0,
                                           "y" => $y, "w" => 0, "h" => 0);
   }
@@ -252,7 +252,7 @@ 
   }
 
   function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
-    if ( !isset($this->_counters[$id]) )
+    if (!isset($this->_counters[$id]))
       $this->_counters[$id] = $increment;
     else
       $this->_counters[$id] += $increment;
@@ -261,7 +261,7 @@ 
 
   function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
-    if ( !isset($this->_counters[$id]) )
+    if (!isset($this->_counters[$id]))
       $this->_counters[$id] = 0;
 
     switch ($type) {
@@ -281,11 +281,11 @@ 
 
     case "lower-latin":
     case "lower-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
+      return chr(($this->_counters[$id] % 26) + ord('a') - 1);
 
     case "upper-latin":
     case "upper-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
+      return chr(($this->_counters[$id] % 26) + ord('A') - 1);
 
     case "lower-greek":
       return chr($this->_counters[$id] + 944);

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

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';

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

Spacing +59 added lines, -59 removed lines

@@ -80,13 +80,13 @@ 
     $absolute_used = $this->_state["absolute_used"];
     $auto_min = $this->_state["auto_min"];
 
-    $absolute =& $this->_state["absolute"];
-    $percent =& $this->_state["percent"];
-    $auto =& $this->_state["auto"];
+    $absolute = & $this->_state["absolute"];
+    $percent = & $this->_state["percent"];
+    $auto = & $this->_state["auto"];
 
     // Determine the actual width of the table
     $cb = $this->_frame->get_containing_block();
-    $columns =& $this->_frame->get_cellmap()->get_columns();
+    $columns = & $this->_frame->get_cellmap()->get_columns();
 
     $width = $style->width;
 
@@ -102,34 +102,34 @@ 
                                                          $style->border_right_width,
                                                          $style->padding_right), $cb["w"]);
 
-    $min_table_width = $style->length_in_pt( $style->min_width, $cb["w"] - $delta );
+    $min_table_width = $style->length_in_pt($style->min_width, $cb["w"] - $delta);
 
     // min & max widths already include borders & padding
     $min_width -= $delta;
     $max_width -= $delta;
     
-    if ( $width !== "auto" ) {
+    if ($width !== "auto") {
 
       $preferred_width = $style->length_in_pt($width, $cb["w"]) - $delta;
 
-      if ( $preferred_width < $min_table_width )
+      if ($preferred_width < $min_table_width)
         $preferred_width = $min_table_width;
 
-      if ( $preferred_width > $min_width )
+      if ($preferred_width > $min_width)
         $width = $preferred_width;
       else
         $width = $min_width;
 
     } else {
 
-      if ( $max_width + $delta < $cb["w"] )
+      if ($max_width + $delta < $cb["w"])
         $width = $max_width;
-      else if ( $cb["w"] - $delta > $min_width )
+      else if ($cb["w"] - $delta > $min_width)
         $width = $cb["w"] - $delta;
       else
         $width = $min_width;
 
-      if ( $width < $min_table_width )
+      if ($width < $min_table_width)
         $width = $min_table_width;
 
     }
@@ -140,7 +140,7 @@ 
     $cellmap = $this->_frame->get_cellmap();
 
     // If the whole table fits on the page, then assign each column it's max width
-    if ( $width == $max_width ) {
+    if ($width == $max_width) {
 
       foreach (array_keys($columns) as $i)
         $cellmap->set_column_width($i, $columns[$i]["max-width"]);
@@ -149,7 +149,7 @@ 
     }
 
     // Determine leftover and assign it evenly to all columns
-    if ( $width > $min_width ) {
+    if ($width > $min_width) {
 
       // We have four cases to deal with:
       //
@@ -168,7 +168,7 @@ 
       // 4. Both absolute and percentage widths have been specified.
 
       // Case 1:
-      if ( $absolute_used == 0 && $percent_used == 0 ) {
+      if ($absolute_used == 0 && $percent_used == 0) {
         $increment = $width - $min_width;
 
         foreach (array_keys($columns) as $i)
@@ -178,17 +178,17 @@ 
 
 
       // Case 2
-      if ( $absolute_used > 0 && $percent_used == 0 ) {
+      if ($absolute_used > 0 && $percent_used == 0) {
 
-        if ( count($auto) > 0 )
+        if (count($auto) > 0)
           $increment = ($width - $auto_min - $absolute_used) / count($auto);
 
         // Use the absolutely specified width or the increment
         foreach (array_keys($columns) as $i) {
 
-          if ( $columns[$i]["absolute"] > 0 && count($auto) )
+          if ($columns[$i]["absolute"] > 0 && count($auto))
             $cellmap->set_column_width($i, $columns[$i]["min-width"]);
-          else if ( count($auto) ) 
+          else if (count($auto)) 
             $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
           else {
             // All absolute columns
@@ -203,14 +203,14 @@ 
 
 
       // Case 3:
-      if ( $absolute_used == 0 && $percent_used > 0 ) {
+      if ($absolute_used == 0 && $percent_used > 0) {
 
         $scale = null;
         $remaining = null;
 
         // Scale percent values if the total percentage is > 100, or if all
         // values are specified as percentages.
-        if ( $percent_used > 100 || count($auto) == 0)
+        if ($percent_used > 100 || count($auto) == 0)
           $scale = 100 / $percent_used;
         else
           $scale = 1;
@@ -223,9 +223,9 @@ 
 
           $slack = $width - $used_width;
 
-          $w = min($columns[$i]["percent"] * $width/100, $slack);
+          $w = min($columns[$i]["percent"] * $width / 100, $slack);
 
-          if ( $w < $columns[$i]["min-width"] )
+          if ($w < $columns[$i]["min-width"])
             $w = $columns[$i]["min-width"];
 
           $cellmap->set_column_width($i, $w);
@@ -235,7 +235,7 @@ 
 
         // This works because $used_width includes the min-width of each
         // unassigned column
-        if ( count($auto) > 0 ) {
+        if (count($auto) > 0) {
           $increment = ($width - $used_width) / count($auto);
 
           foreach ($auto as $i)
@@ -248,18 +248,18 @@ 
       // Case 4:
 
       // First-come, first served
-      if ( $absolute_used > 0 && $percent_used > 0 ) {
+      if ($absolute_used > 0 && $percent_used > 0) {
 
         $used_width = $auto_min;
 
         foreach ($absolute as $i) {
           $cellmap->set_column_width($i, $columns[$i]["min-width"]);
-          $used_width +=  $columns[$i]["min-width"];
+          $used_width += $columns[$i]["min-width"];
         }
 
         // Scale percent values if the total percentage is > 100 or there
         // are no auto values to take up slack
-        if ( $percent_used > 100 || count($auto) == 0 )
+        if ($percent_used > 100 || count($auto) == 0)
           $scale = 100 / $percent_used;
         else
           $scale = 1;
@@ -272,14 +272,14 @@ 
           $columns[$i]["percent"] *= $scale;
           $w = min($columns[$i]["percent"] * $remaining_width / 100, $slack);
 
-          if ( $w < $columns[$i]["min-width"] )
+          if ($w < $columns[$i]["min-width"])
             $w = $columns[$i]["min-width"];
 
           $columns[$i]["used-width"] = $w;
           $used_width += $w;
         }
 
-        if ( count($auto) > 0 ) {
+        if (count($auto) > 0) {
           $increment = ($width - $used_width) / count($auto);
 
           foreach ($auto as $i)
@@ -314,56 +314,56 @@ 
 
     // Determine our content height
     $content_height = 0;
-    foreach ( $rows as $r )
+    foreach ($rows as $r)
       $content_height += $r["height"];
 
     $cb = $this->_frame->get_containing_block();
 
-    if ( !($style->overflow === "visible" ||
-           ($style->overflow === "hidden" && $height === "auto")) ) {
+    if (!($style->overflow === "visible" ||
+           ($style->overflow === "hidden" && $height === "auto"))) {
 
       // Only handle min/max height if the height is independent of the frame's content
 
       $min_height = $style->min_height;
       $max_height = $style->max_height;
 
-      if ( isset($cb["h"]) ) {
+      if (isset($cb["h"])) {
         $min_height = $style->length_in_pt($min_height, $cb["h"]);
         $max_height = $style->length_in_pt($max_height, $cb["h"]);
 
-      } else if ( isset($cb["w"]) ) {
+      } else if (isset($cb["w"])) {
 
-        if ( mb_strpos($min_height, "%") !== false )
+        if (mb_strpos($min_height, "%") !== false)
           $min_height = 0;
         else
           $min_height = $style->length_in_pt($min_height, $cb["w"]);
 
-        if ( mb_strpos($max_height, "%") !== false )
+        if (mb_strpos($max_height, "%") !== false)
           $max_height = "none";
         else
           $max_height = $style->length_in_pt($max_height, $cb["w"]);
       }
 
-      if ( $max_height !== "none" && $min_height > $max_height )
+      if ($max_height !== "none" && $min_height > $max_height)
         // Swap 'em
         list($max_height, $min_height) = array($min_height, $max_height);
 
-      if ( $max_height !== "none" && $height > $max_height )
+      if ($max_height !== "none" && $height > $max_height)
         $height = $max_height;
 
-      if ( $height < $min_height )
+      if ($height < $min_height)
         $height = $min_height;
 
     } else {
 
       // Use the content height or the height value, whichever is greater
-      if ( $height !== "auto" ) {
+      if ($height !== "auto") {
         $height = $style->length_in_pt($height, $cb["h"]);
 
-        if ( $height <= $content_height )
+        if ($height <= $content_height)
           $height = $content_height;
         else
-          $cellmap->set_frame_heights($height,$content_height);
+          $cellmap->set_frame_heights($height, $content_height);
 
       } else
         $height = $content_height;
@@ -382,7 +382,7 @@ 
     $page->check_forced_page_break($this->_frame);
 
     // Bail if the page is full
-    if ( $page->is_full() )
+    if ($page->is_full())
       return;
     
     // Let the page know that we're reflowing a table so that splits
@@ -400,7 +400,7 @@ 
     // Table layout algorithm:
     // http://www.w3.org/TR/CSS21/tables.html#auto-table-layout
 
-    if ( is_null($this->_state) )
+    if (is_null($this->_state))
       $this->get_min_max_width();
 
     $cb = $this->_frame->get_containing_block();
@@ -409,7 +409,7 @@ 
     // This is slightly inexact, but should be okay.  Add half the
     // border-spacing to the table as padding.  The other half is added to
     // the cells themselves.
-    if ( $style->border_collapse === "separate" ) {
+    if ($style->border_collapse === "separate") {
       list($h, $v) = $style->border_spacing;
 
       $v = $style->length_in_pt($v) / 2;
@@ -431,16 +431,16 @@ 
 
     $diff = $cb["w"] - $width;
 
-    if ( $left === "auto" && $right === "auto" && $diff > 0 ) {
+    if ($left === "auto" && $right === "auto" && $diff > 0) {
       $left = $right = $diff / 2;
       $style->margin_left = "$left pt";
       $style->margin_right = "$right pt";
 
     } else {
-        if($left === "auto") {
+        if ($left === "auto") {
           $left = $style->length_in_pt($cb["w"] - $right - $width, $cb["w"]);
         }
-        if($right === "auto") {
+        if ($right === "auto") {
           $left = $style->length_in_pt($left, $cb["w"]);
         }
     }
@@ -455,32 +455,32 @@ 
                                                  $style->border_top_width,
                                                  $style->padding_top), $cb["w"]);
 
-    if ( isset($cb["h"]) )
+    if (isset($cb["h"]))
       $h = $cb["h"];
     else
       $h = null;
 
 
     $cellmap = $this->_frame->get_cellmap();
-    $col =& $cellmap->get_column(0);
+    $col = & $cellmap->get_column(0);
     $col["x"] = $content_x;
 
-    $row =& $cellmap->get_row(0);
+    $row = & $cellmap->get_row(0);
     $row["y"] = $content_y;
 
     $cellmap->assign_x_positions();
 
     // Set the containing block of each child & reflow
-    foreach ( $this->_frame->get_children() as $child ) {
+    foreach ($this->_frame->get_children() as $child) {
 
       // Bail if the page is full
-      if ( !$page->in_nested_table() && $page->is_full() )
+      if (!$page->in_nested_table() && $page->is_full())
         break;
 
       $child->set_containing_block($content_x, $content_y, $width, $h);
       $child->reflow();
 
-      if ( !$page->in_nested_table() )
+      if (!$page->in_nested_table())
         // Check if a split has occured
         $page->check_page_break($child);
 
@@ -489,7 +489,7 @@ 
     // Assign heights to our cells:
     $style->height = $this->_calculate_height();
 
-    if ( $style->border_collapse === "collapse" ) {
+    if ($style->border_collapse === "collapse") {
       // Unset our borders because our cells are now using them
       $style->border_style = "none";
     }
@@ -504,7 +504,7 @@ 
 
   function get_min_max_width() {
 
-    if ( !is_null($this->_min_max_cache)  )
+    if (!is_null($this->_min_max_cache))
       return $this->_min_max_cache;
 
     $style = $this->_frame->get_style();
@@ -529,16 +529,16 @@ 
     $this->_state["percent"] = array();
     $this->_state["auto"] = array();
 
-    $columns =& $this->_frame->get_cellmap()->get_columns();
+    $columns = & $this->_frame->get_cellmap()->get_columns();
     foreach (array_keys($columns) as $i) {
       $this->_state["min_width"] += $columns[$i]["min-width"];
       $this->_state["max_width"] += $columns[$i]["max-width"];
 
-      if ( $columns[$i]["absolute"] > 0 ) {
+      if ($columns[$i]["absolute"] > 0) {
         $this->_state["absolute"][] = $i;
         $this->_state["absolute_used"] += $columns[$i]["absolute"];
 
-      } else if ( $columns[$i]["percent"] > 0 ) {
+      } else if ($columns[$i]["percent"] > 0) {
         $this->_state["percent"][] = $i;
         $this->_state["percent_used"] += $columns[$i]["percent"];
 
@@ -556,7 +556,7 @@ 
                   $style->margin_left,
                   $style->margin_right);
 
-    if ( $style->border_collapse !== "collapse" ) 
+    if ($style->border_collapse !== "collapse") 
       list($dims[]) = $style->border_spacing;
 
     $delta = $style->length_in_pt($dims, $this->_frame->get_containing_block("w"));

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

Spacing +47 added lines, -47 removed lines

@@ -43,10 +43,10 @@ 
 /**
  * @access private
  */
-define("_TTF2AFM", escapeshellarg(TTF2AFM) . " -a -GAef -OW ");
+define("_TTF2AFM", escapeshellarg(TTF2AFM)." -a -GAef -OW ");
 
-if ( !file_exists(TTF2AFM) ) {
-  die("Unable to locate the ttf2afm / ttf2pt1 executable (checked " . TTF2AFM . ").\n");
+if (!file_exists(TTF2AFM)) {
+  die("Unable to locate the ttf2afm / ttf2pt1 executable (checked ".TTF2AFM.").\n");
 }
 
 
@@ -87,7 +87,7 @@ 
 
 }
 
-if ( $_SERVER["argc"] < 3 ) {
+if ($_SERVER["argc"] < 3) {
   usage();
   die();
 }
@@ -109,7 +109,7 @@ 
 function install_font_family($fontname, $normal, $bold = null, $italic = null, $bold_italic = null) {
 
   // Check if the base filename is readable
-  if ( !is_readable($normal) )
+  if (!is_readable($normal))
     throw new DOMPDF_Exception("Unable to read '$normal'.");
 
   $dir = dirname($normal);
@@ -125,64 +125,64 @@ 
 
   // Try $file_Bold.$ext etc.
 
-  if ( !isset($bold) || !is_readable($bold) ) {
-    $bold   = $dir . "/" . $file . "_Bold" . $ext;
-    if ( !is_readable($bold) ) {
+  if (!isset($bold) || !is_readable($bold)) {
+    $bold = $dir."/".$file."_Bold".$ext;
+    if (!is_readable($bold)) {
 
       // Try $file . "b"
-      $bold = $dir . "/" . $file . "b" . $ext;
-      if ( !is_readable($bold) ) {
+      $bold = $dir."/".$file."b".$ext;
+      if (!is_readable($bold)) {
 
         // Try $file . "B"
-        $bold = $dir . "/" . $file . "B" . $ext;
-        if ( !is_readable($bold) )
+        $bold = $dir."/".$file."B".$ext;
+        if (!is_readable($bold))
           $bold = null;
       }
     }
   }
 
-  if ( is_null($bold) )
+  if (is_null($bold))
     echo ("Unable to find bold face file.\n");
 
-  if ( !isset($italic) || !is_readable($italic) ) {
-    $italic = $dir . "/" . $file . "_Italic" . $ext;
-    if ( !is_readable($italic) ) {
+  if (!isset($italic) || !is_readable($italic)) {
+    $italic = $dir."/".$file."_Italic".$ext;
+    if (!is_readable($italic)) {
 
       // Try $file . "i"
-      $italic = $dir . "/" . $file . "i" . $ext;
-      if ( !is_readable($italic) ) {
+      $italic = $dir."/".$file."i".$ext;
+      if (!is_readable($italic)) {
 
         // Try $file . "I"
-        $italic = $dir . "/" . $file . "I" . $ext;
-        if ( !is_readable($italic) )
+        $italic = $dir."/".$file."I".$ext;
+        if (!is_readable($italic))
           $italic = null;
       }
     }
   }
 
-  if ( is_null($italic) )
+  if (is_null($italic))
     echo ("Unable to find italic face file.\n");
 
-  if ( !isset($bold_italic) || !is_readable($bold_italic) ) {
-    $bold_italic = $dir . "/" . $file . "_Bold_Italic" . $ext;
+  if (!isset($bold_italic) || !is_readable($bold_italic)) {
+    $bold_italic = $dir."/".$file."_Bold_Italic".$ext;
 
-    if ( !is_readable($bold_italic) ) {
+    if (!is_readable($bold_italic)) {
 
       // Try $file . "bi"
-      $bold_italic = $dir . "/" . $file . "bi" . $ext;
-      if ( !is_readable($bold_italic) ) {
+      $bold_italic = $dir."/".$file."bi".$ext;
+      if (!is_readable($bold_italic)) {
 
         // Try $file . "BI"
-        $bold_italic = $dir . "/" . $file . "BI" . $ext;
-        if ( !is_readable($bold_italic) ) {
+        $bold_italic = $dir."/".$file."BI".$ext;
+        if (!is_readable($bold_italic)) {
 
           // Try $file . "ib"
-          $bold_italic = $dir . "/" . $file . "ib" . $ext;
-          if ( !is_readable($bold_italic) ) {
+          $bold_italic = $dir."/".$file."ib".$ext;
+          if (!is_readable($bold_italic)) {
 
             // Try $file . "IB"
-            $bold_italic = $dir . "/" . $file . "IB" . $ext;
-            if ( !is_readable($bold_italic) )
+            $bold_italic = $dir."/".$file."IB".$ext;
+            if (!is_readable($bold_italic))
               $bold_italic = null;
           }
         }
@@ -190,34 +190,34 @@ 
     }
   }
 
-  if ( is_null($bold_italic) )
+  if (is_null($bold_italic))
     echo ("Unable to find bold italic face file.\n");
 
   $fonts = compact("normal", "bold", "italic", "bold_italic");
   $entry = array();
 
-  if ( strtolower($ext) === ".pfb" || strtolower($ext) === ".ttf" || strtolower($ext) === ".otf"  ) {
+  if (strtolower($ext) === ".pfb" || strtolower($ext) === ".ttf" || strtolower($ext) === ".otf") {
 
     // Copy the files to the font directory.
     foreach ($fonts as $var => $src) {
 
-      if ( is_null($src) ) {
-        $entry[$var] = DOMPDF_FONT_DIR . basename($normal);
+      if (is_null($src)) {
+        $entry[$var] = DOMPDF_FONT_DIR.basename($normal);
         continue;
       }
 
       // Verify that the fonts exist and are readable
-      if ( !is_readable($src) )
+      if (!is_readable($src))
         throw new User_DOMPDF_Exception("Requested font '$pathname' is not readable");
 
-      $dest = DOMPDF_FONT_DIR . basename($src);
-      if ( !is_writeable(dirname($dest)) )
+      $dest = DOMPDF_FONT_DIR.basename($src);
+      if (!is_writeable(dirname($dest)))
         throw new User_DOMPDF_Exception("Unable to write to destination '$dest'.");
 
       echo "Copying $src to $dest...\n";
 
-      if ( !copy($src, $dest) )
-        throw new DOMPDF_Exception("Unable to copy '$src' to '" . DOMPDF_FONT_DIR . "$dest'.");
+      if (!copy($src, $dest))
+        throw new DOMPDF_Exception("Unable to copy '$src' to '".DOMPDF_FONT_DIR."$dest'.");
 
       $entry[$var] = $dest;
     }
@@ -227,16 +227,16 @@ 
 
 
   // If the extension is a ttf, try and convert the fonts to afm too
-  if ( mb_strtolower($ext) === ".ttf" || strtolower($ext) === ".otf" ) {
+  if (mb_strtolower($ext) === ".ttf" || strtolower($ext) === ".otf") {
     foreach ($fonts as $var => $font) {
-      if ( is_null($font) ) {
-        $entry[$var] = DOMPDF_FONT_DIR . mb_substr(basename($normal), 0, -4);
+      if (is_null($font)) {
+        $entry[$var] = DOMPDF_FONT_DIR.mb_substr(basename($normal), 0, -4);
         continue;
       }
-      $dest = DOMPDF_FONT_DIR . mb_substr(basename($font),0, -4);
+      $dest = DOMPDF_FONT_DIR.mb_substr(basename($font), 0, -4);
       echo "Generating .afm for $font...\n";
-      echo "Command: " . _TTF2AFM . " " . escapeshellarg($font) . " " . escapeshellarg($dest) . "\n";
-      exec( _TTF2AFM . " " . escapeshellarg($font) . " " . escapeshellarg($dest) . " &> /dev/null", $output, $ret );
+      echo "Command: "._TTF2AFM." ".escapeshellarg($font)." ".escapeshellarg($dest)."\n";
+      exec(_TTF2AFM." ".escapeshellarg($font)." ".escapeshellarg($dest)." &> /dev/null", $output, $ret);
 
       $entry[$var] = $dest;
     }

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

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