chamilo / chamilo-lms

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

Indentation +137 added lines, -137 removed lines

@@ -63,18 +63,18 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
+    if ($return)
     return "<pre>" . print_r($mixed, true) . "</pre>";
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo ("<pre>");
-  print_r($mixed);
+    print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
-  else
+    else
     echo ("\n");
-  flush();
+    flush();
 
 }
 }
@@ -89,10 +89,10 @@ 
  */
 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")
+    var_dump($mixed);
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
 }
 }
@@ -115,41 +115,41 @@ 
  * 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;
-  }
+    }
 
-  // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
+    // Is the url already fully qualified?
+    if ( mb_strpos($url, "://") !== false )
     return $url;
 
-  $ret = $protocol;
+    $ret = $protocol;
 
-  if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
+    if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
     //On Windows local file, an abs path can begin also with a '\' or a drive letter and colon
     //drive: followed by a relative path would be a drive specific default folder.
     //not known in php app code, treat as abs path
     //($url[1] !== ':' || ($url[2]!=='\\' && $url[2]!=='/'))
     if ($url[0] !== '/' && (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' || ($url[0] !== '\\' && $url[1] !== ':'))) {
-      // For rel path and local acess we ignore the host, and run the path through realpath()
-      $ret .= realpath($base_path).'/';
+        // For rel path and local acess we ignore the host, and run the path through realpath()
+        $ret .= realpath($base_path).'/';
     }
     $ret .= $url;
     return $ret;
-  }
+    }
 
-  //remote urls with backslash in html/css are not really correct, but lets be genereous
-  if ( $url[0] === '/' || $url[0] === '\\' ) {
+    //remote urls with backslash in html/css are not really correct, but lets be genereous
+    if ( $url[0] === '/' || $url[0] === '\\' ) {
     // Absolute path
     $ret .= $host . $url;
-  } else {
+    } else {
     // Relative path
     //$base_path = $base_path !== "" ? rtrim($base_path, "/\\") . "/" : "";
     $ret .= $host . $base_path . $url;
-  }
+    }
 
-  return $ret;
+    return $ret;
 
 }
 
@@ -161,56 +161,56 @@ 
  * @return array
  */
 function explode_url($url) {
-  $protocol = "";
-  $host = "";
-  $path = "";
-  $file = "";
+    $protocol = "";
+    $host = "";
+    $path = "";
+    $file = "";
 
-  $arr = parse_url($url);
+    $arr = parse_url($url);
 
-  if ( isset($arr["scheme"]) &&
+    if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
        mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
 
     if ( isset($arr["user"]) ) {
-      $host .= $arr["user"];
+        $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
+        if ( isset($arr["pass"]) )
         $host .= "@" . $arr["pass"];
 
-      $host .= ":";
+        $host .= ":";
     }
 
     if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+        $host .= $arr["host"];
 
     if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+        $host .= ":" . $arr["port"];
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
-      // Do we have a trailing slash?
-      if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
+        // Do we have a trailing slash?
+        if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
         $path = $arr["path"];
         $file = "";
-      } else {
+        } else {
         $path = dirname($arr["path"]) . "/";
         $file = basename($arr["path"]);
-      }
+        }
     }
 
     if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+        $file .= "?" . $arr["query"];
 
     if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+        $file .= "#" . $arr["fragment"];
 
-  } else {
+    } else {
 
     $i = mb_strpos($url, "file://");
     if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+        $url = mb_substr($url, $i + 7);
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -222,28 +222,28 @@ 
 
     // Check that the path exists
     if ( $path !== false ) {
-      $path .= '/';
+        $path .= '/';
 
     } else {
-      // generate a url to access the file if no real path found.
-      $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
+        // generate a url to access the file if no real path found.
+        $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
 
-      $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
+        $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 {
+        } else {
         $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"];
-      }
+        }
+    }
     }
