chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderDailyFile.php

Indentation +37 added lines, -37 removed lines

@@ -46,47 +46,47 @@
  */
 class LoggerAppenderDailyFile extends LoggerAppenderFile {
 
-	/**
-	 * Format date. 
-	 * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
-	 * @var string
-	 */
-	public $datePattern = "Ymd";
+    /**
+     * Format date. 
+     * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
+     * @var string
+     */
+    public $datePattern = "Ymd";
 	
-	public function __destruct() {
-       parent::__destruct();
-   	}
+    public function __destruct() {
+        parent::__destruct();
+        }
    	
-	/**
-	* Sets date format for the file name.
-	* @param string $format a regular date() string format
-	*/
-	public function setDatePattern($format) {
-		$this->datePattern = $format;
-	}
+    /**
+     * Sets date format for the file name.
+     * @param string $format a regular date() string format
+     */
+    public function setDatePattern($format) {
+        $this->datePattern = $format;
+    }
 	
-	/**
-	* @return string returns date format for the filename
-	*/
-	public function getDatePattern() {
-		return $this->datePattern;
-	}
+    /**
+     * @return string returns date format for the filename
+     */
+    public function getDatePattern() {
+        return $this->datePattern;
+    }
 	
-	/**
-	* The File property takes a string value which should be the name of the file to append to.
-	* Sets and opens the file where the log output will go.
-	*
-	* @see LoggerAppenderFile::setFile()
-	*/
-	public function setFile() {
-		$numargs = func_num_args();
-		$args = func_get_args();
+    /**
+     * The File property takes a string value which should be the name of the file to append to.
+     * Sets and opens the file where the log output will go.
+     *
+     * @see LoggerAppenderFile::setFile()
+     */
+    public function setFile() {
+        $numargs = func_num_args();
+        $args = func_get_args();
 		
-		if($numargs == 1 and is_string($args[0])) {
-			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
-		} else if ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
-			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
-		}
-	} 
+        if($numargs == 1 and is_string($args[0])) {
+            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
+        } else if ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
+            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
+        }
+    } 
 
 }

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderFile.php

Indentation +109 added lines, -109 removed lines

@@ -42,129 +42,129 @@
  */
 class LoggerAppenderFile extends LoggerAppender {
 
-	/**
-	 * @var boolean if {@link $file} exists, appends events.
-	 */
-	private $append = true;
-	/**
-	 * @var string the file name used to append events
-	 */
-	protected $fileName;
-	/**
-	 * @var mixed file resource
-	 */
-	protected $fp = false;
+    /**
+     * @var boolean if {@link $file} exists, appends events.
+     */
+    private $append = true;
+    /**
+     * @var string the file name used to append events
+     */
+    protected $fileName;
+    /**
+     * @var mixed file resource
+     */
+    protected $fp = false;
 	
-	public function __construct($name = '') {
-		parent::__construct($name);
-		$this->requiresLayout = true;
-	}
+    public function __construct($name = '') {
+        parent::__construct($name);
+        $this->requiresLayout = true;
+    }
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	public function activateOptions() {
-		$fileName = $this->getFile();
+    public function activateOptions() {
+        $fileName = $this->getFile();
 
-		if(!is_file($fileName)) {
-			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
-				mkdir($dir, 0777, true);
-			}
-		}
+        if(!is_file($fileName)) {
+            $dir = dirname($fileName);
+            if(!is_dir($dir)) {
+                mkdir($dir, 0777, true);
+            }
+        }
 
-		$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
-		if($this->fp) {
-			if(flock($this->fp, LOCK_EX)) {
-				if($this->getAppend()) {
-					fseek($this->fp, 0, SEEK_END);
-				}
-				fwrite($this->fp, $this->layout->getHeader());
-				flock($this->fp, LOCK_UN);
-				$this->closed = false;
-			} else {
-				// TODO: should we take some action in this case?
-				$this->closed = true;
-			}		 
-		} else {
-			$this->closed = true;
-		}
-	}
+        $this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
+        if($this->fp) {
+            if(flock($this->fp, LOCK_EX)) {
+                if($this->getAppend()) {
+                    fseek($this->fp, 0, SEEK_END);
+                }
+                fwrite($this->fp, $this->layout->getHeader());
+                flock($this->fp, LOCK_UN);
+                $this->closed = false;
+            } else {
+                // TODO: should we take some action in this case?
+                $this->closed = true;
+            }		 
+        } else {
+            $this->closed = true;
+        }
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
-					fwrite($this->fp, $this->layout->getFooter());
-					flock($this->fp, LOCK_UN);
-				}
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if($this->fp and $this->layout !== null) {
+                if(flock($this->fp, LOCK_EX)) {
+                    fwrite($this->fp, $this->layout->getFooter());
+                    flock($this->fp, LOCK_UN);
+                }
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function append(LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
-				fwrite($this->fp, $this->layout->format($event));
-				flock($this->fp, LOCK_UN);
-			} else {
-				$this->closed = true;
-			}
-		} 
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if($this->fp and $this->layout !== null) {
+            if(flock($this->fp, LOCK_EX)) {
+                fwrite($this->fp, $this->layout->format($event));
+                flock($this->fp, LOCK_UN);
+            } else {
+                $this->closed = true;
+            }
+        } 
+    }
 	
