chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/www/examples.php

Indentation +15 added lines, -15 removed lines

@@ -3,17 +3,17 @@ 
 require_once("../dompdf_config.inc.php");
 if ( isset( $_POST["html"] ) ) {
 
-  if ( get_magic_quotes_gpc() )
+    if ( get_magic_quotes_gpc() )
     $_POST["html"] = stripslashes($_POST["html"]);
   
-  $dompdf = new DOMPDF();
-  $dompdf->load_html($_POST["html"]);
-  $dompdf->set_paper($_POST["paper"], $_POST["orientation"]);
-  $dompdf->render();
+    $dompdf = new DOMPDF();
+    $dompdf->load_html($_POST["html"]);
+    $dompdf->set_paper($_POST["paper"], $_POST["orientation"]);
+    $dompdf->render();
 
-  $dompdf->stream("dompdf_out.pdf");
+    $dompdf->stream("dompdf_out.pdf");
 
-  exit(0);
+    exit(0);
 }
 
 ?>
@@ -42,18 +42,18 @@ 
 $dompdf = dirname(dirname($_SERVER["PHP_SELF"]));
 //echo '<li>['.$dompdf.']</li>';
 if ( $dompdf == '/' || $dompdf == '\\') {
-  $dompdf = '';
+    $dompdf = '';
 }
 //echo '<li>['.$dompdf.']</li>';
 $dompdf .= "/dompdf.php?base_path=" . rawurlencode("www/test/");
 //echo '<li>['.$dompdf.']</li>';
 foreach ( $test_files as $file ) {
-  $file = basename($file);
-  $arrow = "images/arrow_0" . rand(1, 6) . ".gif";  
-  echo "<li style=\"list-style-image: url('$arrow');\">\n";
-  echo $file;
-  echo " [<a class=\"button\" target=\"blank\" href=\"test/$file\">HTML</a>] [<a class=\"button\" href=\"$dompdf&input_file=" . rawurlencode("$file") .  "\">PDF</a>]\n";
-  echo "</li>\n";
+    $file = basename($file);
+    $arrow = "images/arrow_0" . rand(1, 6) . ".gif";  
+    echo "<li style=\"list-style-image: url('$arrow');\">\n";
+    echo $file;
+    echo " [<a class=\"button\" target=\"blank\" href=\"test/$file\">HTML</a>] [<a class=\"button\" href=\"$dompdf&input_file=" . rawurlencode("$file") .  "\">PDF</a>]\n";
+    echo "</li>\n";
 }
 ?>
 </ul>
@@ -69,7 +69,7 @@ 
 <select name="paper">
 <?php
 foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size )
-  echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
+    echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
 ?>
 </select>
 <select name="orientation">

main/inc/lib/phpdocx/pdf/www/head.inc

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 function li_arrow() {
-  return '<li style="list-style-image: url(\'images/arrow_0' . rand(1,6) . '.gif\');">';  
+    return '<li style="list-style-image: url(\'images/arrow_0' . rand(1,6) . '.gif\');">';  
 }
 function li_star() {
-  return '<li style="list-style-image: url(\'images/star_0' . rand(1,5) . '.gif\');">';  
+    return '<li style="list-style-image: url(\'images/star_0' . rand(1,5) . '.gif\');">';  
 }
 ?>
 <?php echo '<?' . 'xml version="1.0" encoding="iso-8859-1"?' . '>'; ?>

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

Indentation +40 added lines, -41 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: inline_positioner.cls.php,v $
- * Created on: 2004-06-08
- *
- * 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: inline_positioner.cls.php,v $
+     * Created on: 2004-06-08
+     *
+     * 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: inline_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 /**
@@ -46,11 +45,11 @@ 
  */
 class Inline_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
 
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
     $cb = $this->_frame->get_containing_block();
 
     // Find our nearest block level parent and access its lines property.
@@ -65,11 +64,11 @@ 
     // End debugging
 
     if ( !$p )
-      throw new DOMPDF_Exception("No block-level parent found.  Not good.");
+        throw new DOMPDF_Exception("No block-level parent found.  Not good.");
 
     $line = $p->get_current_line();
     
     $this->_frame->set_position($cb["x"] + $line["w"], $line["y"]);
 
-  }
+    }
 }

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

Indentation +113 added lines, -113 removed lines