-  }
-
-  $ret = array($protocol, $host, $path, $file,
-               "protocol" => $protocol,
-               "host" => $host,
-               "path" => $path,
-               "file" => $file);
-  return $ret;
+
+    $ret = array($protocol, $host, $path, $file,
+                "protocol" => $protocol,
+                "host" => $host,
+                "path" => $path,
+                "file" => $file);
+    return $ret;
 }
 
 /**
@@ -254,41 +254,41 @@ 
  */
 function dec2roman($num) {
 
-  static $ones = array("", "i", "ii", "iii", "iv", "v",
-                       "vi", "vii", "viii", "ix");
-  static $tens = array("", "x", "xx", "xxx", "xl", "l",
-                       "lx", "lxx", "lxxx", "xc");
-  static $hund = array("", "c", "cc", "ccc", "cd", "d",
-                       "dc", "dcc", "dccc", "cm");
-  static $thou = array("", "m", "mm", "mmm");
+    static $ones = array("", "i", "ii", "iii", "iv", "v",
+                        "vi", "vii", "viii", "ix");
+    static $tens = array("", "x", "xx", "xxx", "xl", "l",
+                        "lx", "lxx", "lxxx", "xc");
+    static $hund = array("", "c", "cc", "ccc", "cd", "d",
+                        "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)) {
+    $ret = "";
+    switch (mb_strlen($num)) {
 
-  case 4:
+    case 4:
     $ret .= $thou[$num[3]];
 
-  case 3:
+    case 3:
     $ret .= $hund[$num[2]];
 
-  case 2:
+    case 2:
     $ret .= $tens[$num[1]];
 
-  case 1:
+    case 1:
     $ret .= $ones[$num[0]];
 
-  default:
+    default:
     break;
-  }
-  return $ret;
+    }
+    return $ret;
 
 }
 