-	/**
-	 * Sets and opens the file where the log output will go.
-	 *
-	 * This is an overloaded method. It can be called with:
-	 * - setFile(string $fileName) to set filename.
-	 * - setFile(string $fileName, boolean $append) to set filename and append.
-	 * 
-	 * TODO: remove overloading. Use only file as alias to filename
-	 */
-	public function setFile() {
-		$numargs = func_num_args();
-		$args	 = func_get_args();
+    /**
+     * Sets and opens the file where the log output will go.
+     *
+     * This is an overloaded method. It can be called with:
+     * - setFile(string $fileName) to set filename.
+     * - setFile(string $fileName, boolean $append) to set filename and append.
+     * 
+     * TODO: remove overloading. Use only file as alias to filename
+     */
+    public function setFile() {
+        $numargs = func_num_args();
+        $args	 = func_get_args();
 
-		if($numargs == 1 and is_string($args[0])) {
-			$this->setFileName($args[0]);
-		} else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
-			$this->setFile($args[0]);
-			$this->setAppend($args[1]);
-		}
-	}
+        if($numargs == 1 and is_string($args[0])) {
+            $this->setFileName($args[0]);
+        } else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
+            $this->setFile($args[0]);
+            $this->setAppend($args[1]);
+        }
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFile() {
-		return $this->getFileName();
-	}
+    /**
+     * @return string
+     */
+    public function getFile() {
+        return $this->getFileName();
+    }
 	
-	/**
-	 * @return boolean
-	 */
-	public function getAppend() {
-		return $this->append;
-	}
+    /**
+     * @return boolean
+     */
+    public function getAppend() {
+        return $this->append;
+    }
 
-	public function setAppend($flag) {
-		$this->append = LoggerOptionConverter::toBoolean($flag, true);		  
-	}
+    public function setAppend($flag) {
+        $this->append = LoggerOptionConverter::toBoolean($flag, true);		  
+    }
 
-	public function setFileName($fileName) {
-		$this->fileName = $fileName;
-	}
+    public function setFileName($fileName) {
+        $this->fileName = $fileName;
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFileName() {
-		return $this->fileName;
-	}
+    /**
+     * @return string
+     */
+    public function getFileName() {
+        return $this->fileName;
+    }
 	
 	 
 }

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

Indentation +2 added lines, -3 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: image_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,7 +46,7 @@ 
  */
 class Image_Renderer extends Abstract_Renderer {
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
 
     // Render background & borders
     //parent::render($frame);
@@ -65,5 +64,5 @@ 
 
     $this->_canvas->image( $frame->get_image_url(), $frame->get_image_ext(), $x, $y, $w, $h);
 
-  }
+    }
 }

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

Indentation +71 added lines, -72 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,16 +46,16 @@ 
  */
 class Block_Frame_Decorator extends Frame_Decorator {
 
-  const DEFAULT_COUNTER = "-dompdf-default-counter";
+    const DEFAULT_COUNTER = "-dompdf-default-counter";
 
-  protected $_lines; // array( [num] => array([frames] => array(<frame list>),
-                     //                 y, w, h) )
-  protected $_counters; // array([id] => counter_value) (for generated content)
-  protected $_cl;    // current line index
+    protected $_lines; // array( [num] => array([frames] => array(<frame list>),
+                        //                 y, w, h) )
+    protected $_counters; // array([id] => counter_value) (for generated content)
+    protected $_cl;    // current line index
 
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -66,11 +65,11 @@ 
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -79,67 +78,67 @@ 
                                 "h" => 0));
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Accessor methods
+    // Accessor methods
 
-  function get_current_line($i = null) {
+    function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
     if ( isset($i) )
-      return $cl[$i];
+        return $cl[$i];
     return $cl;
-  }
+    }
 
-  function get_lines() { return $this->_lines; }
+    function get_lines() { return $this->_lines; }
 
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_current_line($y = null, $w = null, $h = null) {
+    // Set methods
+    function set_current_line($y = null, $w = null, $h = null) {
     $this->set_line($this->_cl, $y, $w, $h);
-  }
+    }
 
-  function clear_line($i) {
+    function clear_line($i) {
     if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
-  }
+        unset($this->_lines[$i]);
+    }
 