@@ -1,54 +1,54 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: image_cache.cls.php,v $
- * Created on: 2004-08-08
- *
- * 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
- * - On getting type of images don't require any file endings
- *   and don't strip off url parameters,
- *   to allowing dynamically generated sites with image id
- *   in url parameters and not at end of url or missing file extension
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version dompdf_trunk_with_helmut_mods.20090524
- * - Made debug messages more individually configurable
- * @version 20090622
- * - don't cache broken image, but refer to original broken image replacement
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: image_cache.cls.php,v $
+     * Created on: 2004-08-08
+     *
+     * 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
+     * - On getting type of images don't require any file endings
+     *   and don't strip off url parameters,
+     *   to allowing dynamically generated sites with image id
+     *   in url parameters and not at end of url or missing file extension
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Made debug messages more individually configurable
+     * @version 20090622
+     * - don't cache broken image, but refer to original broken image replacement
+     */
 
 /* $Id: image_cache.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -61,25 +61,25 @@ 
  */
 class Image_Cache {
 
-  /**
-   * Array of downloaded images.  Cached so that identical images are
-   * not needlessly downloaded.
-   *
-   * @var array
-   */
-  static protected $_cache = array();
-
-
-  /**
-   * Resolve and fetch an image for use.
-   *
-   * @param string $url        The url of the image
-   * @param string $proto      Default protocol if none specified in $url
-   * @param string $host       Default host if none specified in $url
-   * @param string $base_path  Default path if none specified in $url
-   * @return array             An array with two elements: The local path to the image and the image extension
-   */
-  static function resolve_url($url, $proto, $host, $base_path) {
+    /**
+     * Array of downloaded images.  Cached so that identical images are
+     * not needlessly downloaded.
+     *
+     * @var array
+     */
+    static protected $_cache = array();
+
+
+    /**
+     * Resolve and fetch an image for use.
+     *
+     * @param string $url        The url of the image
+     * @param string $proto      Default protocol if none specified in $url
+     * @param string $host       Default host if none specified in $url
+     * @param string $base_path  Default path if none specified in $url
+     * @return array             An array with two elements: The local path to the image and the image extension
+     */
+    static function resolve_url($url, $proto, $host, $base_path) {
     global $_dompdf_warnings;
 
     $parsed_url = explode_url($url);
@@ -94,23 +94,23 @@ 
     $remote = $remote || ($parsed_url['protocol'] != "");
 
     if ( !DOMPDF_ENABLE_REMOTE && $remote ) {
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-      $ext = "png";
+        $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $ext = "png";
 
-      //debugpng
-      if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
+        //debugpng
+        if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
 
     } else if ( DOMPDF_ENABLE_REMOTE && $remote ) {
-      // Download remote files to a temporary directory
-      $full_url = build_url($proto, $host, $base_path, $url);
+        // Download remote files to a temporary directory
+        $full_url = build_url($proto, $host, $base_path, $url);
 
-      if ( isset(self::$_cache[$full_url]) ) {
+        if ( isset(self::$_cache[$full_url]) ) {
         list($resolved_url,$ext) = self::$_cache[$full_url];
 
         //debugpng
         if ($DEBUGPNG) $full_url_dbg = $full_url.'(cache)';
 
-      } else {
+        } else {
 
         $resolved_url = tempnam(DOMPDF_TEMP_DIR, "ca_dompdf_img_");
         //debugpng
@@ -121,21 +121,21 @@ 
         restore_error_handler();
 
         if ( strlen($image) == 0 ) {
-          //target image not found
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-          $ext = "png";
+            //target image not found
+            $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+            $ext = "png";
 
-          //debugpng
-          if ($DEBUGPNG) $full_url_dbg = $full_url.'(missing)';
+            //debugpng
+            if ($DEBUGPNG) $full_url_dbg = $full_url.'(missing)';
 
         } else {
 
         file_put_contents($resolved_url, $image);
 
-		//e.g. fetch.php?media=url.jpg&cache=1
-		//- Image file name might be one of the dynamic parts of the url, don't strip off!
-		//  if ( preg_match("/.*\.(\w+)/",$url,$match) ) $ext = $match[1];
-		//- a remote url does not need to have a file extension at all
+        //e.g. fetch.php?media=url.jpg&cache=1
+        //- Image file name might be one of the dynamic parts of the url, don't strip off!
+        //  if ( preg_match("/.*\.(\w+)/",$url,$match) ) $ext = $match[1];
+        //- a remote url does not need to have a file extension at all
         //- local cached file does not have a matching file extension
         //Therefore get image type from the content
 
@@ -146,33 +146,33 @@ 
         $imagetypes = array('','gif','jpeg','png','swf');
         $ext = $imagetypes[$imagedim[2]];
         if ( rename($resolved_url,$resolved_url.'.'.$ext) ) {
-          $resolved_url .= '.'.$ext;
+            $resolved_url .= '.'.$ext;
         }
  
- 		//Don't put replacement image into cache - otherwise it will be deleted on cache cleanup.
- 		//Only execute on successfull caching of remote image.
+            //Don't put replacement image into cache - otherwise it will be deleted on cache cleanup.
+            //Only execute on successfull caching of remote image.
         self::$_cache[$full_url] = array($resolved_url,$ext);
 
         } else {
-          //target image is not valid.
-          unlink($resolved_url);
+            //target image is not valid.
+            unlink($resolved_url);
           
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-          $ext = "png";
+            $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+            $ext = "png";
         }
         }
 
-      }
+        }
 
     } else {
 
-      $resolved_url = build_url($proto, $host, $base_path, $url);
-      if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
+        $resolved_url = build_url($proto, $host, $base_path, $url);
+        if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
 
-      if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
+        if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
         //debugpng
         if ($DEBUGPNG) print '[resolve_url exception '.$url.']';
-          throw new DOMPDF_Exception("Unknown image type: $url.");
+            throw new DOMPDF_Exception("Unknown image type: $url.");
         }
 
         $ext = $match[1];
@@ -184,35 +184,35 @@ 
 
     if ( !is_readable($resolved_url) || !filesize($resolved_url) ) {
 
-      //debugpng
-      if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
+        //debugpng
+        if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
 
-      $_dompdf_warnings[] = "File " .$resolved_url . " is not readable or is an empty file.\n";
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-      $ext = "png";
+        $_dompdf_warnings[] = "File " .$resolved_url . " is not readable or is an empty file.\n";
+        $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $ext = "png";
     }
 
     //debugpng
     if ($DEBUGPNG) print '[resolve_url '.$url.'|'.$full_url_dbg.'|'.$resolved_url.'|'.$ext.']';
 
     return array($resolved_url, $ext);
-  }
+    }
 