@@ -305,84 +305,84 @@ 
  */
 
 if ( !function_exists("mb_convert_encoding") ) {
-  function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
+    function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
-      return utf8_encode($data);
+        return utf8_encode($data);
     } else {
-      return utf8_decode($data);
+        return utf8_decode($data);
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_detect_encoding") ) {
-  function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
+    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')) {
+    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) {
+    function mb_internal_encoding($encoding=NULL) {
     if (isset($encoding)) {
-      return true;
+        return true;
     } else {
-      return 'iso-8859-1';
+        return 'iso-8859-1';
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strlen") ) {
-  function mb_strlen($str, $encoding='iso-8859-1') {
+    function mb_strlen($str, $encoding='iso-8859-1') {
     if (str_replace('-', '', strtolower($encoding)) == 'utf8') {
-      return strlen(utf8_encode($data));
+        return strlen(utf8_encode($data));
     } else {
-      return strlen(utf8_decode($data));
+        return strlen(utf8_decode($data));
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strpos") ) {
-  function mb_strpos($haystack, $needle, $offset = 0) {
+    function mb_strpos($haystack, $needle, $offset = 0) {
     return strpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strrpos") ) {
-  function mb_strrpos($haystack, $needle, $offset = 0) {
+    function mb_strrpos($haystack, $needle, $offset = 0) {
     return strrpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtolower") ) {
-  function mb_strtolower($str) {
+    function mb_strtolower($str) {
     return strtolower($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtoupper") ) {
-  function mb_strtoupper($str) {
+    function mb_strtoupper($str) {
     return strtoupper($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_substr") ) {
-  function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
+    function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
     if ( is_null($length) )
-      return substr($str, $start);
+        return substr($str, $start);
     else
-      return substr($str, $start, $length);
-  }
+        return substr($str, $start, $length);
+    }
 }
 
 if ( !function_exists("mb_substr_count") ) {
-  function mb_substr_count($haystack, $needle) {
+    function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
-  }
+    }
 }
 
 /**
@@ -402,40 +402,40 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+    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;
+    global $_dompdf_warnings;
+    global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
+    if ( $_dompdf_show_warnings )
     echo $errstr . "\n";
 
-  $_dompdf_warnings[] = $errstr;
+    $_dompdf_warnings[] = $errstr;
 }
 
 /**
  * Print a useful backtrace
  */
 function bt() {
-  $bt = debug_backtrace();
+    $bt = debug_backtrace();
 
-  array_shift($bt); // remove actual bt() call
-  echo "\n";
+    array_shift($bt); // remove actual bt() call
+    echo "\n";
 
-  $i = 0;
-  foreach ($bt as $call) {
+    $i = 0;
+    foreach ($bt as $call) {
     $file = basename($call["file"]) . " (" . $call["line"] . ")";
     if ( isset($call["class"]) ) {
-      $func = $call["class"] . "->" . $call["function"] . "()";
+        $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";
     $i++;
-  }
-  echo "\n";
+    }
+    echo "\n";
 }
 
 /**
@@ -444,15 +444,15 @@ 
  * @param string $type  The type of debug messages to print
  */
 function dompdf_debug($type, $msg) {
-  global $_DOMPDF_DEBUG_TYPES;
-  global $_dompdf_show_warnings;
-  global $_dompdf_debug;
-  if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
+    global $_DOMPDF_DEBUG_TYPES;
+    global $_dompdf_show_warnings;
+    global $_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"] . ": ";
     pre_r($msg);
-  }
+    }
 }
 
 /**
@@ -460,20 +460,20 @@ 
  */
 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");
+    global $memusage;
+    echo ("Memory Usage\n");
+    $prev = 0;
+    $initial = reset($memusage);
+    echo (str_pad("Initial:", 40) . $initial . "\n\n");
 
-  foreach ($memusage as $key=>$mem) {
+    foreach ($memusage as $key=>$mem) {
     $mem -= $initial;
     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";
 }
 }
 
@@ -495,8 +495,8 @@ 
  */
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
-  global $memusage;
-  if ( isset($memusage) )
+    global $memusage;
+    if ( isset($memusage) )
     $memusage[$location] = memory_get_usage();
 }
 }
@@ -507,7 +507,7 @@ 
  * @link http://us.php.net/manual/en/function.sys-get-temp-dir.php#85261
  */
 if ( !function_exists('sys_get_temp_dir')) {
-  function 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']); }
@@ -516,5 +516,5 @@ 
     unlink($tempfile);
     return realpath(dirname($tempfile));
     }
-  }
+    }
 }

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

Indentation +106 added lines, -107 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: block_frame_decorator.cls.php,v $
- * Created on: 2004-06-02
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: block_frame_decorator.cls.php,v $
+     * Created on: 2004-06-02
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: block_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,16 +46,16 @@ 
  */
 class Block_Frame_Decorator extends Frame_Decorator {
 
-  const DEFAULT_COUNTER = "-dompdf-default-counter";
+    const DEFAULT_COUNTER = "-dompdf-default-counter";
 
-  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 $_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
 
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -66,11 +65,11 @@ 
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -79,67 +78,67 @@ 
                                 "h" => 0));
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Accessor methods
+    // Accessor methods
 
-  function get_current_line($i = null) {
+    function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
     if ( isset($i) )
-      return $cl[$i];
+        return $cl[$i];
     return $cl;
-  }
+    }
 
-  function get_lines() { return $this->_lines; }
+    function get_lines() { return $this->_lines; }
 
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_current_line($y = null, $w = null, $h = null) {
+    // Set methods
+    function set_current_line($y = null, $w = null, $h = null) {
     $this->set_line($this->_cl, $y, $w, $h);
-  }
+    }
 
-  function clear_line($i) {
+    function clear_line($i) {
     if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
-  }
+        unset($this->_lines[$i]);
+    }
 
-  function set_line($lineno, $y = null, $w = null, $h = null) {
+    function set_line($lineno, $y = null, $w = null, $h = null) {
 
     if ( is_array($y) )
-      extract($y);
+        extract($y);
 
     if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+        $this->_lines[$lineno]["y"] = $y;
 
     if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+        $this->_lines[$lineno]["w"] = $w;
 
     if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+        $this->_lines[$lineno]["h"] = $h;
 
-  }
+    }
 
 
-  function add_frame_to_line(Frame $frame) {
+    function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
     if ( $frame instanceof Inline_Frame_Decorator ) {
 
-      // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
+        // Handle line breaks
+        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)
+        // Add each child of the inline frame to the line individually
+        foreach ($frame->get_children() as $child)
         $this->add_frame_to_line( $child );
 
-      return;
+        return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
@@ -149,15 +148,15 @@ 
          ($frame->get_style()->white_space !== "pre" ||
           $frame->get_style()->white_space !== "pre-wrap") ) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
-      $frame->recalculate_width();
+        $frame->set_text( ltrim($frame->get_text()) );
+        $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
     if ( $w == 0 )
-      return;
+        return;
 
     // Debugging code:
     /*
@@ -177,7 +176,7 @@ 
     // End debugging
 
     if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+        $this->add_line();
 
     $frame->position();
 
@@ -185,55 +184,55 @@ 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
     if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+        $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
 
-  }
+    }
 
-  function remove_frames_from_line(Frame $frame) {
+    function remove_frames_from_line(Frame $frame) {
     // Search backwards through the lines for $frame
     $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--;
+        $i--;
     }
 
     if ( $j === false )
-      return;
+        return;
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
-      $f = $this->_lines[$i]["frames"][$j];
-      unset($this->_lines[$i]["frames"][$j++]);
-      $this->_lines[$i]["w"] -= $f->get_margin_width();
+        $f = $this->_lines[$i]["frames"][$j];
+        unset($this->_lines[$i]["frames"][$j++]);
+        $this->_lines[$i]["w"] -= $f->get_margin_width();
     }
 
     // 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) {
+    function increase_line_width($w) {
     $this->_lines[ $this->_cl ]["w"] += $w;
-  }
+    }
 
-  function maximize_line_height($val) {
+    function maximize_line_height($val) {
     $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
-  }
+    }
 
-  function add_line() {
+    function add_line() {
 
 //     if ( $this->_lines[$this->_cl]["h"] == 0 ) //count($this->_lines[$i]["frames"]) == 0 ||
 //       return;
@@ -241,28 +240,28 @@ 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
     $this->_lines[ ++$this->_cl ] = array("frames" => array(),
-                                          "wc" => 0,
-                                          "y" => $y, "w" => 0, "h" => 0);
-  }
+                                            "wc" => 0,
+                                            "y" => $y, "w" => 0, "h" => 0);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
+    function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
     $this->_counters[$id] = $value;
-  }
+    }
 
-  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
+    function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
+        $this->_counters[$id] = $increment;
     else
-      $this->_counters[$id] += $increment;
+        $this->_counters[$id] += $increment;
 
-  }
+    }
 
-  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
+    function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+        $this->_counters[$id] = 0;
 
     switch ($type) {
 
@@ -293,5 +292,5 @@ 
     case "upper-greek":
       return chr($this->_counters[$id] + 912);
     }
-  }
+    }
 }

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

Indentation +1142 added lines, -1142 removed lines

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

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

Indentation +104 added lines, -105 removed lines

@@ -1,42 +1,41 @@ 
 #!/usr/bin/php
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: load_font.php,v $
- * Created on: 2004-06-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: load_font.php,v $
+     * Created on: 2004-06-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 require_once("dompdf_config.inc.php");
 
@@ -46,7 +45,7 @@ 
 define("_TTF2AFM", escapeshellarg(TTF2AFM) . " -a -GAef -OW ");
 
 if ( !file_exists(TTF2AFM) ) {
-  die("Unable to locate the ttf2afm / ttf2pt1 executable (checked " . TTF2AFM . ").\n");
+    die("Unable to locate the ttf2afm / ttf2pt1 executable (checked " . TTF2AFM . ").\n");
 }
 
 
@@ -56,7 +55,7 @@ 
  */
 function usage() {
 
-  echo <<<EOD
+    echo <<<EOD
 
 Usage: {$_SERVER["argv"][0]} font_family n_file [b_file] [i_file] [bi_file]
 
@@ -88,8 +87,8 @@ 
 }
 
 if ( $_SERVER["argc"] < 3 ) {
-  usage();
-  die();
+    usage();
+    die();
 }
 
 /**
@@ -108,148 +107,148 @@ 
  */
 function install_font_family($fontname, $normal, $bold = null, $italic = null, $bold_italic = null) {
 
-  // Check if the base filename is readable
-  if ( !is_readable($normal) )
+    // Check if the base filename is readable
+    if ( !is_readable($normal) )
     throw new DOMPDF_Exception("Unable to read '$normal'.");
 
-  $dir = dirname($normal);
-  $basename = basename($normal);
-  $last_dot = strrpos($basename, '.');
-  if ($last_dot !== false) {
+    $dir = dirname($normal);
+    $basename = basename($normal);
+    $last_dot = strrpos($basename, '.');
+    if ($last_dot !== false) {
     $file = substr($basename, 0, $last_dot);
     $ext = substr($basename, $last_dot);
-  } else {
+    } else {
     $file = $basename;
     $ext = '';
-  }
+    }
 
-  // Try $file_Bold.$ext etc.
+    // Try $file_Bold.$ext etc.
 
-  if ( !isset($bold) || !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) ) {
+        // Try $file . "b"
+        $bold = $dir . "/" . $file . "b" . $ext;
+        if ( !is_readable($bold) ) {
 
         // Try $file . "B"
         $bold = $dir . "/" . $file . "B" . $ext;
         if ( !is_readable($bold) )
-          $bold = null;
-      }
+            $bold = null;
+        }
+    }
     }
-  }
 
-  if ( is_null($bold) )
+    if ( is_null($bold) )
     echo ("Unable to find bold face file.\n");
 
-  if ( !isset($italic) || !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) ) {
+        // Try $file . "i"
+        $italic = $dir . "/" . $file . "i" . $ext;
+        if ( !is_readable($italic) ) {
 
         // Try $file . "I"
         $italic = $dir . "/" . $file . "I" . $ext;
         if ( !is_readable($italic) )
-          $italic = null;
-      }
+            $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) ) {
+    if ( !isset($bold_italic) || !is_readable($bold_italic) ) {
     $bold_italic = $dir . "/" . $file . "_Bold_Italic" . $ext;
 
     if ( !is_readable($bold_italic) ) {
 
-      // Try $file . "bi"
-      $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) ) {
 
         // Try $file . "BI"
         $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) ) {
+            // Try $file . "ib"
+            $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 = null;
-          }
+                $bold_italic = null;
+            }
         }