-  function set_line($lineno, $y = null, $w = null, $h = null) {
+    function set_line($lineno, $y = null, $w = null, $h = null) {
 
     if ( is_array($y) )
-      extract($y);
+        extract($y);
 
     if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+        $this->_lines[$lineno]["y"] = $y;
 
     if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+        $this->_lines[$lineno]["w"] = $w;
 
     if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+        $this->_lines[$lineno]["h"] = $h;
 
-  }
+    }
 
 
-  function add_frame_to_line(Frame $frame) {
+    function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
     if ( $frame instanceof Inline_Frame_Decorator ) {
 
-      // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
+        // Handle line breaks
+        if ( $frame->get_node()->nodeName === "br" ) {
         $this->maximize_line_height( $frame->get_style()->length_in_pt($frame->get_style()->line_height) );
         $this->add_line();
         return;
-      }
+        }
 
-      // Add each child of the inline frame to the line individually
-      foreach ($frame->get_children() as $child)
+        // Add each child of the inline frame to the line individually
+        foreach ($frame->get_children() as $child)
         $this->add_frame_to_line( $child );
 
-      return;
+        return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
@@ -149,15 +148,15 @@ 
          ($frame->get_style()->white_space !== "pre" ||
           $frame->get_style()->white_space !== "pre-wrap") ) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
-      $frame->recalculate_width();
+        $frame->set_text( ltrim($frame->get_text()) );
+        $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
     if ( $w == 0 )