-  /**
-   * Unlink all cached images (i.e. temporary images either downloaded
-   * or converted)
-   */
-  static function clear() {
+    /**
+     * Unlink all cached images (i.e. temporary images either downloaded
+     * or converted)
+     */
+    static function clear() {
     if ( count(self::$_cache) ) {
-      while ($entry = array_shift(self::$_cache)) {
+        while ($entry = array_shift(self::$_cache)) {
         list($file, $ext) = $entry;
         //debugpng
         if (DEBUGPNG) print '[clear unlink '.$file.']';
         if (!DEBUGKEEPTEMP)
-          //XXX: Should we have some kind of fallback or warning if unlink() fails?
-          unlink($file);
-      }
+            //XXX: Should we have some kind of fallback or warning if unlink() fails?
+            unlink($file);
+        }
+    }
     }
-  }
 
 }

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

Indentation +343 added lines, -344 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -53,105 +52,105 @@ 
  */
 class Frame {
   
-  /**
-   * The DOMNode object this frame represents
-   *
-   * @var DOMNode
-   */
-  protected $_node;
-
-  /**
-   * Unique identifier for this frame.  Used to reference this frame
-   * via the node.
-   *
-   * @var string
-   */
-  protected $_id;
-
-  /**
-   * Unique id counter
-   */
-  static protected $ID_COUNTER = 0;
+    /**
+     * The DOMNode object this frame represents
+     *
+     * @var DOMNode
+     */
+    protected $_node;
+
+    /**
+     * Unique identifier for this frame.  Used to reference this frame
+     * via the node.
+     *
+     * @var string
+     */
+    protected $_id;
+
+    /**
+     * Unique id counter
+     */
+    static protected $ID_COUNTER = 0;
   
-  /**
-   * This frame's calculated style
-   *
-   * @var Style
-   */
-  protected $_style;
-
-  /**
-   * This frame's original style.  Needed for cases where frames are
-   * split across pages.
-   *
-   * @var Style
-   */
-  protected $_original_style;
+    /**
+     * This frame's calculated style
+     *
+     * @var Style
+     */
+    protected $_style;
+
+    /**
+     * This frame's original style.  Needed for cases where frames are
+     * split across pages.
+     *
+     * @var Style
+     */
+    protected $_original_style;
   
-  /**
-   * This frame's parent in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_parent;
-
-  /**
-   * This frame's first child.  All children are handled as a
-   * doubly-linked list.
-   *
-   * @var Frame
-   */
-  protected $_first_child;
-
-  /**
-   * This frame's last child.
-   *
-   * @var Frame
-   */
-  protected $_last_child;
-
-  /**
-   * This frame's previous sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_prev_sibling;
-
-  /**
-   * This frame's next sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_next_sibling;
+    /**
+     * This frame's parent in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_parent;
+
+    /**
+     * This frame's first child.  All children are handled as a
+     * doubly-linked list.
+     *
+     * @var Frame
+     */
+    protected $_first_child;
+
+    /**
+     * This frame's last child.
+     *
+     * @var Frame
+     */
+    protected $_last_child;
+
+    /**
+     * This frame's previous sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_prev_sibling;
+
+    /**
+     * This frame's next sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_next_sibling;
   
-  /**
-   * This frame's containing block (used in layout): array(x, y, w, h)
-   *
-   * @var array
-   */
-  protected $_containing_block;
-
-  /**
-   * Position on the page of the top-left corner of the margin box of
-   * this frame: array(x,y)
-   *
-   * @var array
-   */
-  protected $_position;
-
-  /**
-   * This frame's decorator
-   *
-   * @var Frame_Decorator
-   */
-  protected $_decorator;
-    
-  /**
-   * Class constructor
-   *
-   * @param DOMNode $node the DOMNode this frame represents
-   */
-  function __construct(DomNode $node) {
+    /**
+     * This frame's containing block (used in layout): array(x, y, w, h)
+     *
+     * @var array
+     */
+    protected $_containing_block;
+
+    /**
+     * Position on the page of the top-left corner of the margin box of
+     * this frame: array(x,y)
+     *
+     * @var array
+     */
+    protected $_position;
+
+    /**
+     * This frame's decorator
+     *
+     * @var Frame_Decorator
+     */
+    protected $_decorator;
+    
+    /**
+     * Class constructor
+     *
+     * @param DOMNode $node the DOMNode this frame represents
+     */
+    function __construct(DomNode $node) {
     $this->_node = $node;
       
     $this->_parent = null;
@@ -163,48 +162,48 @@ 
     $this->_original_style = null;
     
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
 
     $this->_decorator = null;
 
     $this->set_id( self::$ID_COUNTER++ );
-  }
+    }
 
-  /**
-   * "Destructor": forcibly free all references held by this frame
-   *
-   * @param bool $recursive if true, call dispose on all children
-   */
-  function dispose($recursive = false) {
+    /**
+     * "Destructor": forcibly free all references held by this frame
+     *
+     * @param bool $recursive if true, call dispose on all children
+     */
+    function dispose($recursive = false) {
 
     if ( $recursive ) {
-      while ( $child = $this->_first_child )
+        while ( $child = $this->_first_child )
         $child->dispose(true);
     }
 
     // Remove this frame from the tree
     if ( $this->_prev_sibling ) {
-      $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
+        $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
     }
 
     if ( $this->_next_sibling ) {
-      $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
+        $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_first_child === $this ) {
-      $this->_parent->_first_child = $this->_next_sibling;
+        $this->_parent->_first_child = $this->_next_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_last_child === $this ) {
-      $this->_parent->_last_child = $this->_prev_sibling;
+        $this->_parent->_last_child = $this->_prev_sibling;
     }
 
     if ( $this->_parent ) {
-      $this->_parent->get_node()->removeChild($this->_node);
+        $this->_parent->get_node()->removeChild($this->_node);
     }
 
     $this->_style->dispose();
@@ -212,369 +211,369 @@ 
     $this->_original_style->dispose();
     unset($this->_original_style);
     
-  }
+    }
 
-  // Re-initialize the frame
-  function reset() {
+    // Re-initialize the frame
+    function reset() {
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
 
     unset($this->_style);    
     $this->_style = clone $this->_original_style;
     
-  }
+    }
   
-  //........................................................................
-
-  // Accessor methods
-  function get_node() { return $this->_node; }
-  function get_id() { return $this->_id; }
-  function get_style() { return $this->_style; }
-  function get_original_style() { return $this->_original_style; }
-  function get_parent() { return $this->_parent; }
-  function get_decorator() { return $this->_decorator; }
-  function get_first_child() { return $this->_first_child; }
-  function get_last_child() { return $this->_last_child; }
-  function get_prev_sibling() { return $this->_prev_sibling; }
-  function get_next_sibling() { return $this->_next_sibling; }
-
-  function get_children() { return new FrameList($this); }
+    //........................................................................
+
+    // Accessor methods
+    function get_node() { return $this->_node; }
+    function get_id() { return $this->_id; }
+    function get_style() { return $this->_style; }
+    function get_original_style() { return $this->_original_style; }
+    function get_parent() { return $this->_parent; }
+    function get_decorator() { return $this->_decorator; }
+    function get_first_child() { return $this->_first_child; }
+    function get_last_child() { return $this->_last_child; }
+    function get_prev_sibling() { return $this->_prev_sibling; }
+    function get_next_sibling() { return $this->_next_sibling; }
+
+    function get_children() { return new FrameList($this); }
   
-  // Layout property accessors
-  function get_containing_block($i = null) {
+    // Layout property accessors
+    function get_containing_block($i = null) {
     if ( isset($i) )
-      return $this->_containing_block[$i];    
+        return $this->_containing_block[$i];    
     return $this->_containing_block;
-  }
+    }
   
-  function get_position($i = null) {
+    function get_position($i = null) {
     if ( isset($i) )
-      return $this->_position[$i];
+        return $this->_position[$i];
     return array($this->_position["x"],
-                 $this->_position["y"],
-                 "x"=>$this->_position["x"],
-                 "y"=>$this->_position["y"]);
-  }
+                    $this->_position["y"],
+                    "x"=>$this->_position["x"],
+                    "y"=>$this->_position["y"]);
+    }
     