-      }
+        }
+    }
     }
-  }
 
-  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();
+    $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) ) {
+        if ( is_null($src) ) {
         $entry[$var] = DOMPDF_FONT_DIR . basename($normal);
         continue;
-      }
+        }
 
-      // Verify that the fonts exist and are readable
-      if ( !is_readable($src) )
+        // Verify that the fonts exist and are readable
+        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";
+        echo "Copying $src to $dest...\n";
 
-      if ( !copy($src, $dest) )
+        if ( !copy($src, $dest) )
         throw new DOMPDF_Exception("Unable to copy '$src' to '" . DOMPDF_FONT_DIR . "$dest'.");
 
-      $entry[$var] = $dest;
+        $entry[$var] = $dest;
     }
 
-  } else
+    } else
     throw new DOMPDF_Exception("Unable to process fonts of type '$ext'.");
 
 
-  // If the extension is a ttf, try and convert the fonts to afm too
-  if ( mb_strtolower($ext) === ".ttf" || strtolower($ext) === ".otf" ) {
+    // If the extension is a ttf, try and convert the fonts to afm too
+    if ( mb_strtolower($ext) === ".ttf" || strtolower($ext) === ".otf" ) {
     foreach ($fonts as $var => $font) {
-      if ( is_null($font) ) {
+        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);
-      echo "Generating .afm for $font...\n";
-      echo "Command: " . _TTF2AFM . " " . escapeshellarg($font) . " " . escapeshellarg($dest) . "\n";
-      exec( _TTF2AFM . " " . escapeshellarg($font) . " " . escapeshellarg($dest) . " &> /dev/null", $output, $ret );
+        }
+        $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 );
 
-      $entry[$var] = $dest;
+        $entry[$var] = $dest;
     }
 