-      return;
+        return;
 
     // Debugging code:
     /*
@@ -177,7 +176,7 @@ 
     // End debugging
 
     if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+        $this->add_line();
 
     $frame->position();
 
@@ -185,55 +184,55 @@ 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
     if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+        $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
 
-  }
+    }
 
-  function remove_frames_from_line(Frame $frame) {
+    function remove_frames_from_line(Frame $frame) {
     // Search backwards through the lines for $frame
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
+        if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
         break;
-      $i--;
+        $i--;
     }
 
     if ( $j === false )
-      return;
+        return;
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
-      $f = $this->_lines[$i]["frames"][$j];
-      unset($this->_lines[$i]["frames"][$j++]);
-      $this->_lines[$i]["w"] -= $f->get_margin_width();
+        $f = $this->_lines[$i]["frames"][$j];
+        unset($this->_lines[$i]["frames"][$j++]);
+        $this->_lines[$i]["w"] -= $f->get_margin_width();
     }
 
     // Recalculate the height of the line
     $h = 0;
     foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+        $h = max( $h, $f->get_margin_height() );
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
     while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+        unset($this->_lines[ $this->_cl-- ]);
 
-  }
+    }
 
-  function increase_line_width($w) {
+    function increase_line_width($w) {
     $this->_lines[ $this->_cl ]["w"] += $w;
-  }
+    }
 
-  function maximize_line_height($val) {
+    function maximize_line_height($val) {
     $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
-  }
+    }
 
-  function add_line() {
+    function add_line() {
 
 //     if ( $this->_lines[$this->_cl]["h"] == 0 ) //count($this->_lines[$i]["frames"]) == 0 ||
 //       return;
@@ -241,28 +240,28 @@ 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
     $this->_lines[ ++$this->_cl ] = array("frames" => array(),
-                                          "wc" => 0,
-                                          "y" => $y, "w" => 0, "h" => 0);
-  }
+                                            "wc" => 0,
+                                            "y" => $y, "w" => 0, "h" => 0);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
+    function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
     $this->_counters[$id] = $value;
-  }
+    }
 
-  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
+    function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
+        $this->_counters[$id] = $increment;
     else
-      $this->_counters[$id] += $increment;
+        $this->_counters[$id] += $increment;
 
-  }
+    }
 
-  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
+    function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+        $this->_counters[$id] = 0;
 
     switch ($type) {
 
@@ -293,5 +292,5 @@ 
     case "upper-greek":
       return chr($this->_counters[$id] + 912);
     }
-  }
+    }
 }

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

Indentation +114 added lines, -115 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame_tree.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -52,118 +51,118 @@ 
  */
 class Frame_Tree {
     
-  /**
-   * Tags to ignore while parsing the tree
-   *
-   * @var array
-   */
-  static protected $_HIDDEN_TAGS = array("area", "base", "basefont", "head", "style",
-                                         "meta", "title", "colgroup",
-                                         "noembed", "noscript", "param", "#comment");  
-  /**
-   * The main DomDocument
-   *
-   * @see http://ca2.php.net/manual/en/ref.dom.php
-   * @var DomDocument
-   */
-  protected $_dom;
-
-  /**
-   * The root node of the FrameTree.
-   *
-   * @var Frame
-   */
-  protected $_root;
-
-  /**
-   * Subtrees of absolutely positioned elements
-   *
-   * @var array of Frames
-   */
-  protected $_absolute_frames;
-
-  /**
-   * A mapping of {@link Frame} objects to DomNode objects
-   *
-   * @var array
-   */
-  protected $_registry;
+    /**
+     * Tags to ignore while parsing the tree
+     *
+     * @var array
+     */
+    static protected $_HIDDEN_TAGS = array("area", "base", "basefont", "head", "style",
+                                            "meta", "title", "colgroup",
+                                            "noembed", "noscript", "param", "#comment");  
+    /**
+     * The main DomDocument
+     *
+     * @see http://ca2.php.net/manual/en/ref.dom.php
+     * @var DomDocument
+     */
+    protected $_dom;
+
+    /**
+     * The root node of the FrameTree.
+     *
+     * @var Frame
+     */
+    protected $_root;
+
+    /**
+     * Subtrees of absolutely positioned elements
+     *
+     * @var array of Frames
+     */
+    protected $_absolute_frames;
+
+    /**
+     * A mapping of {@link Frame} objects to DomNode objects
+     *
+     * @var array
+     */
+    protected $_registry;
   
 
-  /**
-   * Class constructor
-   *
-   * @param DomDocument $dom the main DomDocument object representing the current html document
-   */
-  function __construct(DomDocument $dom) {
+    /**
+     * Class constructor
+     *
+     * @param DomDocument $dom the main DomDocument object representing the current html document
+     */
+    function __construct(DomDocument $dom) {
     $this->_dom = $dom;
     $this->_root = null;
     $this->_registry = array();
-  }
-
-  /**
-   * Returns the DomDocument object representing the curent html document
-   *
-   * @return DomDocument
-   */
-  function get_dom() { return $this->_dom; }
-
-  /**
-   * Returns the root frame of the tree
-   *
-   * @return Frame
-   */
-  function get_root() { return $this->_root; }
-
-  /**
-   * Returns a specific frame given its id
-   *
-   * @param string $id
-   * @return Frame
-   */
-  function get_frame($id) { return isset($this->_registry[$id]) ? $this->_registry[$id] : null; }
-
-  /**
-   * Returns a post-order iterator for all frames in the tree
-   *
-   * @return FrameTreeList
-   */
-  function get_frames() { return new FrameTreeList($this->_root); }
+    }
+
+    /**
+     * Returns the DomDocument object representing the curent html document
+     *
+     * @return DomDocument
+     */
+    function get_dom() { return $this->_dom; }
+
+    /**
+     * Returns the root frame of the tree
+     *
+     * @return Frame
+     */
+    function get_root() { return $this->_root; }
+
+    /**
+     * Returns a specific frame given its id
+     *
+     * @param string $id
+     * @return Frame
+     */
+    function get_frame($id) { return isset($this->_registry[$id]) ? $this->_registry[$id] : null; }
+
+    /**
+     * Returns a post-order iterator for all frames in the tree
+     *
+     * @return FrameTreeList
+     */
+    function get_frames() { return new FrameTreeList($this->_root); }
       
-  /**
-   * Builds the tree
-   */
-  function build_tree() {
+    /**
+     * Builds the tree
+     */
+    function build_tree() {
     $html = $this->_dom->getElementsByTagName("html")->item(0);
     if ( is_null($html) )
-      $html = $this->_dom->firstChild;
+        $html = $this->_dom->firstChild;
 
     if ( is_null($html) )
-      throw new DOMPDF_Exception("Requested HTML document contains no data.");
+        throw new DOMPDF_Exception("Requested HTML document contains no data.");
 
     $this->_root = $this->_build_tree_r($html);
 
-  }
-
-  /**
-   * Recursively adds {@link Frame} objects to the tree
-   *
-   * Recursively build a tree of Frame objects based on a dom tree.
-   * No layout information is calculated at this time, although the
-   * tree may be adjusted (i.e. nodes and frames for generated content
-   * and images may be created).
-   *
-   * @param DomNode $node the current DomNode being considered
-   * @return Frame
-   */
-  protected function _build_tree_r(DomNode $node) {
+    }
+
+    /**
+     * Recursively adds {@link Frame} objects to the tree
+     *
+     * Recursively build a tree of Frame objects based on a dom tree.
+     * No layout information is calculated at this time, although the
+     * tree may be adjusted (i.e. nodes and frames for generated content
+     * and images may be created).
+     *
+     * @param DomNode $node the current DomNode being considered
+     * @return Frame
+     */
+    protected function _build_tree_r(DomNode $node) {
     
     $frame = new Frame($node);
     $id = $frame->get_id();
     $this->_registry[ $id ] = $frame;
     
     if ( !$node->hasChildNodes() )
-      return $frame;
+        return $frame;
 
     // Fixes 'cannot access undefined property for object with
     // overloaded access', fix by Stefan radulian
@@ -173,55 +172,55 @@ 
     // Store the children in an array so that the tree can be modified
     $children = array();
     for ($i = 0; $i < $node->childNodes->length; $i++)
-      $children[] = $node->childNodes->item($i);
+        $children[] = $node->childNodes->item($i);
 
     foreach ($children as $child) {
-      // Skip non-displaying nodes
-      if ( in_array( mb_strtolower($child->nodeName), self::$_HIDDEN_TAGS) )  {
+        // Skip non-displaying nodes
+        if ( in_array( mb_strtolower($child->nodeName), self::$_HIDDEN_TAGS) )  {
         if ( mb_strtolower($child->nodeName) !== "head" &&
              mb_strtolower($child->nodeName) !== "style" ) 
-          $child->parentNode->removeChild($child);
+            $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Skip empty text nodes
-      if ( $child->nodeName === "#text" && $child->nodeValue == "" ) {
+        // Skip empty text nodes
+        if ( $child->nodeName === "#text" && $child->nodeValue == "" ) {
         $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Skip empty image nodes
-      if ( $child->nodeName === "img" && $child->getAttribute("src") == "" ) {
+        // Skip empty image nodes
+        if ( $child->nodeName === "img" && $child->getAttribute("src") == "" ) {
         $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Add a container frame for images
-      if ( $child->nodeName === "img" ) {
+        // Add a container frame for images
+        if ( $child->nodeName === "img" ) {
         $img_node = $child->ownerDocument->createElement("img_inner");
      
         // Move attributes to inner node        
         foreach ( $child->attributes as $attr => $attr_node ) {
-          // Skip style, but move all other attributes
-          if ( $attr === "style" )
+            // Skip style, but move all other attributes
+            if ( $attr === "style" )
             continue;
        
-          $img_node->setAttribute($attr, $attr_node->value);
+            $img_node->setAttribute($attr, $attr_node->value);
         }
 
         foreach ( $child->attributes as $attr => $node ) {
-          if ( $attr === "style" )
+            if ( $attr === "style" )
             continue;
-          $child->removeAttribute($attr);
+            $child->removeAttribute($attr);
         }
 
         $child->appendChild($img_node);
-      }
+        }
       
-      $frame->append_child($this->_build_tree_r($child), false);
+        $frame->append_child($this->_build_tree_r($child), false);
 
     }
     
     return $frame;
-  }
+    }
 }

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

Indentation +185 added lines, -186 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: canvas.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -54,207 +53,207 @@ 
  */
 interface Canvas {
 
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number();
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_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();
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
+    /**
+     * 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);
+    /**
+     * 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);
+    /**
+     * 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);
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname);
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname);
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height);
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height);
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0);
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0);
 
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size);
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size);
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page();
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page();
 
-  /**
-   * 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);
+    /**
+     * 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);
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null);
   
 }

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

Indentation +35 added lines, -36 removed lines

@@ -34,7 +34,6 @@ 
  * @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/pdflib_adapter.cls.php

Indentation +486 added lines, -486 removed lines

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

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

Indentation +288 added lines, -289 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: cellmap.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -50,12 +49,12 @@ 
  */
 class Cellmap {
 
-  /**
-   * Border style weight lookup for collapsed border resolution.
-   *
-   * @var array
-   */
-  static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
+    /**
+     * Border style weight lookup for collapsed border resolution.
+     *
+     * @var array
+     */
+    static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
                                                 "groove" => 2,
                                                 "outset" => 3,
                                                 "ridge"  => 4,
@@ -65,87 +64,87 @@ 
                                                 "double" => 8,
                                                 "none"   => 0);
 
-  /**
-   * The table object this cellmap is attached to.
-   *
-   * @var Table_Frame_Decorator
-   */
-  protected $_table;
-
-  /**
-   * The total number of rows in the table
-   *
-   * @var int
-   */
-  protected $_num_rows;
-
-  /**
-   * The total number of columns in the table
-   *
-   * @var int
-   */
-  protected $_num_cols;
-
-  /**
-   * 2D array mapping <row,column> to frames
-   *
-   * @var array
-   */
-  protected $_cells;
-
-  /**
-   * 1D array of column dimensions
-   *
-   * @var array
-   */
-  protected $_columns;
-
-  /**
-   * 1D array of row dimensions
-   *
-   * @var array
-   */
-  protected $_rows;
-
-  /**
-   * 2D array of border specs
-   *
-   * @var array
-   */
-  protected $_borders;
-
-  /**
-   * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
-   * frame_id.
-   *
-   * @var array
-   */
-  protected $_frames;
-
-  /**
-   * Current column when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__col;
-
-  /**
-   * Current row when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__row;
-
-  //........................................................................
-
-  function __construct(Table_Frame_Decorator $table) {
+    /**
+     * The table object this cellmap is attached to.
+     *
+     * @var Table_Frame_Decorator
+     */
+    protected $_table;
+
+    /**
+     * The total number of rows in the table
+     *
+     * @var int
+     */
+    protected $_num_rows;
+
+    /**
+     * The total number of columns in the table
+     *
+     * @var int
+     */
+    protected $_num_cols;
+
+    /**
+     * 2D array mapping <row,column> to frames
+     *
+     * @var array
+     */
+    protected $_cells;
+
+    /**
+     * 1D array of column dimensions
+     *
+     * @var array
+     */
+    protected $_columns;
+
+    /**
+     * 1D array of row dimensions
+     *
+     * @var array
+     */
+    protected $_rows;
+
+    /**
+     * 2D array of border specs
+     *
+     * @var array
+     */
+    protected $_borders;
+
+    /**
+     * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
+     * frame_id.
+     *
+     * @var array
+     */
+    protected $_frames;
+
+    /**
+     * Current column when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__col;
+
+    /**
+     * Current row when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__row;
+
+    //........................................................................
+
+    function __construct(Table_Frame_Decorator $table) {
     $this->_table = $table;
     $this->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     $this->_num_rows = 0;
     $this->_num_cols = 0;
 
@@ -158,54 +157,54 @@ 
     $this->_borders = array();
 
     $this->__col = $this->__row = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_num_rows() { return $this->_num_rows; }
-  function get_num_cols() { return $this->_num_cols; }
+    function get_num_rows() { return $this->_num_rows; }
+    function get_num_cols() { return $this->_num_cols; }
 
-  function &get_columns() {
+    function &get_columns() {
     return $this->_columns;
-  }
+    }
 
-  function &get_column($i) {
+    function &get_column($i) {
     if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
-                                  "min-width" => 0,
-                                  "max-width" => 0,
-                                  "used-width" => null,
-                                  "absolute" => 0,
-                                  "percent" => 0,
-                                  "auto" => true);
+        $this->_columns[$i] = array("x" => 0,
+                                    "min-width" => 0,
+                                    "max-width" => 0,
+                                    "used-width" => null,
+                                    "absolute" => 0,
+                                    "percent" => 0,
+                                    "auto" => true);
 
     return $this->_columns[$i];
-  }
+    }
 
-  function &get_rows() {
+    function &get_rows() {
     return $this->_rows;
-  }
+    }
 
-  function &get_row($j) {
+    function &get_row($j) {
     if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
-                               "first-column" => 0,
-                               "height" => null);
+        $this->_rows[$j] = array("y" => 0,
+                                "first-column" => 0,
+                                "height" => null);
     return $this->_rows[$j];
-  }
+    }
 
-  function get_border($i, $j, $h_v, $prop = null) {
+    function get_border($i, $j, $h_v, $prop = null) {
     if ( !isset($this->_borders[$i][$j][$h_v]) )
-      $this->_borders[$i][$j][$h_v] = array("width" => 0,
-                                           "style" => "solid",
-                                           "color" => "black");
+        $this->_borders[$i][$j][$h_v] = array("width" => 0,
+                                            "style" => "solid",
+                                            "color" => "black");
     if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+        return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
-  }
+    }
 
-  function get_border_properties($i, $j) {
+    function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
     $right = $this->get_border($i, $j+1, "vertical");
@@ -213,119 +212,119 @@ 
     $bottom = $this->get_border($i+1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_spanned_cells($frame) {
+    function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     return $this->_frames[$key];
 
-  }
+    }
 
-  function frame_exists_in_cellmap($frame) {
+    function frame_exists_in_cellmap($frame) {
     $key = $frame->get_id();
     return isset($this->_frames[$key]);
-  }
+    }
   
-  function get_frame_position($frame) {
+    function get_frame_position($frame) {
     global $_dompdf_warnings;
 
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
     if ( !isset($this->_columns[$col])) {
-      $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
-      $x = 0;
+        $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
+        $x = 0;
     } else
-      $x = $this->_columns[$col]["x"];
+        $x = $this->_columns[$col]["x"];
 
     if ( !isset($this->_rows[$row])) {
-      $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
-      $y = 0;
+        $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
+        $y = 0;
     } else
-      $y = $this->_rows[$row]["y"];
+        $y = $this->_rows[$row]["y"];
 
     return array($x, $y, "x" => $x, "y" => $y);
-  }
+    }
 
-  function get_frame_width($frame) {
+    function get_frame_width($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
     foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+        $w += $this->_columns[$i]["used-width"];
 
     return $w;
 
-  }
+    }
 
-  function get_frame_height($frame) {
+    function get_frame_height($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+        if ( !isset($this->_rows[$i]) )  {
         throw new Exception("foo");
-      }
-      $h += $this->_rows[$i]["height"];
+        }
+        $h += $this->_rows[$i]["height"];
     }
     return $h;
 
-  }
+    }
 
 
-  //........................................................................
+    //........................................................................
 
-  function set_column_width($j, $width) {
+    function set_column_width($j, $width) {
     $col =& $this->get_column($j);
     $col["used-width"] = $width;
     $next_col =& $this->get_column($j+1);
     $next_col["x"] = $next_col["x"] + $width;
-  }
+    }
 
-  function set_row_height($i, $height) {
+    function set_row_height($i, $height) {
     $row =& $this->get_row($i);
     if ( $height <= $row["height"] )
-      return;
+        return;
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
     $next_row["y"] = $row["y"] + $height;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
 
-  protected function _resolve_border($i, $j, $h_v, $border_spec) {
+    protected function _resolve_border($i, $j, $h_v, $border_spec) {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
     if ( !isset($this->_borders[$i][$j][$h_v]) ) {
-      $this->_borders[$i][$j][$h_v] = $border_spec;
-      return $this->_borders[$i][$j][$h_v]["width"];
+        $this->_borders[$i][$j][$h_v] = $border_spec;
+        return $this->_borders[$i][$j][$h_v]["width"];
     }
 
     $o_width = $this->_borders[$i][$j][$h_v]["width"];
@@ -341,14 +340,14 @@ 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
           self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
-      $this->_borders[$i][$j][$h_v] = $border_spec;
+        $this->_borders[$i][$j][$h_v] = $border_spec;
 
     return $this->_borders[$i][$j][$h_v]["width"];
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_frame(Frame $frame) {
+    function add_frame(Frame $frame) {
     
     $style = $frame->get_style();
     $display = $style->display;
@@ -361,39 +360,39 @@ 
          $display == "inline-table" ||
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
+        $start_row = $this->__row;
+        foreach ( $frame->get_children() as $child )
         $this->add_frame( $child );
 
-      if ( $display == "table-row" )
+        if ( $display == "table-row" )
         $this->add_row();
 
-      $num_rows = $this->__row - $start_row - 1;
-      $key = $frame->get_id();
+        $num_rows = $this->__row - $start_row - 1;
+        $key = $frame->get_id();
 
-      // Row groups always span across the entire table
-      $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
-      $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
-      $this->_frames[ $key ]["frame"] = $frame;
+        // Row groups always span across the entire table
+        $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
+        $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
+        $this->_frames[ $key ]["frame"] = $frame;
 
-      if ( $display != "table-row" && $collapse ) {
+        if ( $display != "table-row" && $collapse ) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
         for ( $i = 0; $i < $num_rows+1; $i++) {
-          $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
-          $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
+            $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
+            $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
         for ( $j = 0; $j < $this->_num_cols; $j++) {
-          $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
-          $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+            $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
+            $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+        }
         }
-      }
 
 
-      return;
+        return;
     }
 
     // Determine where this cell is going
@@ -401,13 +400,13 @@ 
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
     if ( !$colspan ) {
-      $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+        $colspan = 1;
+        $frame->get_node()->setAttribute("colspan",1);
     }
 
     if ( !$rowspan ) {
-      $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+        $rowspan = 1;
+        $frame->get_node()->setAttribute("rowspan",1);
     }
     $key = $frame->get_id();
 
@@ -420,60 +419,60 @@ 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
     while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+        $ac++;
     $this->__col = $ac;
 
     // Rows:
     for ( $i = 0; $i < $rowspan; $i++ ) {
-      $row = $this->__row + $i;
+        $row = $this->__row + $i;
 
-      $this->_frames[ $key ]["rows"][] = $row;
+        $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
+        for ( $j = 0; $j < $colspan; $j++)
         $this->_cells[$row][$this->__col + $j] = $frame;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
-      }
+        }
     }
 
     $max_top = $max_bottom = 0;
 
     // Columns:
     for ( $j = 0; $j < $colspan; $j++ ) {
-      $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+        $col = $this->__col + $j;
+        $this->_frames[ $key ]["columns"][] = $col;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
-      }
+        }
     }
 
     $this->_frames[ $key ]["frame"] = $frame;
 
     // Handle seperated border model
     if ( !$collapse ) {
-      list($h, $v) = $this->_table->get_style()->border_spacing;
+        list($h, $v) = $this->_table->get_style()->border_spacing;
 
-      // Border spacing is effectively a margin between cells
-      $v = $style->length_in_pt($v) / 2;
-      $h = $style->length_in_pt($h) / 2;
-      $style->margin = "$v $h";
+        // Border spacing is effectively a margin between cells
+        $v = $style->length_in_pt($v) / 2;
+        $h = $style->length_in_pt($h) / 2;
+        $style->margin = "$v $h";
 
-      // The additional 1/2 width gets added to the table proper
+        // The additional 1/2 width gets added to the table proper
 
     } else {
 
-      // Drop the frame's actual border
-      $style->border_left_width = $max_left / 2;
-      $style->border_right_width = $max_right / 2;
-      $style->border_top_width = $max_top / 2;
-      $style->border_bottom_width = $max_bottom / 2;
-      $style->margin = "none";
+        // Drop the frame's actual border
+        $style->border_left_width = $max_left / 2;
+        $style->border_right_width = $max_right / 2;
+        $style->border_top_width = $max_top / 2;
+        $style->border_bottom_width = $max_bottom / 2;
+        $style->margin = "none";
     }
 
     // Resolve the frame's width
@@ -482,60 +481,60 @@ 
     $width = $style->width;
 
     if ( is_percent($width) ) {
-      $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+        $var = "percent";
+        $val = (float)rtrim($width, "% ") / $colspan;
 
     } else if ( $width !== "auto" ) {
-      $var = "absolute";
-      $val = $style->length_in_pt($frame_min) / $colspan;
+        $var = "absolute";
+        $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
     for ( $cs = 0; $cs < $colspan; $cs++ ) {
 
-      // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+        // Resolve the frame's width(s) with other cells
+        $col =& $this->get_column( $this->__col + $cs );
 
-      // Note: $var is either 'percent' or 'absolute'.  We compare the
-      // requested percentage or absolute values with the existing widths
-      // and adjust accordingly.
-      if ( isset($var) && $val > $col[$var] ) {
+        // Note: $var is either 'percent' or 'absolute'.  We compare the
+        // requested percentage or absolute values with the existing widths
+        // and adjust accordingly.
+        if ( isset($var) && $val > $col[$var] ) {
         $col[$var] = $val;
         $col["auto"] = false;
-      }
+        }
 
-      $min += $col["min-width"];
-      $max += $col["max-width"];
+        $min += $col["min-width"];
+        $max += $col["max-width"];
     }
 
 
     if ( $frame_min > $min ) {
-      // The frame needs more space.  Expand each sub-column
-      $inc = ($frame_min - $min) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        // The frame needs more space.  Expand each sub-column
+        $inc = ($frame_min - $min) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
-      }
+        }
     }
 
     if ( $frame_max > $max ) {
-      $inc = ($frame_max - $max) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        $inc = ($frame_max - $max) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
-      }
+        }
     }
 
     $this->__col += $colspan;
     if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+        $this->_num_cols = $this->__col;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_row() {
+    function add_row() {
 
     $this->__row++;
     $this->_num_rows++;
@@ -543,24 +542,24 @@ 
     // Find the next available column
     $i = 0;
     while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+        $i++;
 
     $this->__col = $i;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Remove a row from the cellmap.
-   *
-   * @param Frame
-   */
-  function remove_row(Frame $row) {
+    /**
+     * Remove a row from the cellmap.
+     *
+     * @param Frame
+     */
+    function remove_row(Frame $row) {
 
     $key = $row->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -569,47 +568,47 @@ 
 
     // Remove all frames from this row
     foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
+        foreach ( $columns as $c ) {
         if ( isset($this->_cells[$r][$c]) ) {
-          $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
-          unset($this->_cells[$r][$c]);
+            $frame = $this->_cells[$r][$c];
+            unset($this->_frames[ $frame->get_id() ]);
+            unset($this->_cells[$r][$c]);
+        }
         }
-      }
-      unset($this->_rows[$r]);
+        unset($this->_rows[$r]);
     }
 
     unset($this->_frames[$key]);
 
-  }
+    }
 
-  /**
-   * Remove a row group from the cellmap.
-   *
-   * @param Frame $group  The group to remove
-   */
-  function remove_row_group(Frame $group) {
+    /**
+     * Remove a row group from the cellmap.
+     *
+     * @param Frame $group  The group to remove
+     */
+    function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
-      $this->remove_row($iter);
-      $iter = $iter->get_next_sibling();
+        $this->remove_row($iter);
+        $iter = $iter->get_next_sibling();
     }
 
     unset($this->_frames[$key]);
-  }
+    }
 
-  /**
-   * Update a row group after rows have been removed
-   *
-   * @param Frame $group    The group to update
-   * @param Frame $last_row The last row in the row group
-   */
-  function update_row_group(Frame $group, Frame $last_row) {
+    /**
+     * Update a row group after rows have been removed
+     *
+     * @param Frame $group    The group to update
+     * @param Frame $last_row The last row in the row group
+     */
+    function update_row_group(Frame $group, Frame $last_row) {
 
     $g_key = $group->get_id();
     $r_key = $last_row->get_id();
@@ -617,80 +616,80 @@ 
     $r_rows = $this->_frames[$r_key]["rows"];
     $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function assign_x_positions() {
+    function assign_x_positions() {
     // Pre-condition: widths must be resolved and assigned to columns and
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
     foreach ( array_keys($this->_columns) as $j ) {
-      $this->_columns[$j]["x"] = $x;
-      $x += $this->_columns[$j]["used-width"];
+        $this->_columns[$j]["x"] = $x;
+        $x += $this->_columns[$j]["used-width"];
 
     }
 
-  }
+    }
 
-  function assign_frame_heights() {
+    function assign_frame_heights() {
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach( $arr["rows"] as $row ) {
+        $h = 0;
+        foreach( $arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          // The row has been removed because of a page split, so skip it.
-          continue;
+            // The row has been removed because of a page split, so skip it.
+            continue;
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($h);
-      else
+        else
         $frame->get_style()->height = $h;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Re-adjust frame height if the table height is larger than its content
-   */
-  function set_frame_heights($table_height, $content_height) {
+    /**
+     * Re-adjust frame height if the table height is larger than its content
+     */
+    function set_frame_heights($table_height, $content_height) {
 
 
     // Distribute the increased height proportionally amongst each row
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach ($arr["rows"] as $row ) {
+        $h = 0;
+        foreach ($arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          continue;
+            continue;
 
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      $new_height = ($h / $content_height) * $table_height;
+        $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($new_height);
-      else
+        else
         $frame->get_style()->height = $new_height;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Used for debugging:
-  function __toString() {
+    // Used for debugging:
+    function __toString() {
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
@@ -700,14 +699,14 @@ 
     $str .=  "Frames:<br/>";
     $arr = array();
     foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+        $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
 
     $str .= pre_r($arr, true);
 
     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",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
     return $str;
-  }
+    }
 }