-  //........................................................................
+    //........................................................................
 
-  // Return the height of the margin box of the frame, in pt.  Meaningless
-  // unless the height has been calculated properly.
-  function get_margin_height() {      
+    // Return the height of the margin box of the frame, in pt.  Meaningless
+    // unless the height has been calculated properly.
+    function get_margin_height() {      
     return $this->_style->length_in_pt(array($this->_style->height,
-                                             $this->_style->margin_top,
-                                             $this->_style->margin_bottom,
-                                             $this->_style->border_top_width,
-                                             $this->_style->border_bottom_width,
-                                             $this->_style->padding_top,
-                                             $this->_style->padding_bottom),
-                                       $this->_containing_block["w"]);
-  }
-
-  // Return the width of the margin box of the frame, in pt.  Meaningless
-  // unless the width has been calculted properly.
-  function get_margin_width() {
+                                                $this->_style->margin_top,
+                                                $this->_style->margin_bottom,
+                                                $this->_style->border_top_width,
+                                                $this->_style->border_bottom_width,
+                                                $this->_style->padding_top,
+                                                $this->_style->padding_bottom),
+                                        $this->_containing_block["w"]);
+    }
+
+    // Return the width of the margin box of the frame, in pt.  Meaningless
+    // unless the width has been calculted properly.
+    function get_margin_width() {
     return $this->_style->length_in_pt(array($this->_style->width,
-                                     $this->_style->margin_left,
-                                     $this->_style->margin_right,
-                                     $this->_style->border_left_width,
-                                     $this->_style->border_right_width,
-                                     $this->_style->padding_left,
-                                     $this->_style->padding_right),
-                               $this->_containing_block["w"]);
-  }
-
-  // Return the padding box (x,y,w,h) of the frame
-  function get_padding_box() {
+                                        $this->_style->margin_left,
+                                        $this->_style->margin_right,
+                                        $this->_style->border_left_width,
+                                        $this->_style->border_right_width,
+                                        $this->_style->padding_left,
+                                        $this->_style->padding_right),
+                                $this->_containing_block["w"]);
+    }
+
+    // Return the padding box (x,y,w,h) of the frame
+    function get_padding_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt(array($this->_style->margin_left,
                                         $this->_style->border_left_width),
-                                  $this->_containing_block["w"]);
+                                    $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt(array($this->_style->margin_top,
                                 $this->_style->border_top_width),
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     
     $w = $this->_style->length_in_pt(array($this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right),
-                             $this->_containing_block["w"]);
+                                    $this->_style->width,
+                                    $this->_style->padding_right),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom),
-                             $this->_containing_block["w"]);
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
-  }
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
+    }
 