-  }
+    }
 
-  // FIXME: how to generate afms from pfb?
+    // FIXME: how to generate afms from pfb?
 
-  // Store the fonts in the lookup table
-  Font_Metrics::set_font_family(strtolower($fontname), $entry);
+    // Store the fonts in the lookup table
+    Font_Metrics::set_font_family(strtolower($fontname), $entry);
 
-  // Save the changes
-  Font_Metrics::save_font_families();
+    // Save the changes
+    Font_Metrics::save_font_families();
 }
 
 

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

Indentation +2039 added lines, -2039 removed lines

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

main/inc/lib/phpdocx/classes/CreateExcelTable.inc

Indentation +13 added lines, -13 removed lines

@@ -132,11 +132,11 @@ 
             $chart++;
         $rows++;
         $this->_xml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.
-                      '<table xmlns="http://schemas.openxmlformats.org/spreads'.
-                      'heetml/2006/main" id="1" name="Tabla1" displayName='.
-                      '"Tabla1" ref="A1:' . $chart . $rows .
-                      '" totalsRowShown="0" tableBorderDxfId="0">'.
-                      '__GENERATETABLE__</table>';
+                        '<table xmlns="http://schemas.openxmlformats.org/spreads'.
+                        'heetml/2006/main" id="1" name="Tabla1" displayName='.
+                        '"Tabla1" ref="A1:' . $chart . $rows .
+                        '" totalsRowShown="0" tableBorderDxfId="0">'.
+                        '__GENERATETABLE__</table>';
     }
 
     /**
@@ -148,7 +148,7 @@ 
     protected function generateTABLECOLUMNS($count = '2')
     {
         $xml = '<tableColumns count="' . $count .
-               '">__GENERATETABLECOLUMNS__</tableColumns>__GENERATETABLE__';
+                '">__GENERATETABLECOLUMNS__</tableColumns>__GENERATETABLE__';
         
         $this->_xml = str_replace('__GENERATETABLE__', $xml, $this->_xml);
     }
@@ -180,15 +180,15 @@ 
      * @access protected
      */
     protected function generateTABLESTYLEINFO($showFirstColumn = '0',
-                                               $showLastColumn  = "0",
-                                               $showRowStripes  = "1",
-                                               $showColumnStripes = "0")
+                                                $showLastColumn  = "0",
+                                                $showRowStripes  = "1",
+                                                $showColumnStripes = "0")
     {
         $xml = '<tableStyleInfo   showFirstColumn="' . $showFirstColumn .
-               '" showLastColumn="' . $showLastColumn .
-               '" showRowStripes="' . $showRowStripes .
-               '" showColumnStripes="' . $showColumnStripes .
-               '"></tableStyleInfo >';
+                '" showLastColumn="' . $showLastColumn .
+                '" showRowStripes="' . $showRowStripes .
+                '" showColumnStripes="' . $showColumnStripes .
+                '"></tableStyleInfo >';
         
         $this->_xml = str_replace('__GENERATETABLE__', $xml, $this->_xml);
     }