-  // Return the border box of the frame
-  function get_border_box() {
+    // Return the border box of the frame
+    function get_border_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt($this->_style->margin_left,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt($this->_style->margin_top,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
 
     $w = $this->_style->length_in_pt(array($this->_style->border_left_width,
-                                   $this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right,
-                                   $this->_style->border_right_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_left,
+                                    $this->_style->width,
+                                    $this->_style->padding_right,
+                                    $this->_style->border_right_width),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->border_top_width,
-                                   $this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom,
-                                   $this->_style->border_bottom_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_top,
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom,
+                                    $this->_style->border_bottom_width),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
     
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_id($id) {
+    // Set methods
+    function set_id($id) {
     $this->_id = $id;
 
     // We can only set attributes of DOMElement objects (nodeType == 1).
     // Since these are the only objects that we can assign CSS rules to,
     // this shortcoming is okay.
     if ( $this->_node->nodeType == 1)
-      $this->_node->setAttribute("frame_id", $id);
-  }
+        $this->_node->setAttribute("frame_id", $id);
+    }
 
-  function set_style(Style $style) {
+    function set_style(Style $style) {
     if ( is_null($this->_style) )
-      $this->_original_style = clone $style;
+        $this->_original_style = clone $style;
     
     $this->_style = $style;
-  }
+    }
   
-  function set_decorator(Frame_Decorator $decorator) {
+    function set_decorator(Frame_Decorator $decorator) {
     $this->_decorator = $decorator;
-  }
+    }
   
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     if ( is_array($x) ){
-  		foreach($x AS $key => $val){
-			$$key = $val;
-		}
+            foreach($x AS $key => $val){
+            $$key = $val;
+        }
     }
     
     if (is_numeric($x)) {
-      $this->_containing_block[0] = $x;
-      $this->_containing_block["x"] = $x;
+        $this->_containing_block[0] = $x;
+        $this->_containing_block["x"] = $x;
     }
     
     if (is_numeric($y)) {
-      $this->_containing_block[1] = $y;
-      $this->_containing_block["y"] = $y;
+        $this->_containing_block[1] = $y;
+        $this->_containing_block["y"] = $y;
     }
     
     if (is_numeric($w)) {
-      $this->_containing_block[2] = $w;
-      $this->_containing_block["w"] = $w;
+        $this->_containing_block[2] = $w;
+        $this->_containing_block["w"] = $w;
     }
     
     if (is_numeric($h)) {
-      $this->_containing_block[3] = $h;
-      $this->_containing_block["h"] = $h;
+        $this->_containing_block[3] = $h;
+        $this->_containing_block["h"] = $h;
     }
     
-  }
+    }
 
-  function set_position($x = null, $y = null) {
+    function set_position($x = null, $y = null) {
     if ( is_array($x) )
-      extract($x);
+        extract($x);
     
     if ( is_numeric($x) ) {
-      $this->_position[0] = $x;
-      $this->_position["x"] = $x;
+        $this->_position[0] = $x;
+        $this->_position["x"] = $x;
     }
 
     if ( is_numeric($y) ) {
-      $this->_position[1] = $y;
-      $this->_position["y"] = $y;
+        $this->_position[1] = $y;
+        $this->_position["y"] = $y;
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function prepend_child(Frame $child, $update_node = true) {
+    function prepend_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+        $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
     
     // Handle the first child
     if ( !$this->_first_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_next_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_next_sibling = null;
       
     } else {
 
-      $this->_first_child->_prev_sibling = $child;
-      $child->_next_sibling = $this->_first_child;      
-      $this->_first_child = $child;
+        $this->_first_child->_prev_sibling = $child;
+        $child->_next_sibling = $this->_first_child;      
+        $this->_first_child = $child;
       
     }
-  }
+    }
   
-  function append_child(Frame $child, $update_node = true) {
+    function append_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->appendChild($child->_node);
+        $this->_node->appendChild($child->_node);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
 
     $child->_parent = $this;
     $child->_next_sibling = null;
     
     // Handle the first child
     if ( !$this->_last_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_prev_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_prev_sibling = null;
       
     } else {
 
-      $this->_last_child->_next_sibling = $child;
-      $child->_prev_sibling = $this->_last_child;
-      $this->_last_child = $child;
+        $this->_last_child->_next_sibling = $child;
+        $child->_prev_sibling = $this->_last_child;
+        $this->_last_child = $child;
 
     }
-  }  
+    }  
 
-  // Inserts a new child immediately before the specified frame
-  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
+    // Inserts a new child immediately before the specified frame
+    function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
 
     if ( $ref === $this->_first_child ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node    
     if ( $update_node )
-      $this->_node->insertBefore($new_child->_node, $ref->_node);
+        $this->_node->insertBefore($new_child->_node, $ref->_node);
 
     // Remove the child from its parent
     if ( $new_child->_parent )
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_next_sibling = $ref;
     $new_child->_prev_sibling = $ref->_prev_sibling;
 
     if ( $ref->_prev_sibling )
-      $ref->_prev_sibling->_next_sibling = $new_child;
+        $ref->_prev_sibling->_next_sibling = $new_child;
     
     $ref->_prev_sibling = $new_child;
-  }
+    }
   
-  // Inserts a new child immediately after the specified frame
-  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
+    // Inserts a new child immediately after the specified frame
+    function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
 
     if ( $ref === $this->_last_child ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node
     if ( $update_node ) {
-      if ( $ref->_next_sibling ) {
+        if ( $ref->_next_sibling ) {
         $next_node = $ref->_next_sibling->_node;
         $this->_node->insertBefore($new_child->_node, $next_node);
-      } else {
+        } else {
         $new_child->_node = $this->_node->appendChild($new_child);
-      }
+        }
     }
     
     // Remove the child from its parent
     if ( $new_child->_parent)
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_prev_sibling = $ref;
     $new_child->_next_sibling = $ref->_next_sibling;
 
     if ( $ref->_next_sibling ) 
-      $ref->_next_sibling->_prev_sibling = $new_child;
+        $ref->_next_sibling->_prev_sibling = $new_child;
 
     $ref->_next_sibling = $new_child;
-  }
+    }
 
 
-  function remove_child(Frame $child, $update_node = true) {
+    function remove_child(Frame $child, $update_node = true) {
 
     if ( $child->_parent !== $this )
-      throw new DOMPDF_Exception("Child not found in this frame");
+        throw new DOMPDF_Exception("Child not found in this frame");
 
     if ( $update_node )
-      $this->_node->removeChild($child->_node);
+        $this->_node->removeChild($child->_node);
     
     if ( $child === $this->_first_child )
-      $this->_first_child = $child->_next_sibling;
+        $this->_first_child = $child->_next_sibling;
 
     if ( $child === $this->_last_child )
-      $this->_last_child = $child->_prev_sibling;
+        $this->_last_child = $child->_prev_sibling;
 
     if ( $child->_prev_sibling )
-      $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+        $child->_prev_sibling->_next_sibling = $child->_next_sibling;
 
     if ( $child->_next_sibling )
-      $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
+        $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
 
     $child->_next_sibling = null;
     $child->_prev_sibling = null;
     $child->_parent = null;
     return $child;
         
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Debugging function:
-  function __toString() {
+    // Debugging function:
+    function __toString() {
 
     // Skip empty text frames
 //     if ( $this->_node->nodeName === "#text" &&
@@ -588,29 +587,29 @@ 
     $str .= "Class: " .get_class($this) . "<br/>";
     
     if ( $this->_node->nodeName === "#text" ) {
-      $tmp = htmlspecialchars($this->_node->nodeValue);
-      $str .= "<pre>'" .  mb_substr($tmp,0,70) .
+        $tmp = htmlspecialchars($this->_node->nodeValue);
+        $str .= "<pre>'" .  mb_substr($tmp,0,70) .
         (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
     }
     if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
+        $str .= "\nParent:" . $this->_parent->_node->nodeName .
         " (" . spl_object_hash($this->_parent->_node) . ") " .
         "<br/>";
 
     if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
+        $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
         "<br/>";
 
     if ( $this->_next_sibling )
-      $str .= "Next: " . $this->_next_sibling->_node->nodeName .
+        $str .= "Next: " . $this->_next_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
         "<br/>";
 
     $d = $this->get_decorator();
     while ($d && $d != $d->get_decorator()) {
-      $str .= "Decorator: " . get_class($d) . "<br/>";
-      $d = $d->get_decorator();
+        $str .= "Decorator: " . get_class($d) . "<br/>";
+        $d = $d->get_decorator();
     }
 
     $str .= "Position: " . pre_r($this->_position, true);
@@ -621,33 +620,33 @@ 
     $str .= "\nStyle: <pre>". $this->_style->__toString() . "</pre>";
 
     if ( $this->_decorator instanceof Block_Frame_Decorator ) {
-      $str .= "Lines:<pre>";
-      foreach ($this->_decorator->get_lines() as $line) {
+        $str .= "Lines:<pre>";
+        foreach ($this->_decorator->get_lines() as $line) {
         foreach ($line["frames"] as $frame) {
-          if ($frame instanceof Text_Frame_Decorator) {
+            if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
             $str .= "'". htmlspecialchars($frame->get_text()) ."'";
-          } else {
+            } else {
             $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
-          }
+            }
         }
         
         $str .=
-          //"\ncount => " . $line["count"] . "\n".
-          "\ny => " . $line["y"] . "\n" .
-          "w => " . $line["w"] . "\n" .
-          "h => " . $line["h"] . "\n";
-      }
-      $str .= "</pre>";
+            //"\ncount => " . $line["count"] . "\n".
+            "\ny => " . $line["y"] . "\n" .
+            "w => " . $line["w"] . "\n" .
+            "h => " . $line["h"] . "\n";
+        }
+        $str .= "</pre>";
     }
     $str .= "\n";
     if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+        $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n","",""),
                                     $str));
     
     return $str;
-  }
+    }
         
 }
 
@@ -660,10 +659,10 @@ 
  * @package dompdf
  */
 class FrameList implements IteratorAggregate {
-  protected $_frame;
+    protected $_frame;
 
-  function __construct($frame) { $this->_frame = $frame; }
-  function getIterator() { return new FrameListIterator($this->_frame); }
+    function __construct($frame) { $this->_frame = $frame; }
+    function getIterator() { return new FrameListIterator($this->_frame); }
 }
   
 /**
@@ -677,37 +676,37 @@ 
  */
 class FrameListIterator implements Iterator {
 
-  protected $_parent;
-  protected $_cur;
-  protected $_num;
+    protected $_parent;
+    protected $_cur;
+    protected $_num;
 
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     $this->_parent = $frame;
     $this->_cur = $frame->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function rewind() { 
+    function rewind() { 
     $this->_cur = $this->_parent->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function valid() {
+    function valid() {
     return isset($this->_cur);// && ($this->_cur->get_prev_sibling() === $this->_prev);
-  }
-  function key() { return $this->_num; }
-  function current() { return $this->_cur; }
+    }
+    function key() { return $this->_num; }
+    function current() { return $this->_cur; }
 
-  function next() {
+    function next() {
 
     $ret = $this->_cur;
     if ( !$ret )
-      return null;
+        return null;
     
     $this->_cur = $this->_cur->get_next_sibling();
     $this->_num++;
     return $ret;
-  }
+    }
 }
 
 //------------------------------------------------------------------------
@@ -720,9 +719,9 @@ 
  */
 class FrameTreeList implements IteratorAggregate {
 
-  protected $_root;
-  function __construct(Frame $root) { $this->_root = $root; }
-  function getIterator() { return new FrameTreeIterator($this->_root); }
+    protected $_root;
+    function __construct(Frame $root) { $this->_root = $root; }
+    function getIterator() { return new FrameTreeIterator($this->_root); }
 
 }
 
@@ -736,25 +735,25 @@ 
  */
 class FrameTreeIterator implements Iterator {
 
-  protected $_root;
-  protected $_stack = array();
-  protected $_num;
+    protected $_root;
+    protected $_stack = array();
+    protected $_num;
   
-  function __construct(Frame $root) {
+    function __construct(Frame $root) {
     $this->_stack[] = $this->_root = $root;
     $this->_num = 0;
-  }
+    }
 
-  function rewind() {
+    function rewind() {
     $this->_stack = array($this->_root);
     $this->_num = 0;
-  }
+    }
     
-  function valid() { return count($this->_stack) > 0; }
-  function key() { return $this->_num; }
-  function current() { return end($this->_stack); }
+    function valid() { return count($this->_stack) > 0; }
+    function key() { return $this->_num; }
+    function current() { return end($this->_stack); }
 
-  function next() {
+    function next() {
     $b = end($this->_stack);
     
     // Pop last element
@@ -763,10 +762,10 @@ 
     
     // Push all children onto the stack in reverse order
     if ( $c = $b->get_last_child() ) {
-      $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
+        $this->_stack[] = $c;
+        while ( $c = $c->get_prev_sibling() )
         $this->_stack[] = $c;
     }
     return $b;
-  }
+    }
 }

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

Indentation +70 added lines, -71 removed lines

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

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

Indentation +6 added lines, -7 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,22 +46,22 @@ 
  */
 class Table_Row_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
 
     $cb = $this->_frame->get_containing_block();    
     $p = $this->_frame->get_prev_sibling();
 
     if ( $p ) 
-      $y = $p->get_position("y") + $p->get_margin_height();
+        $y = $p->get_position("y") + $p->get_margin_height();
 
     else
-      $y = $cb["y"];
+        $y = $cb["y"];
 
     $this->_frame->set_position($cb["x"], $y);
 
-  }
+    }
 }

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