main/inc/lib/phpdocx/classes/CreateExcelSharedStrings.inc

Indentation +4 added lines, -4 removed lines

@@ -142,10 +142,10 @@
     protected function generateSST($num)
     {
         $this->_xml = '<?xml version="1.0" encoding="UTF-8" '.
-                      'standalone="yes" ?><sst xmlns="http://schemas.'.
-                      'openxmlformats.org/spreadsheetml/2006/main" '.
-                      'count="' . $num . '" uniqueCount="' . $num .
-                      '">__GENERATESST__</sst>';
+                        'standalone="yes" ?><sst xmlns="http://schemas.'.
+                        'openxmlformats.org/spreadsheetml/2006/main" '.
+                        'count="' . $num . '" uniqueCount="' . $num .
+                        '">__GENERATESST__</sst>';
     }
 
     /**

main/inc/lib/phpdocx/classes/CreateElement.inc

Indentation +8 added lines, -8 removed lines

@@ -228,7 +228,7 @@ 
      * @access protected
      */
     protected function generateINLINE($distT = '0', $distB ='0',
-                                      $distL = '0', $distR ='0')
+                                        $distL = '0', $distR ='0')
     {
         $xml = '<' . CreateImage::NAMESPACEWORD .
                 ':inline distT="' . $distT . '" distB="' . $distB .
@@ -255,11 +255,11 @@ 
      * @access protected
      */
     protected function generateANCHOR($behindDoc = 0, $distT = '0',
-                                      $distB = '0', $distL = '114300',
-                                      $distR = '114300', $simplePos = 0,
-                                      $relativeHeight = '251658240',
-                                      $locked = 0, $layoutInCell = 1,
-                                      $allowOverlap = 1)
+                                        $distB = '0', $distL = '114300',
+                                        $distR = '114300', $simplePos = 0,
+                                        $relativeHeight = '251658240',
+                                        $locked = 0, $layoutInCell = 1,
+                                        $allowOverlap = 1)
     {
         $xml = '<' . CreateImage::NAMESPACEWORD . ':anchor distT="' . $distT .
                 '" distB="' . $distB . '" distL="' . $distL .
@@ -871,8 +871,8 @@ 
     protected function generateQUITAR()
     {
         $this->_xml = '<' . CreateElement::NAMESPACEWORD .
-                      ':r>__GENERATER__</' . CreateElement::NAMESPACEWORD .
-                      ':r>';
+                        ':r>__GENERATER__</' . CreateElement::NAMESPACEWORD .
+                        ':r>';
     }
 
     /**

main/inc/lib/phpdocx/classes/CreateGraphic.inc

Indentation +3 added lines, -3 removed lines

@@ -993,8 +993,8 @@ 
     protected function generateLEGENDPOS($val = 'r')
     {
         $xml = '<' . CreateGraphic::NAMESPACEWORD . ':legendPos val="' . 
-             $val . '"></' . CreateGraphic::NAMESPACEWORD .
-             ':legendPos>__GENERATELEGEND__';
+                $val . '"></' . CreateGraphic::NAMESPACEWORD .
+                ':legendPos>__GENERATELEGEND__';
         $this->_xmlChart = str_replace(
             '__GENERATELEGEND__', $xml, $this->_xmlChart
         );
@@ -1416,7 +1416,7 @@ 
      * @param string $sourceLinked
      */
     protected function generateNUMFMT($formatCode='General',
-                                      $sourceLinked = '1')
+                                        $sourceLinked = '1')
     {
         $this->_xmlChart = str_replace(
             '__GENERATEAX__', '<' .