Indentation +96 added lines, -97 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cached_pdf_decorator.cls.php,v $
- * Created on: 2004-07-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cached_pdf_decorator.cls.php,v $
+     * Created on: 2004-07-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: cached_pdf_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -53,90 +52,90 @@ 
  * @package dompdf
  */
 class Cached_PDF_Decorator extends CPDF_Adapter implements Canvas {
-  protected $_pdf;
-  protected $_cache_id;
-  protected $_current_page_id;
-  protected $_fonts;  // fonts used in this document
+    protected $_pdf;
+    protected $_cache_id;
+    protected $_current_page_id;
+    protected $_fonts;  // fonts used in this document
   
-  function __construct($cache_id, CPDF_Adapter $pdf) {
+    function __construct($cache_id, CPDF_Adapter $pdf) {
     $this->_pdf = $pdf;
     $this->_cache_id = $cache_id;
     $this->_fonts = array();
     
     $this->_current_page_id = $this->_pdf->open_object();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_cpdf() { return $this->_pdf->get_cpdf(); }
+    function get_cpdf() { return $this->_pdf->get_cpdf(); }
 
-  function open_object() { $this->_pdf->open_object(); }
-  function reopen_object() { return $this->_pdf->reopen_object(); }
+    function open_object() { $this->_pdf->open_object(); }
+    function reopen_object() { return $this->_pdf->reopen_object(); }
   
-  function close_object() { $this->_pdf->close_object(); }
+    function close_object() { $this->_pdf->close_object(); }
 
-  function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
+    function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
 
-  function serialize_object($id) { $this->_pdf->serialize_object($id); }
+    function serialize_object($id) { $this->_pdf->serialize_object($id); }
 
-  function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
+    function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
     
-  //........................................................................
+    //........................................................................
 
-  function get_width() { return $this->_pdf->get_width(); }
-  function get_height() {  return $this->_pdf->get_height(); }
-  function get_page_number() { return $this->_pdf->get_page_number(); }
-  function get_page_count() { return $this->_pdf->get_page_count(); }
+    function get_width() { return $this->_pdf->get_width(); }
+    function get_height() {  return $this->_pdf->get_height(); }
+    function get_page_number() { return $this->_pdf->get_page_number(); }
+    function get_page_count() { return $this->_pdf->get_page_count(); }
 
-  function set_page_number($num) { $this->_pdf->set_page_number($num); }
-  function set_page_count($count) { $this->_pdf->set_page_count($count); }
+    function set_page_number($num) { $this->_pdf->set_page_number($num); }
+    function set_page_count($count) { $this->_pdf->set_page_count($count); }
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
     $this->_pdf->line($x1, $y1, $x2, $y2, $color, $width, $style);
-  }
+    }
                               
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
     $this->_pdf->rectangle($x1, $y1, $w, $h, $color, $width, $style);
-  }
+    }
  
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_pdf->filled_rectangle($x1, $y1, $w, $h, $color);
-  }
+    }
     
-  function polygon($points, $color, $width = null, $style = array(), $fill = false) {
+    function polygon($points, $color, $width = null, $style = array(), $fill = false) {
     $this->_pdf->polygon($points, $color, $width, $style, $fill);
-  }
+    }
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
     $this->_pdf->circle($x, $y, $r1, $color, $width, $style, $fill);
-  }
+    }
 
-  function image($img_url, $x, $y, $w = null, $h = null) {
+    function image($img_url, $x, $y, $w = null, $h = null) {
     $this->_pdf->image($img_url, $x, $y, $w, $h);
-  }
+    }
   
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     $this->_fonts[$font] = true;
     $this->_pdf->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-  }
+    }
 
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_text($x, $y, $text, $font, $size, $color, $adjust, $angle);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function page_script($script, $type = 'text/php') {
+    function page_script($script, $type = 'text/php') {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_script($script, $type);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function new_page() {
+    function new_page() {
     $this->_pdf->close_object();
 
     // Add the object to the current page
@@ -144,43 +143,43 @@ 
     $this->_pdf->new_page();    
 
     Page_Cache::store_page($this->_cache_id,
-                           $this->_pdf->get_page_number() - 1,
-                           $this->_pdf->serialize_object($this->_current_page_id));
+                            $this->_pdf->get_page_number() - 1,
+                            $this->_pdf->serialize_object($this->_current_page_id));
 
     $this->_current_page_id = $this->_pdf->open_object();
     return $this->_current_page_id;
-  }
+    }
   
-  function stream($filename) {
+    function stream($filename) {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
+        $this->_current_page_id = null;
     }
     
     $this->_pdf->stream($filename);
     
-  }
+    }
   
-  function &output() {
+    function &output() {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        $this->_current_page_id = null;
     }
     
     return $this->_pdf->output();
-  }
+    }
   
-  function get_messages() { return $this->_pdf->get_messages(); }
+    function get_messages() { return $this->_pdf->get_messages(); }
   
 }

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

Indentation +328 added lines, -329 removed lines

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