chamilo / chamilo-lms

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

Doc Comments +8 added lines

@@ -194,6 +194,9 @@ 
     return $this->_rows[$j];
   }
 
+  /**
+   * @param string $h_v
+   */
   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,
@@ -318,6 +321,11 @@ 
   //........................................................................
 
 
+  /**
+   * @param integer $i
+   * @param integer $j
+   * @param string $h_v
+   */
   protected function _resolve_border($i, $j, $h_v, $border_spec) {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];

Indentation +323 added lines, -324 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cellmap.cls.php,v $
- * Created on: 2004-07-28
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cellmap.cls.php,v $
+     * Created on: 2004-07-28
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @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;
-  }
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -170,7 +170,7 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
+    if (!isset($this->_columns[$i]))
       $this->_columns[$i] = array("x" => 0,
                                   "min-width" => 0,
                                   "max-width" => 0,
@@ -187,7 +187,7 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
+    if (!isset($this->_rows[$j]))
       $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
@@ -195,11 +195,11 @@ 
   }
 
   function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) )
+    if (!isset($this->_borders[$i][$j][$h_v]))
       $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
+    if (isset($prop))
       return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
@@ -208,9 +208,9 @@ 
   function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
-    $right = $this->get_border($i, $j+1, "vertical");
+    $right = $this->get_border($i, $j + 1, "vertical");
     $top = $this->get_border($i, $j, "horizontal");
-    $bottom = $this->get_border($i+1, $j, "horizontal");
+    $bottom = $this->get_border($i + 1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
   }
@@ -220,7 +220,7 @@ 
   function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -238,20 +238,20 @@ 
 
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       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])) {
+    if (!isset($this->_columns[$col])) {
       $_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"];
 
-    if ( !isset($this->_rows[$row])) {
+    if (!isset($this->_rows[$row])) {
       $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
       $y = 0;
     } else
@@ -263,7 +263,7 @@ 
   function get_frame_width($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -279,13 +279,13 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
+    if (!isset($this->_frames[$key]))
       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"];
@@ -298,19 +298,19 @@ 
   //........................................................................
 
   function set_column_width($j, $width) {
-    $col =& $this->get_column($j);
+    $col = & $this->get_column($j);
     $col["used-width"] = $width;
-    $next_col =& $this->get_column($j+1);
+    $next_col = & $this->get_column($j + 1);
     $next_col["x"] = $next_col["x"] + $width;
   }
 
   function set_row_height($i, $height) {
-    $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
+    $row = & $this->get_row($i);
+    if ($height <= $row["height"])
       return;
 
     $row["height"] = $height;
-    $next_row =& $this->get_row($i+1);
+    $next_row = & $this->get_row($i + 1);
     $next_row["y"] = $row["y"] + $height;
 
   }
@@ -323,7 +323,7 @@ 
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
-    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+    if (!isset($this->_borders[$i][$j][$h_v])) {
       $this->_borders[$i][$j][$h_v] = $border_spec;
       return $this->_borders[$i][$j][$h_v]["width"];
     }
@@ -332,15 +332,15 @@ 
     $o_style = $this->_borders[$i][$j][$h_v]["style"];
     $o_color = $this->_borders[$i][$j][$h_v]["color"];
 
-    if ( ($n_style === "hidden" ||
-          $n_width  >  $o_width ||
+    if (($n_style === "hidden" ||
+          $n_width > $o_width ||
           $o_style === "none")
 
          or
 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
+          self::$_BORDER_STYLE_SCORE[$n_style] > self::$_BORDER_STYLE_SCORE[$o_style]))
       $this->_borders[$i][$j][$h_v] = $border_spec;
 
     return $this->_borders[$i][$j][$h_v]["width"];
@@ -356,37 +356,37 @@ 
     $collapse = $this->_table->get_style()->border_collapse == "collapse";
 
     // Recursively add the frames within tables, table-row-groups and table-rows
-    if ( $display == "table-row" ||
+    if ($display == "table-row" ||
          $display == "table" ||
          $display == "inline-table" ||
-         in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+         in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
-        $this->add_frame( $child );
+      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();
 
       // 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;
+      $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++) {
+        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"]);
         }
 
-        for ( $j = 0; $j < $this->_num_cols; $j++) {
+        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"]);
         }
@@ -400,14 +400,14 @@ 
     $colspan = $frame->get_node()->getAttribute("colspan");
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
-    if ( !$colspan ) {
+    if (!$colspan) {
       $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+      $frame->get_node()->setAttribute("colspan", 1);
     }
 
-    if ( !$rowspan ) {
+    if (!$rowspan) {
       $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+      $frame->get_node()->setAttribute("rowspan", 1);
     }
     $key = $frame->get_id();
 
@@ -419,20 +419,20 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
+    while (isset($this->_cells[$this->__row][$ac]))
        $ac++;
     $this->__col = $ac;
 
     // Rows:
-    for ( $i = 0; $i < $rowspan; $i++ ) {
+    for ($i = 0; $i < $rowspan; $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"]));
@@ -442,21 +442,21 @@ 
     $max_top = $max_bottom = 0;
 
     // Columns:
-    for ( $j = 0; $j < $colspan; $j++ ) {
+    for ($j = 0; $j < $colspan; $j++) {
       $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+      $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;
+    $this->_frames[$key]["frame"] = $frame;
 
     // Handle seperated border model
-    if ( !$collapse ) {
+    if (!$collapse) {
       list($h, $v) = $this->_table->get_style()->border_spacing;
 
       // Border spacing is effectively a margin between cells
@@ -481,26 +481,26 @@ 
 
     $width = $style->width;
 
-    if ( is_percent($width) ) {
+    if (is_percent($width)) {
       $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+      $val = (float) rtrim($width, "% ") / $colspan;
 
-    } else if ( $width !== "auto" ) {
+    } else if ($width !== "auto") {
       $var = "absolute";
       $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
-    for ( $cs = 0; $cs < $colspan; $cs++ ) {
+    for ($cs = 0; $cs < $colspan; $cs++) {
 
       // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+      $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] ) {
+      if (isset($var) && $val > $col[$var]) {
         $col[$var] = $val;
         $col["auto"] = false;
       }
@@ -510,25 +510,25 @@ 
     }
 
 
-    if ( $frame_min > $min ) {
+    if ($frame_min > $min) {
       // 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 = & $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
       }
     }
 
-    if ( $frame_max > $max ) {
+    if ($frame_max > $max) {
       $inc = ($frame_max - $max) / $colspan;
       for ($c = 0; $c < $colspan; $c++) {
-        $col =& $this->get_column($this->__col + $c);
+        $col = & $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
       }
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
+    if ($this->__col > $this->_num_cols)
       $this->_num_cols = $this->__col;
 
   }
@@ -542,7 +542,7 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
+    while (isset($this->_cells[$this->__row][$i]))
       $i++;
 
     $this->__col = $i;
@@ -559,8 +559,8 @@ 
   function remove_row(Frame $row) {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if (!isset($this->_frames[$key]))
+      return; // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -568,11 +568,11 @@ 
     $columns = $this->_frames[$key]["columns"];
 
     // Remove all frames from this row
-    foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
-        if ( isset($this->_cells[$r][$c]) ) {
+    foreach ($rows as $r) {
+      foreach ($columns as $c) {
+        if (isset($this->_cells[$r][$c])) {
           $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
+          unset($this->_frames[$frame->get_id()]);
           unset($this->_cells[$r][$c]);
         }
       }
@@ -591,8 +591,8 @@ 
   function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if (!isset($this->_frames[$key]))
+      return; // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
@@ -615,7 +615,7 @@ 
     $r_key = $last_row->get_id();
 
     $r_rows = $this->_frames[$r_key]["rows"];
-    $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
+    $this->_frames[$g_key]["rows"] = range($this->_frames[$g_key]["rows"][0], end($r_rows));
 
   }
 
@@ -626,7 +626,7 @@ 
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
-    foreach ( array_keys($this->_columns) as $j ) {
+    foreach (array_keys($this->_columns) as $j) {
       $this->_columns[$j]["x"] = $x;
       $x += $this->_columns[$j]["used-width"];
 
@@ -638,18 +638,18 @@ 
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row]))
           // 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
         $frame->get_style()->height = $h;
@@ -666,12 +666,12 @@ 
 
 
     // Distribute the increased height proportionally amongst each row
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row]))
           continue;
 
         $h += $this->_rows[$row]["height"];
@@ -679,7 +679,7 @@ 
 
       $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
         $frame->get_style()->height = $new_height;
@@ -694,19 +694,19 @@ 
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
-    $str .=  "Rows:<br/>";
+    $str .= "Rows:<br/>";
     $str .= pre_r($this->_rows, true);
 
-    $str .=  "Frames:<br/>";
+    $str .= "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
+    foreach ($this->_frames as $key => $val)
       $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>"),
-                                    array("\n",chr(27)."[01;33m", chr(27)."[0m"),
+    if (php_sapi_name() == "cli")
+      $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"),
+                                    array("\n", chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
     return $str;
   }

Braces +78 added lines, -52 removed lines

@@ -170,14 +170,15 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
+    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);
+    }
 
     return $this->_columns[$i];
   }
@@ -187,20 +188,23 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
+    if ( !isset($this->_rows[$j]) ) {
+          $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
+    }
     return $this->_rows[$j];
   }
 
   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,
+    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+          $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+    }
+    if ( isset($prop) ) {
+          return $this->_borders[$i][$j][$h_v][$prop];
+    }
 
     return $this->_borders[$i][$j][$h_v];
   }
@@ -248,14 +252,16 @@ 
     if ( !isset($this->_columns[$col])) {
       $_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"];
+    } else {
+          $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;
-    } else
-      $y = $this->_rows[$row]["y"];
+    } else {
+          $y = $this->_rows[$row]["y"];
+    }
 
     return array($x, $y, "x" => $x, "y" => $y);
   }
@@ -269,8 +275,9 @@ 
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
-    foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+    foreach ($cols as $i) {
+          $w += $this->_columns[$i]["used-width"];
+    }
 
     return $w;
 
@@ -279,8 +286,9 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    if ( !isset($this->_frames[$key]) ) {
+          throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    }
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
@@ -306,8 +314,9 @@ 
 
   function set_row_height($i, $height) {
     $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
-      return;
+    if ( $height <= $row["height"] ) {
+          return;
+    }
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
@@ -340,8 +349,9 @@ 
 
          ($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;
+          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) ) {
+          $this->_borders[$i][$j][$h_v] = $border_spec;
+    }
 
     return $this->_borders[$i][$j][$h_v]["width"];
   }
@@ -362,11 +372,13 @@ 
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
-        $this->add_frame( $child );
+      foreach ( $frame->get_children() as $child ) {
+              $this->add_frame( $child );
+      }
 
-      if ( $display == "table-row" )
-        $this->add_row();
+      if ( $display == "table-row" ) {
+              $this->add_row();
+      }
 
       $num_rows = $this->__row - $start_row - 1;
       $key = $frame->get_id();
@@ -419,8 +431,9 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+    while ( isset($this->_cells[$this->__row][$ac]) ) {
+           $ac++;
+    }
     $this->__col = $ac;
 
     // Rows:
@@ -429,8 +442,9 @@ 
 
       $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
-        $this->_cells[$row][$this->__col + $j] = $frame;
+      for ( $j = 0; $j < $colspan; $j++) {
+              $this->_cells[$row][$this->__col + $j] = $frame;
+      }
 
       if ( $collapse ) {
         // Resolve vertical borders
@@ -528,8 +542,9 @@ 
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+    if ( $this->__col > $this->_num_cols ) {
+          $this->_num_cols = $this->__col;
+    }
 
   }
 
@@ -542,8 +557,9 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+    while ( isset($this->_cells[$this->__row][$i]) ) {
+          $i++;
+    }
 
     $this->__col = $i;
 
@@ -559,8 +575,10 @@ 
   function remove_row(Frame $row) {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -591,8 +609,10 @@ 
   function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
@@ -643,16 +663,18 @@ 
 
       $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.
+        if ( !isset($this->_rows[$row]) ) {
+                  // 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 )
-        $frame->set_cell_height($h);
-      else
-        $frame->get_style()->height = $h;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($h);
+      } else {
+              $frame->get_style()->height = $h;
+      }
     }
 
   }
@@ -671,18 +693,20 @@ 
 
       $h = 0;
       foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
-          continue;
+        if ( !isset($this->_rows[$row]) ) {
+                  continue;
+        }
 
         $h += $this->_rows[$row]["height"];
       }
 
       $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
-        $frame->set_cell_height($new_height);
-      else
-        $frame->get_style()->height = $new_height;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($new_height);
+      } else {
+              $frame->get_style()->height = $new_height;
+      }
     }
 
   }
@@ -699,15 +723,17 @@ 
 
     $str .=  "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+    foreach ( $this->_frames as $key => $val ) {
+          $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>"),
+    if ( php_sapi_name() == "cli" ) {
+          $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
+    }
     return $str;
   }
 }

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

Doc Comments +5 added lines, -2 removed lines

@@ -461,6 +461,8 @@ 
    * @param string cap
    * @param string join
    * @param array dash
+   * @param string $cap
+   * @param string $join
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
     $this->_pdf->setLineStyle($width, $cap, $join, $dash);
@@ -496,6 +498,7 @@ 
   /**
    * Convert a GIF image to a PNG image
    *
+   * @param string $image_url
    * @return string The url of the newly converted image
    */
   protected function _convert_gif_to_png($image_url) {
@@ -775,8 +778,8 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
+   * @param integer $adjust word spacing adjustment
+   * @param integer $angle angle to write the text at, measured CW starting from the x-axis
    */
   function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
                      $adjust = 0, $angle = 0) {

Switch Indentation +58 added lines, -58 removed lines

@@ -595,56 +595,56 @@ 
     $img_type = mb_strtolower($img_type);
 
     switch ($img_type) {
-    case "jpeg":
-    case "jpg":
-      //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+        case "jpeg":
+        case "jpg":
+          //debugpng
+          if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+          $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
 
-    case "png":
-      //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
-
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
-
-    case "gif":
-      // Convert gifs to pngs
-      //DEBUG_IMG_TEMP
-      //if (0) {
-      if ( method_exists( $this->_pdf, "addImagePng" ) ) {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
-
-      	//If optimization to direct png creation from gd object is available,
-        //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
-        $img_url = $this->_convert_gif_to_png($img_url);
-        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        case "png":
+          //debugpng
+          if (DEBUGPNG)  print '!!!png!!!';
 
-    default:
-      //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+          $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
+
+        case "gif":
+          // Convert gifs to pngs
+          //DEBUG_IMG_TEMP
+          //if (0) {
+          if ( method_exists( $this->_pdf, "addImagePng" ) ) {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+
+      	    //If optimization to direct png creation from gd object is available,
+            //don't create temp file, but place gd object directly into the pdf
+	        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+	             $this->_pdf->image_iscached($img_url) ) {
+	          //If same image has occured already before, no need to load because
+	          //duplicate will anyway be eliminated.
+	          $img = null;
+	        } else {
+    	      $img = @imagecreatefromgif($img_url);
+    	      if (!$img) {
+      	        return;
+    	      }
+    	      imageinterlace($img, 0);
+    	    }
+    	    $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+          } else {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+            $img_url = $this->_convert_gif_to_png($img_url);
+            $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          }
+          break;
+
+        default:
+          //debugpng
+          if (DEBUGPNG) print '!!!unknown!!!';
+          break;
     }
     
     return;
@@ -833,18 +833,18 @@ 
 
         switch ($_t) {
             
-        case "text":
-        $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                            array($page_number, $this->_page_count), $text);
-        $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            case "text":
+            $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                array($page_number, $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' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "script":
+              if (!$eval) {
+                $eval = new PHP_Evaluator($this);
+              }
+              $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

Spacing +80 added lines, -80 removed lines

@@ -55,7 +55,7 @@ 
 /* $Id: cpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
 // FIXME: Need to sanity check inputs to this class
-require_once(DOMPDF_LIB_DIR . "/class.pdf.php");
+require_once(DOMPDF_LIB_DIR."/class.pdf.php");
 
 /**
  * PDF rendering interface
@@ -79,62 +79,62 @@ 
    *
    * @var array;
    */
-  static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
-                              "2a0" => array(0,0,3370.39,4767.87),
-                              "a0" => array(0,0,2383.94,3370.39),
-                              "a1" => array(0,0,1683.78,2383.94),
-                              "a2" => array(0,0,1190.55,1683.78),
-                              "a3" => array(0,0,841.89,1190.55),
-                              "a4" => array(0,0,595.28,841.89),
-                              "a5" => array(0,0,419.53,595.28),
-                              "a6" => array(0,0,297.64,419.53),
-                              "a7" => array(0,0,209.76,297.64),
-                              "a8" => array(0,0,147.40,209.76),
-                              "a9" => array(0,0,104.88,147.40),
-                              "a10" => array(0,0,73.70,104.88),
-                              "b0" => array(0,0,2834.65,4008.19),
-                              "b1" => array(0,0,2004.09,2834.65),
-                              "b2" => array(0,0,1417.32,2004.09),
-                              "b3" => array(0,0,1000.63,1417.32),
-                              "b4" => array(0,0,708.66,1000.63),
-                              "b5" => array(0,0,498.90,708.66),
-                              "b6" => array(0,0,354.33,498.90),
-                              "b7" => array(0,0,249.45,354.33),
-                              "b8" => array(0,0,175.75,249.45),
-                              "b9" => array(0,0,124.72,175.75),
-                              "b10" => array(0,0,87.87,124.72),
-                              "c0" => array(0,0,2599.37,3676.54),
-                              "c1" => array(0,0,1836.85,2599.37),
-                              "c2" => array(0,0,1298.27,1836.85),
-                              "c3" => array(0,0,918.43,1298.27),
-                              "c4" => array(0,0,649.13,918.43),
-                              "c5" => array(0,0,459.21,649.13),
-                              "c6" => array(0,0,323.15,459.21),
-                              "c7" => array(0,0,229.61,323.15),
-                              "c8" => array(0,0,161.57,229.61),
-                              "c9" => array(0,0,113.39,161.57),
-                              "c10" => array(0,0,79.37,113.39),
-                              "ra0" => array(0,0,2437.80,3458.27),
-                              "ra1" => array(0,0,1729.13,2437.80),
-                              "ra2" => array(0,0,1218.90,1729.13),
-                              "ra3" => array(0,0,864.57,1218.90),
-                              "ra4" => array(0,0,609.45,864.57),
-                              "sra0" => array(0,0,2551.18,3628.35),
-                              "sra1" => array(0,0,1814.17,2551.18),
-                              "sra2" => array(0,0,1275.59,1814.17),
-                              "sra3" => array(0,0,907.09,1275.59),
-                              "sra4" => array(0,0,637.80,907.09),
-                              "letter" => array(0,0,612.00,792.00),
-                              "legal" => array(0,0,612.00,1008.00),
-                              "ledger" => array(0,0,1224.00, 792.00),
-                              "tabloid" => array(0,0,792.00, 1224.00),
-                              "executive" => array(0,0,521.86,756.00),
-                              "folio" => array(0,0,612.00,936.00),
-                              "commerical #10 envelope" => array(0,0,684,297),
-                              "catalog #10 1/2 envelope" => array(0,0,648,864),
-                              "8.5x11" => array(0,0,612.00,792.00),
-                              "8.5x14" => array(0,0,612.00,1008.0),
-                              "11x17"  => array(0,0,792.00, 1224.00));
+  static $PAPER_SIZES = array("4a0" => array(0, 0, 4767.87, 6740.79),
+                              "2a0" => array(0, 0, 3370.39, 4767.87),
+                              "a0" => array(0, 0, 2383.94, 3370.39),
+                              "a1" => array(0, 0, 1683.78, 2383.94),
+                              "a2" => array(0, 0, 1190.55, 1683.78),
+                              "a3" => array(0, 0, 841.89, 1190.55),
+                              "a4" => array(0, 0, 595.28, 841.89),
+                              "a5" => array(0, 0, 419.53, 595.28),
+                              "a6" => array(0, 0, 297.64, 419.53),
+                              "a7" => array(0, 0, 209.76, 297.64),
+                              "a8" => array(0, 0, 147.40, 209.76),
+                              "a9" => array(0, 0, 104.88, 147.40),
+                              "a10" => array(0, 0, 73.70, 104.88),
+                              "b0" => array(0, 0, 2834.65, 4008.19),
+                              "b1" => array(0, 0, 2004.09, 2834.65),
+                              "b2" => array(0, 0, 1417.32, 2004.09),
+                              "b3" => array(0, 0, 1000.63, 1417.32),
+                              "b4" => array(0, 0, 708.66, 1000.63),
+                              "b5" => array(0, 0, 498.90, 708.66),
+                              "b6" => array(0, 0, 354.33, 498.90),
+                              "b7" => array(0, 0, 249.45, 354.33),
+                              "b8" => array(0, 0, 175.75, 249.45),
+                              "b9" => array(0, 0, 124.72, 175.75),
+                              "b10" => array(0, 0, 87.87, 124.72),
+                              "c0" => array(0, 0, 2599.37, 3676.54),
+                              "c1" => array(0, 0, 1836.85, 2599.37),
+                              "c2" => array(0, 0, 1298.27, 1836.85),
+                              "c3" => array(0, 0, 918.43, 1298.27),
+                              "c4" => array(0, 0, 649.13, 918.43),
+                              "c5" => array(0, 0, 459.21, 649.13),
+                              "c6" => array(0, 0, 323.15, 459.21),
+                              "c7" => array(0, 0, 229.61, 323.15),
+                              "c8" => array(0, 0, 161.57, 229.61),
+                              "c9" => array(0, 0, 113.39, 161.57),
+                              "c10" => array(0, 0, 79.37, 113.39),
+                              "ra0" => array(0, 0, 2437.80, 3458.27),
+                              "ra1" => array(0, 0, 1729.13, 2437.80),
+                              "ra2" => array(0, 0, 1218.90, 1729.13),
+                              "ra3" => array(0, 0, 864.57, 1218.90),
+                              "ra4" => array(0, 0, 609.45, 864.57),
+                              "sra0" => array(0, 0, 2551.18, 3628.35),
+                              "sra1" => array(0, 0, 1814.17, 2551.18),
+                              "sra2" => array(0, 0, 1275.59, 1814.17),
+                              "sra3" => array(0, 0, 907.09, 1275.59),
+                              "sra4" => array(0, 0, 637.80, 907.09),
+                              "letter" => array(0, 0, 612.00, 792.00),
+                              "legal" => array(0, 0, 612.00, 1008.00),
+                              "ledger" => array(0, 0, 1224.00, 792.00),
+                              "tabloid" => array(0, 0, 792.00, 1224.00),
+                              "executive" => array(0, 0, 521.86, 756.00),
+                              "folio" => array(0, 0, 612.00, 936.00),
+                              "commerical #10 envelope" => array(0, 0, 684, 297),
+                              "catalog #10 1/2 envelope" => array(0, 0, 648, 864),
+                              "8.5x11" => array(0, 0, 612.00, 792.00),
+                              "8.5x14" => array(0, 0, 612.00, 1008.0),
+                              "11x17"  => array(0, 0, 792.00, 1224.00));
 
 
   /**
@@ -201,14 +201,14 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
 
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
       $size = self::$PAPER_SIZES["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -224,7 +224,7 @@ 
     
 
     $this->_width = $size[2] - $size[0];
-    $this->_height= $size[3] - $size[1];
+    $this->_height = $size[3] - $size[1];
     $this->_pdf->openHere('Fit');
     
     $this->_page_number = $this->_page_count = 1;
@@ -500,14 +500,14 @@ 
    */
   protected function _convert_gif_to_png($image_url) {
     
-    if ( !function_exists("imagecreatefromgif") ) {
+    if (!function_exists("imagecreatefromgif")) {
       throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
     }
 
     $old_err = set_error_handler("record_warnings");
     $im = imagecreatefromgif($image_url);
 
-    if ( $im ) {
+    if ($im) {
       imageinterlace($im, 0);
 
       $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
@@ -516,7 +516,7 @@ 
       imagepng($im, $filename);
 
     } else {
-      $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
+      $filename = DOMPDF_LIB_DIR."/res/broken_image.png";
 
     }
 
@@ -559,11 +559,11 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
     
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "square", "miter", $style);
     
     // Adjust y values
-    for ( $i = 1; $i < count($points); $i += 2)
+    for ($i = 1; $i < count($points); $i += 2)
       $points[$i] = $this->y($points[$i]);
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
@@ -580,7 +580,7 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "round", "round", $style);
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
@@ -614,14 +614,14 @@ 
       // Convert gifs to pngs
       //DEBUG_IMG_TEMP
       //if (0) {
-      if ( method_exists( $this->_pdf, "addImagePng" ) ) {
+      if (method_exists($this->_pdf, "addImagePng")) {
         //debugpng
         if (DEBUGPNG)  print '!!!gif addImagePng!!!';
 
       	//If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
+	    if (method_exists($this->_pdf, "image_iscached") &&
+	         $this->_pdf->image_iscached($img_url)) {
 	      //If same image has occured already before, no need to load because
 	      //duplicate will anyway be eliminated.
 	      $img = null;
@@ -652,7 +652,7 @@ 
 
   //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0),
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
                 $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
 
     list($r, $g, $b) = $color;
@@ -695,7 +695,7 @@ 
     //$this->_pdf->addText($x, $this->y($y) - Font_Metrics::get_font_height($font, $size), $size, $text, $angle, $adjust);
 	//$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
 	//$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
-	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
+	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3] * $size) / 1000, $size, $text, $angle, $adjust);
   }
 
   //........................................................................
@@ -712,7 +712,7 @@ 
    * @param string $anchorname The name of the named destination
    */
   function add_named_dest($anchorname) {
-    $this->_pdf->addDestination($anchorname,"Fit");
+    $this->_pdf->addDestination($anchorname, "Fit");
   }
 
   //........................................................................
@@ -730,10 +730,10 @@ 
 
     $y = $this->y($y) - $height;
 
-    if ( strpos($url, '#') === 0 ) {
+    if (strpos($url, '#') === 0) {
       // Local link
-      $name = substr($url,1);
-      if ( $name )
+      $name = substr($url, 1);
+      if ($name)
         $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
 
     } else {
@@ -778,7 +778,7 @@ 
    * @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),
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
                      $adjust = 0, $angle = 0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
@@ -819,7 +819,7 @@ 
    */
   protected function _add_page_text() {
     
-    if ( !count($this->_page_text) )
+    if (!count($this->_page_text))
       return;
 
     $page_number = 1;
@@ -834,7 +834,7 @@ 
         switch ($_t) {
             
         case "text":
-        $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+        $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"),
                             array($page_number, $this->_page_count), $text);
         $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
           break;
@@ -878,7 +878,7 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $debug = 1;
     else
       $debug = 0;

Braces +51 added lines, -29 removed lines

@@ -201,12 +201,13 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
 
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
-    else
-      $size = self::$PAPER_SIZES["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+    } else {
+          $size = self::$PAPER_SIZES["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];
@@ -243,9 +244,12 @@ 
   function __destruct() {
     foreach ($this->_image_cache as $img) {
       //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
-        unlink($img);
+      if (DEBUGPNG) {
+          print '[__destruct unlink '.$img.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+              unlink($img);
+      }
     }
   }
   
@@ -559,12 +563,14 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
     
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
     
     // Adjust y values
-    for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+    for ( $i = 1; $i < count($points); $i += 2) {
+          $points[$i] = $this->y($points[$i]);
+    }
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
   }
@@ -580,8 +586,9 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
   }
@@ -590,7 +597,9 @@ 
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
-    if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
+    if (DEBUGPNG) {
+        print '[image:'.$img_url.'|'.$img_type.']';
+    }
 
     $img_type = mb_strtolower($img_type);
 
@@ -598,14 +607,18 @@ 
     case "jpeg":
     case "jpg":
       //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+      if (DEBUGPNG) {
+          print '!!!jpg!!!';
+      }
 
       $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
 
     case "png":
       //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
+      if (DEBUGPNG) {
+          print '!!!png!!!';
+      }
 
       $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
@@ -616,7 +629,9 @@ 
       //if (0) {
       if ( method_exists( $this->_pdf, "addImagePng" ) ) {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addImagePng!!!';
+        }
 
       	//If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
@@ -635,7 +650,9 @@ 
     	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
       } else {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addPngFromFile!!!';
+        }
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       }
@@ -643,7 +660,9 @@ 
 
     default:
       //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
+      if (DEBUGPNG) {
+          print '!!!unknown!!!';
+      }
       break;
     }
     
@@ -733,8 +752,9 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      if ( $name ) {
+              $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      }
 
     } else {
       $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
@@ -819,8 +839,9 @@ 
    */
   protected function _add_page_text() {
     
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $page_number = 1;
     $eval = null;
@@ -878,10 +899,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
-    else
-      $debug = 0;
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $debug = 1;
+    } else {
+          $debug = 0;
+    }
     
     return $this->_pdf->output($debug);
     

Indentation +575 added lines, -575 removed lines

@@ -1,56 +1,56 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cpdf_adapter.cls.php,v $
- * Created on: 2004-08-04
- * Modified on: 2008-01-05
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- * Portions copyright (c) 2008 - Orion Richardson <orionr@yahoo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Orion Richardson <orionr@yahoo.com>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - On gif to png conversion tmp file creation, clarify tmp name and add to tmp deletion list only on success
- * - On gif to png conversion, when available add direct from gd without tmp file, skip image load if already cached.
- *   to safe CPU time and memory
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version dompdf_trunk_with_helmut_mods.20090524
- * - Pass temp and fontcache folders to Cpdf, to making Cpdf independent from dompdf
- * @version dompdf_trunk_with_helmut_mods.20090528
- * - fix text position according to glyph baseline to match background rectangle
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cpdf_adapter.cls.php,v $
+     * Created on: 2004-08-04
+     * Modified on: 2008-01-05
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     * Portions copyright (c) 2008 - Orion Richardson <orionr@yahoo.com>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Orion Richardson <orionr@yahoo.com>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - On gif to png conversion tmp file creation, clarify tmp name and add to tmp deletion list only on success
+     * - On gif to png conversion, when available add direct from gd without tmp file, skip image load if already cached.
+     *   to safe CPU time and memory
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Pass temp and fontcache folders to Cpdf, to making Cpdf independent from dompdf
+     * @version dompdf_trunk_with_helmut_mods.20090528
+     * - fix text position according to glyph baseline to match background rectangle
+     */
 
 /* $Id: cpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -74,144 +74,144 @@ 
  */
 class CPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
-                              "2a0" => array(0,0,3370.39,4767.87),
-                              "a0" => array(0,0,2383.94,3370.39),
-                              "a1" => array(0,0,1683.78,2383.94),
-                              "a2" => array(0,0,1190.55,1683.78),
-                              "a3" => array(0,0,841.89,1190.55),
-                              "a4" => array(0,0,595.28,841.89),
-                              "a5" => array(0,0,419.53,595.28),
-                              "a6" => array(0,0,297.64,419.53),
-                              "a7" => array(0,0,209.76,297.64),
-                              "a8" => array(0,0,147.40,209.76),
-                              "a9" => array(0,0,104.88,147.40),
-                              "a10" => array(0,0,73.70,104.88),
-                              "b0" => array(0,0,2834.65,4008.19),
-                              "b1" => array(0,0,2004.09,2834.65),
-                              "b2" => array(0,0,1417.32,2004.09),
-                              "b3" => array(0,0,1000.63,1417.32),
-                              "b4" => array(0,0,708.66,1000.63),
-                              "b5" => array(0,0,498.90,708.66),
-                              "b6" => array(0,0,354.33,498.90),
-                              "b7" => array(0,0,249.45,354.33),
-                              "b8" => array(0,0,175.75,249.45),
-                              "b9" => array(0,0,124.72,175.75),
-                              "b10" => array(0,0,87.87,124.72),
-                              "c0" => array(0,0,2599.37,3676.54),
-                              "c1" => array(0,0,1836.85,2599.37),
-                              "c2" => array(0,0,1298.27,1836.85),
-                              "c3" => array(0,0,918.43,1298.27),
-                              "c4" => array(0,0,649.13,918.43),
-                              "c5" => array(0,0,459.21,649.13),
-                              "c6" => array(0,0,323.15,459.21),
-                              "c7" => array(0,0,229.61,323.15),
-                              "c8" => array(0,0,161.57,229.61),
-                              "c9" => array(0,0,113.39,161.57),
-                              "c10" => array(0,0,79.37,113.39),
-                              "ra0" => array(0,0,2437.80,3458.27),
-                              "ra1" => array(0,0,1729.13,2437.80),
-                              "ra2" => array(0,0,1218.90,1729.13),
-                              "ra3" => array(0,0,864.57,1218.90),
-                              "ra4" => array(0,0,609.45,864.57),
-                              "sra0" => array(0,0,2551.18,3628.35),
-                              "sra1" => array(0,0,1814.17,2551.18),
-                              "sra2" => array(0,0,1275.59,1814.17),
-                              "sra3" => array(0,0,907.09,1275.59),
-                              "sra4" => array(0,0,637.80,907.09),
-                              "letter" => array(0,0,612.00,792.00),
-                              "legal" => array(0,0,612.00,1008.00),
-                              "ledger" => array(0,0,1224.00, 792.00),
-                              "tabloid" => array(0,0,792.00, 1224.00),
-                              "executive" => array(0,0,521.86,756.00),
-                              "folio" => array(0,0,612.00,936.00),
-                              "commerical #10 envelope" => array(0,0,684,297),
-                              "catalog #10 1/2 envelope" => array(0,0,648,864),
-                              "8.5x11" => array(0,0,612.00,792.00),
-                              "8.5x14" => array(0,0,612.00,1008.0),
-                              "11x17"  => array(0,0,792.00, 1224.00));
-
-
-  /**
-   * Instance of Cpdf class
-   *
-   * @var Cpdf
-   */
-  private $_pdf;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var float;
-   */
-  private $_height;
-
-  /**
-   * 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;
-
-  /**
-   * Array of temporary cached images to be deleted when processing is complete
-   *
-   * @var array
-   */
-  private $_image_cache;
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
+                                "2a0" => array(0,0,3370.39,4767.87),
+                                "a0" => array(0,0,2383.94,3370.39),
+                                "a1" => array(0,0,1683.78,2383.94),
+                                "a2" => array(0,0,1190.55,1683.78),
+                                "a3" => array(0,0,841.89,1190.55),
+                                "a4" => array(0,0,595.28,841.89),
+                                "a5" => array(0,0,419.53,595.28),
+                                "a6" => array(0,0,297.64,419.53),
+                                "a7" => array(0,0,209.76,297.64),
+                                "a8" => array(0,0,147.40,209.76),
+                                "a9" => array(0,0,104.88,147.40),
+                                "a10" => array(0,0,73.70,104.88),
+                                "b0" => array(0,0,2834.65,4008.19),
+                                "b1" => array(0,0,2004.09,2834.65),
+                                "b2" => array(0,0,1417.32,2004.09),
+                                "b3" => array(0,0,1000.63,1417.32),
+                                "b4" => array(0,0,708.66,1000.63),
+                                "b5" => array(0,0,498.90,708.66),
+                                "b6" => array(0,0,354.33,498.90),
+                                "b7" => array(0,0,249.45,354.33),
+                                "b8" => array(0,0,175.75,249.45),
+                                "b9" => array(0,0,124.72,175.75),
+                                "b10" => array(0,0,87.87,124.72),
+                                "c0" => array(0,0,2599.37,3676.54),
+                                "c1" => array(0,0,1836.85,2599.37),
+                                "c2" => array(0,0,1298.27,1836.85),
+                                "c3" => array(0,0,918.43,1298.27),
+                                "c4" => array(0,0,649.13,918.43),
+                                "c5" => array(0,0,459.21,649.13),
+                                "c6" => array(0,0,323.15,459.21),
+                                "c7" => array(0,0,229.61,323.15),
+                                "c8" => array(0,0,161.57,229.61),
+                                "c9" => array(0,0,113.39,161.57),
+                                "c10" => array(0,0,79.37,113.39),
+                                "ra0" => array(0,0,2437.80,3458.27),
+                                "ra1" => array(0,0,1729.13,2437.80),
+                                "ra2" => array(0,0,1218.90,1729.13),
+                                "ra3" => array(0,0,864.57,1218.90),
+                                "ra4" => array(0,0,609.45,864.57),
+                                "sra0" => array(0,0,2551.18,3628.35),
+                                "sra1" => array(0,0,1814.17,2551.18),
+                                "sra2" => array(0,0,1275.59,1814.17),
+                                "sra3" => array(0,0,907.09,1275.59),
+                                "sra4" => array(0,0,637.80,907.09),
+                                "letter" => array(0,0,612.00,792.00),
+                                "legal" => array(0,0,612.00,1008.00),
+                                "ledger" => array(0,0,1224.00, 792.00),
+                                "tabloid" => array(0,0,792.00, 1224.00),
+                                "executive" => array(0,0,521.86,756.00),
+                                "folio" => array(0,0,612.00,936.00),
+                                "commerical #10 envelope" => array(0,0,684,297),
+                                "catalog #10 1/2 envelope" => array(0,0,648,864),
+                                "8.5x11" => array(0,0,612.00,792.00),
+                                "8.5x14" => array(0,0,612.00,1008.0),
+                                "11x17"  => array(0,0,792.00, 1224.00));
+
+
+    /**
+     * Instance of Cpdf class
+     *
+     * @var Cpdf
+     */
+    private $_pdf;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var float;
+     */
+    private $_height;
+
+    /**
+     * 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;
+
+    /**
+     * Array of temporary cached images to be deleted when processing is complete
+     *
+     * @var array
+     */
+    private $_image_cache;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
-   * @param string $orientation The orienation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
+     * @param string $orientation The orienation 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->_pdf = new Cpdf($size, DOMPDF_UNICODE_ENABLED, DOMPDF_FONT_CACHE, DOMPDF_TEMP_DIR);
@@ -219,8 +219,8 @@ 
 
     // Silence pedantic warnings about missing TZ settings
     $time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
-	$this->_pdf->addInfo("CreationDate", "D:".$time);
-	$this->_pdf->addInfo("ModDate", "D:".$time);
+    $this->_pdf->addInfo("CreationDate", "D:".$time);
+    $this->_pdf->addInfo("ModDate", "D:".$time);
     
 
     $this->_width = $size[2] - $size[0];
@@ -233,253 +233,253 @@ 
     $this->_pages = array($this->_pdf->getFirstPageId());
 
     $this->_image_cache = array();
-  }
-
-  /**
-   * Class destructor
-   *
-   * Deletes all temporary image files
-   */
-  function __destruct() {
+    }
+
+    /**
+     * Class destructor
+     *
+     * Deletes all temporary image files
+     */
+    function __destruct() {
     foreach ($this->_image_cache as $img) {
-      //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[__destruct unlink '.$img.']';
+        if (!DEBUGKEEPTEMP)
         unlink($img);
     }
-  }
+    }
   
-  /**
-   * Returns the Cpdf instance
-   *
-   * @return Cpdf
-   */
-  function get_cpdf() { 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 Cpdf instance
+     *
+     * @return Cpdf
+     */
+    function get_cpdf() { 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->addInfo($label, $value);
-  }
-
-  /**
-   * Opens a new 'object'
-   *
-   * While an object is open, all drawing actions are recored in the object,
-   * as opposed to 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 CPDF_Adapter::close_object()
-   * @see CPDF_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    }
+
+    /**
+     * Opens a new 'object'
+     *
+     * While an object is open, all drawing actions are recored in the object,
+     * as opposed to 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 CPDF_Adapter::close_object()
+     * @see CPDF_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $ret = $this->_pdf->openObject();
     $this->_pdf->saveState();
     return $ret;
-  }
-
-  /**
-   * Reopens an existing 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   * @param int $object  the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopens an existing 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     * @param int $object  the ID of a previously opened object
+     */
+    function reopen_object($object) {
     $this->_pdf->reopenObject($object);
     $this->_pdf->saveState();
-  }
-
-  /**
-   * Closes the current 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Closes the current 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restoreState();
     $this->_pdf->closeObject();
-  }
-
-  /**
-   * Adds a specified 'object' to the document
-   *
-   * $object int specifying an object created with {@link
-   * CPDF_Adapter::open_object()}.  $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
-   *
-   * @see Cpdf::addObject()
-   *
-   * @param int $object
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds a specified 'object' to the document
+     *
+     * $object int specifying an object created with {@link
+     * CPDF_Adapter::open_object()}.  $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
+     *
+     * @see Cpdf::addObject()
+     *
+     * @param int $object
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
     $this->_pdf->addObject($object, $where);
-  }
-
-  /**
-   * Stops the specified 'object' 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 'object' 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) {
     $this->_pdf->stopObject($object);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function serialize_object($id) {
+    /**
+     * @access private
+     */
+    function serialize_object($id) {
     // Serialize the pdf object's current state for retrieval later
     return $this->_pdf->serializeObject($id);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function reopen_serialized_object($obj) {
+    /**
+     * @access private
+     */
+    function reopen_serialized_object($obj) {
     return $this->_pdf->restoreSerializedObject($obj);
-  }
+    }
     
-  //........................................................................
-
-  /**
-   * Returns the PDF's width in points
-   * @return float
-   */
-  function get_width() { return $this->_width; }
-
-  /**
-   * Returns the PDF's height in points
-   * @return float
-   */
-  function get_height() { return $this->_height; }
-
-  /**
-   * Returns the current page number
-   * @return int
-   */
-  function get_page_number() { return $this->_page_number; }
-
-  /**
-   * Returns the total number of pages in the document
-   * @return int
-   */
-  function get_page_count() { return $this->_page_count; }
-
-  /**
-   * Sets the current page number
-   *
-   * @param int $num
-   */
-  function set_page_number($num) { $this->_page_number = $num; }
-
-  /**
-   * Sets the page count
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {  $this->_page_count = $count; }
+    //........................................................................
+
+    /**
+     * Returns the PDF's width in points
+     * @return float
+     */
+    function get_width() { return $this->_width; }
+
+    /**
+     * Returns the PDF's height in points
+     * @return float
+     */
+    function get_height() { return $this->_height; }
+
+    /**
+     * Returns the current page number
+     * @return int
+     */
+    function get_page_number() { return $this->_page_number; }
+
+    /**
+     * Returns the total number of pages in the document
+     * @return int
+     */
+    function get_page_count() { return $this->_page_count; }
+
+    /**
+     * Sets the current page number
+     *
+     * @param int $num
+     */
+    function set_page_number($num) { $this->_page_number = $num; }
+
+    /**
+     * Sets the page count
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {  $this->_page_count = $count; }
     
-  /**
-   * Sets the stroke colour
-   *
-   * See {@link Style::set_colour()} for the format of the color array.
-   * @param array $color
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the stroke colour
+     *
+     * See {@link Style::set_colour()} for the format of the color array.
+     * @param array $color
+     */
+    protected function _set_stroke_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setStrokeColor($r, $g, $b);
-  }
+    }
   
-  /**
-   * Sets the fill colour
-   *
-   * See {@link Style::set_colour()} for the format of the colour array.
-   * @param array $color
-   */
-  protected function _set_fill_color($color) {
+    /**
+     * Sets the fill colour
+     *
+     * See {@link Style::set_colour()} for the format of the colour array.
+     * @param array $color
+     */
+    protected function _set_fill_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setColor($r, $g, $b);
-  }
-
-  /**
-   * Sets line transparency
-   * @see Cpdf::setLineTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_line_transparency($mode, $opacity) {
+    }
+
+    /**
+     * Sets line transparency
+     * @see Cpdf::setLineTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_line_transparency($mode, $opacity) {
     $this->_pdf->setLineTransparency($mode, $opacity);
-  }
+    }
   
-  /**
-   * Sets fill transparency
-   * @see Cpdf::setFillTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_fill_transparency($mode, $opacity) {
+    /**
+     * Sets fill transparency
+     * @see Cpdf::setFillTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_fill_transparency($mode, $opacity) {
     $this->_pdf->setFillTransparency($mode, $opacity);
-  }
-
-  /**
-   * Sets the line style
-   *
-   * @see Cpdf::setLineStyle()
-   *
-   * @param float width
-   * @param string cap
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    }
+
+    /**
+     * Sets the line style
+     *
+     * @see Cpdf::setLineStyle()
+     *
+     * @param float width
+     * @param string cap
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
     $this->_pdf->setLineStyle($width, $cap, $join, $dash);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
   
-  /**
-   * 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; }
 
-  // Canvas implementation
+    // Canvas implementation
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
                 $blend = "Normal", $opacity = 1.0) {
     //pre_r(compact("x1", "y1", "x2", "y2", "color", "width", "style"));
 
@@ -488,35 +488,35 @@ 
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->line($x1, $this->y($y1),
-                      $x2, $this->y($y2));
-  }
+                        $x2, $this->y($y2));
+    }
                               
-  //........................................................................
-
-  /**
-   * Convert a GIF image to a PNG image
-   *
-   * @return string The url of the newly converted image
-   */
-  protected function _convert_gif_to_png($image_url) {
+    //........................................................................
+
+    /**
+     * Convert a GIF image to a PNG image
+     *
+     * @return string The url of the newly converted image
+     */
+    protected function _convert_gif_to_png($image_url) {
     
     if ( !function_exists("imagecreatefromgif") ) {
-      throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
+        throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
     }
 
     $old_err = set_error_handler("record_warnings");
     $im = imagecreatefromgif($image_url);
 
     if ( $im ) {
-      imageinterlace($im, 0);
+        imageinterlace($im, 0);
 
-      $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
-      $this->_image_cache[] = $filename;
+        $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
+        $this->_image_cache[] = $filename;
 
-      imagepng($im, $filename);
+        imagepng($im, $filename);
 
     } else {
-      $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
 
     }
 
@@ -524,21 +524,21 @@ 
 
     return $filename;
     
-  }
+    }
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
-                     $blend = "Normal", $opacity = 1.0) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
+                        $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->rectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
+    function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_line_style(1, "square", "miter", array());
@@ -546,12 +546,12 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     $this->_pdf->filledRectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = array(),
-                   $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function polygon($points, $color, $width = null, $style = array(),
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -560,19 +560,19 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
     
     // Adjust y values
     for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+        $points[$i] = $this->y($points[$i]);
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null,
-                  $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null,
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -581,14 +581,14 @@ 
     $this->_set_fill_transparency($blend, $opacity);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
     if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
 
@@ -600,15 +600,15 @@ 
       //debugpng
       if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "png":
       //debugpng
       if (DEBUGPNG)  print '!!!png!!!';
 
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "gif":
       // Convert gifs to pngs
@@ -618,41 +618,41 @@ 
         //debugpng
         if (DEBUGPNG)  print '!!!gif addImagePng!!!';
 
-      	//If optimization to direct png creation from gd object is available,
+            //If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
+        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+             $this->_pdf->image_iscached($img_url) ) {
+            //If same image has occured already before, no need to load because
+            //duplicate will anyway be eliminated.
+            $img = null;
+        } else {
+            $img = @imagecreatefromgif($img_url);
+            if (!$img) {
+                return;
+            }
+            imageinterlace($img, 0);
+        }
+        $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+        } else {
         //debugpng
         if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        }
+        break;
 
     default:
       //debugpng
       if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+        break;
     }
     
     return;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0),
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0),
                 $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
 
     list($r, $g, $b) = $color;
@@ -693,142 +693,142 @@ 
     //print '<pre>['.$font.','.$size.','.$this->_pdf->getFontHeight($size).','.$this->_pdf->getFontDescender($size).','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][1].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontHeightOffset'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Ascender'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Descender'].']</pre>';
     //
     //$this->_pdf->addText($x, $this->y($y) - Font_Metrics::get_font_height($font, $size), $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
-	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
-  }
+    //$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
+    //$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
+    $this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function javascript($code) {
+    function javascript($code) {
     $this->_pdf->addJavascript($code);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    /**
+     * Add a 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->addDestination($anchorname,"Fit");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * 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->addInternalLink($name, $x, $y, $x + $width, $y + $height);
 
     } else {
-      $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
+        $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
     }
     
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $this->_pdf->selectFont($font);
     if (!DOMPDF_UNICODE_ENABLED) {
-    	$text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
+        $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
     }
     return $this->_pdf->getTextWidth($size, $text, $spacing);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
     $this->_pdf->selectFont($font);
     return $this->_pdf->getFontHeight($size);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  /**
-   * 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) {
+    /**
+     * 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) {
     $_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() {
     $this->_page_count++;
 
     $ret = $this->_pdf->newPage();
     $this->_pages[] = $ret;
     return $ret;
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  /**
-   * 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;
 
     $page_number = 1;
     $eval = null;
 
     foreach ($this->_pages as $pid) {
-      $this->reopen_object($pid);
+        $this->reopen_object($pid);
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
@@ -837,63 +837,63 @@ 
         $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
                             array($page_number, $this->_page_count), $text);
         $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            break;
           
         case "script":
           if (!$eval) {
             $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->close_object();
-      $page_number++;
+        $this->close_object();
+        $page_number++;
+    }
     }
-  }
   
-  /**
-   * 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) {
     // Add page text
     $this->_add_page_text();
     
     $options["Content-Disposition"] = $filename;
     $this->_pdf->stream($options);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Returns the PDF as a string
-   *
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PDF as a string
+     *
+     * @return string
+     */
+    function output($options = null) {
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
+        $debug = 1;
     else
-      $debug = 0;
+        $debug = 0;
     
     return $this->_pdf->output($debug);
     
-  }
+    }
   
-  //........................................................................
-
-  /**
-   * Returns logging messages generated by the Cpdf class
-   *
-   * @return string
-   */
-  function get_messages() { return $this->_pdf->messages; }
+    //........................................................................
+
+    /**
+     * Returns logging messages generated by the Cpdf class
+     *
+     * @return string
+     */
+    function get_messages() { return $this->_pdf->messages; }
   
 }

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

Doc Comments +3 added lines

@@ -190,6 +190,9 @@
     "yellowgreen" => "9ACD32",

   );

 

+  /**
+   * @param string $colour
+   */
   static function parse($colour) {

     if ( is_array($colour) )

       // Assume the array has the right format...

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

Doc Comments +4 added lines, -1 removed lines

@@ -117,7 +117,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   static function get_text_width($text, $font, $size, $spacing = 0) {
@@ -234,6 +234,9 @@ 
     return self::$_font_lookup;
   }
 
+  /**
+   * @param string $fontname
+   */
   static function set_font_family($fontname, $entry) {
     self::$_font_lookup[mb_strtolower($fontname)] = $entry;
   }

Spacing +14 added lines, -14 removed lines

@@ -46,7 +46,7 @@ 
 
 /* $Id: font_metrics.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . "/class.pdf.php");
+require_once(DOMPDF_LIB_DIR."/class.pdf.php");
 
 /**
  * Name of the font cache file
@@ -59,10 +59,10 @@ 
  *
  * Declared here because PHP5 prevents constants from being declared with expressions
  */
-if (file_exists(DOMPDF_FONT_DIR . "dompdf_font_family_cache")) {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache");
+if (file_exists(DOMPDF_FONT_DIR."dompdf_font_family_cache")) {
+	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR."dompdf_font_family_cache");
 } else {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache.dist");
+	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR."dompdf_font_family_cache.dist");
 }
 
 
@@ -157,11 +157,11 @@ 
      * Only on checking the fallback font, check various subtypes on same font.
      */
 
-    if ( $family ) {
-      $family = str_replace( array("'", '"'), "", mb_strtolower($family));
+    if ($family) {
+      $family = str_replace(array("'", '"'), "", mb_strtolower($family));
       $subtype = mb_strtolower($subtype);
 
-      if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+      if (isset(self::$_font_lookup[$family][$subtype])) {
         return self::$_font_lookup[$family][$subtype];
       }
       return null;
@@ -169,18 +169,18 @@ 
 
     $family = DOMPDF_DEFAULT_FONT;
 
-    if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+    if (isset(self::$_font_lookup[$family][$subtype])) {
       return self::$_font_lookup[$family][$subtype];
     }
 
-    foreach ( self::$_font_lookup[$family] as $sub => $font ) {
+    foreach (self::$_font_lookup[$family] as $sub => $font) {
       if (strpos($subtype, $sub) !== false) {
         return $font;
       }
     }
 
     if ($subtype !== "normal") {
-      foreach ( self::$_font_lookup[$family] as $sub => $font ) {
+      foreach (self::$_font_lookup[$family] as $sub => $font) {
         if ($sub !== "normal") {
           return $font;
         }
@@ -189,7 +189,7 @@ 
 
     $subtype = "normal";
 
-    if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+    if (isset(self::$_font_lookup[$family][$subtype])) {
       return self::$_font_lookup[$family][$subtype];
     }
     return null;
@@ -216,13 +216,13 @@ 
    * @see save_font_families()
    */
   static function load_font_families() {
-    if ( !is_readable(self::CACHE_FILE) )
+    if (!is_readable(self::CACHE_FILE))
       return;
 
     $data = file_get_contents(self::CACHE_FILE);
 
-    if ( $data != "" )
-      eval ('self::$_font_lookup = ' . $data . ";");
+    if ($data != "")
+      eval ('self::$_font_lookup = '.$data.";");
   }
 
   /**

Braces +6 added lines, -4 removed lines

@@ -216,13 +216,15 @@
    * @see save_font_families()
    */
   static function load_font_families() {
-    if ( !is_readable(self::CACHE_FILE) )
-      return;
+    if ( !is_readable(self::CACHE_FILE) ) {
+          return;
+    }
 
     $data = file_get_contents(self::CACHE_FILE);
 
-    if ( $data != "" )
-      eval ('self::$_font_lookup = ' . $data . ";");
+    if ( $data != "" ) {
+          eval ('self::$_font_lookup = ' . $data . ";");
+    }
   }
 
   /**

Indentation +110 added lines, -110 removed lines

@@ -60,9 +60,9 @@ 
  * Declared here because PHP5 prevents constants from being declared with expressions
  */
 if (file_exists(DOMPDF_FONT_DIR . "dompdf_font_family_cache")) {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache");
+    define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache");
 } else {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache.dist");
+    define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache.dist");
 }
 
 
@@ -78,76 +78,76 @@ 
  */
 class Font_Metrics {
 
-  /**
-   * @see __DOMPDF_FONT_CACHE_FILE
-   */
-  const CACHE_FILE = __DOMPDF_FONT_CACHE_FILE;
+    /**
+     * @see __DOMPDF_FONT_CACHE_FILE
+     */
+    const CACHE_FILE = __DOMPDF_FONT_CACHE_FILE;
   
-  /**
-   * Underlying {@link Cpdf} object to perform text size calculations
-   *
-   * @var Cpdf
-   */
-  static protected $_pdf = null;
-
-  /**
-   * Array of font family names to font files
-   *
-   * Usually cached by the {@link load_font.php} script
-   *
-   * @var array
-   */
-  static protected $_font_lookup = array();
+    /**
+     * Underlying {@link Cpdf} object to perform text size calculations
+     *
+     * @var Cpdf
+     */
+    static protected $_pdf = null;
+
+    /**
+     * Array of font family names to font files
+     *
+     * Usually cached by the {@link load_font.php} script
+     *
+     * @var array
+     */
+    static protected $_font_lookup = array();
   
   
-  /**
-   * Class initialization
-   *
-   */
-  static function init() {
+    /**
+     * Class initialization
+     *
+     */
+    static function init() {
     if (!self::$_pdf) {
-      self::load_font_families();
-      self::$_pdf = Canvas_Factory::get_instance();
+        self::load_font_families();
+        self::$_pdf = Canvas_Factory::get_instance();
     }
-  }
-
-  /**
-   * 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
-   */
-  static 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
+     */
+    static function get_text_width($text, $font, $size, $spacing = 0) {
     return self::$_pdf->get_text_width($text, $font, $size, $spacing);
-  }
-
-  /**
-   * Calculates font height
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  static function get_font_height($font, $size) {
+    }
+
+    /**
+     * Calculates font height
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    static function get_font_height($font, $size) {
     return self::$_pdf->get_font_height($font, $size);
-  }
-
-  /**
-   * Resolves a font family & subtype into an actual font file
-   *
-   * Subtype can be one of 'normal', 'bold', 'italic' or 'bold_italic'.  If
-   * the particular font family has no suitable font file, the default font
-   * ({@link DOMPDF_DEFAULT_FONT}) is used.  The font file returned
-   * is the absolute pathname to the font file on the system.
-   *
-   * @param string $family
-   * @param string $subtype
-   * @return string
-   */
-  static function get_font($family, $subtype = "normal") {
+    }
+
+    /**
+     * Resolves a font family & subtype into an actual font file
+     *
+     * Subtype can be one of 'normal', 'bold', 'italic' or 'bold_italic'.  If
+     * the particular font family has no suitable font file, the default font
+     * ({@link DOMPDF_DEFAULT_FONT}) is used.  The font file returned
+     * is the absolute pathname to the font file on the system.
+     *
+     * @param string $family
+     * @param string $subtype
+     * @return string
+     */
+    static function get_font($family, $subtype = "normal") {
 
     /* Allow calling for various fonts in search path. Therefore not immediately
      * return replacement on non match.
@@ -158,85 +158,85 @@ 
      */
 
     if ( $family ) {
-      $family = str_replace( array("'", '"'), "", mb_strtolower($family));
-      $subtype = mb_strtolower($subtype);
+        $family = str_replace( array("'", '"'), "", mb_strtolower($family));
+        $subtype = mb_strtolower($subtype);
 
-      if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+        if ( isset(self::$_font_lookup[$family][$subtype]) ) {
         return self::$_font_lookup[$family][$subtype];
-      }
-      return null;
+        }
+        return null;
     }
 
     $family = DOMPDF_DEFAULT_FONT;
 
     if ( isset(self::$_font_lookup[$family][$subtype]) ) {
-      return self::$_font_lookup[$family][$subtype];
+        return self::$_font_lookup[$family][$subtype];
     }
 
     foreach ( self::$_font_lookup[$family] as $sub => $font ) {
-      if (strpos($subtype, $sub) !== false) {
+        if (strpos($subtype, $sub) !== false) {
         return $font;
-      }
+        }
     }
 
     if ($subtype !== "normal") {
-      foreach ( self::$_font_lookup[$family] as $sub => $font ) {
+        foreach ( self::$_font_lookup[$family] as $sub => $font ) {
         if ($sub !== "normal") {
-          return $font;
+            return $font;
+        }
         }
-      }
     }
 
     $subtype = "normal";
 
     if ( isset(self::$_font_lookup[$family][$subtype]) ) {
-      return self::$_font_lookup[$family][$subtype];
+        return self::$_font_lookup[$family][$subtype];
     }
     return null;
-  }
-
-  /**
-   * Saves the stored font family cache
-   *
-   * The name and location of the cache file are determined by {@link
-   * Font_Metrics::CACHE_FILE}.  This file should be writable by the
-   * webserver process.
-   *
-   * @see Font_Metrics::load_font_families()
-   */
-  static function save_font_families() {
+    }
+
+    /**
+     * Saves the stored font family cache
+     *
+     * The name and location of the cache file are determined by {@link
+     * Font_Metrics::CACHE_FILE}.  This file should be writable by the
+     * webserver process.
+     *
+     * @see Font_Metrics::load_font_families()
+     */
+    static function save_font_families() {
 
     file_put_contents(self::CACHE_FILE, var_export(self::$_font_lookup, true));
     
-  }
-
-  /**
-   * Loads the stored font family cache
-   *
-   * @see save_font_families()
-   */
-  static function load_font_families() {
+    }
+
+    /**
+     * Loads the stored font family cache
+     *
+     * @see save_font_families()
+     */
+    static function load_font_families() {
     if ( !is_readable(self::CACHE_FILE) )
-      return;
+        return;
 
     $data = file_get_contents(self::CACHE_FILE);
 
     if ( $data != "" )
-      eval ('self::$_font_lookup = ' . $data . ";");
-  }
-
-  /**
-   * Returns the current font lookup table
-   *
-   * @return array
-   */
-  static function get_font_families() {
+        eval ('self::$_font_lookup = ' . $data . ";");
+    }
+
+    /**
+     * Returns the current font lookup table
+     *
+     * @return array
+     */
+    static function get_font_families() {
     return self::$_font_lookup;
-  }
+    }
 
-  static function set_font_family($fontname, $entry) {
+    static function set_font_family($fontname, $entry) {
     self::$_font_lookup[mb_strtolower($fontname)] = $entry;
-  }
+    }
 }
 
 Font_Metrics::init();

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

Doc Comments +3 added lines

@@ -662,6 +662,9 @@
 class FrameList implements IteratorAggregate {
   protected $_frame;
 
+  /**
+   * @param Frame $frame
+   */
   function __construct($frame) { $this->_frame = $frame; }
   function getIterator() { return new FrameListIterator($this->_frame); }
 }

Spacing +77 added lines, -77 removed lines

@@ -171,7 +171,7 @@ 
 
     $this->_decorator = null;
 
-    $this->set_id( self::$ID_COUNTER++ );
+    $this->set_id(self::$ID_COUNTER++);
   }
 
   /**
@@ -181,29 +181,29 @@ 
    */
   function dispose($recursive = false) {
 
-    if ( $recursive ) {
-      while ( $child = $this->_first_child )
+    if ($recursive) {
+      while ($child = $this->_first_child)
         $child->dispose(true);
     }
 
     // Remove this frame from the tree
-    if ( $this->_prev_sibling ) {
+    if ($this->_prev_sibling) {
       $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
     }
 
-    if ( $this->_next_sibling ) {
+    if ($this->_next_sibling) {
       $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
     }
 
-    if ( $this->_parent && $this->_parent->_first_child === $this ) {
+    if ($this->_parent && $this->_parent->_first_child === $this) {
       $this->_parent->_first_child = $this->_next_sibling;
     }
 
-    if ( $this->_parent && $this->_parent->_last_child === $this ) {
+    if ($this->_parent && $this->_parent->_last_child === $this) {
       $this->_parent->_last_child = $this->_prev_sibling;
     }
 
-    if ( $this->_parent ) {
+    if ($this->_parent) {
       $this->_parent->get_node()->removeChild($this->_node);
     }
 
@@ -246,13 +246,13 @@ 
   
   // Layout property accessors
   function get_containing_block($i = null) {
-    if ( isset($i) )
+    if (isset($i))
       return $this->_containing_block[$i];    
     return $this->_containing_block;
   }
   
   function get_position($i = null) {
-    if ( isset($i) )
+    if (isset($i))
       return $this->_position[$i];
     return array($this->_position["x"],
                  $this->_position["y"],
@@ -354,12 +354,12 @@ 
     // We can only set attributes of DOMElement objects (nodeType == 1).
     // Since these are the only objects that we can assign CSS rules to,
     // this shortcoming is okay.
-    if ( $this->_node->nodeType == 1)
+    if ($this->_node->nodeType == 1)
       $this->_node->setAttribute("frame_id", $id);
   }
 
   function set_style(Style $style) {
-    if ( is_null($this->_style) )
+    if (is_null($this->_style))
       $this->_original_style = clone $style;
     
     $this->_style = $style;
@@ -370,8 +370,8 @@ 
   }
   
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    if ( is_array($x) ){
-  		foreach($x AS $key => $val){
+    if (is_array($x)) {
+  		foreach ($x AS $key => $val) {
 			$$key = $val;
 		}
     }
@@ -399,15 +399,15 @@ 
   }
 
   function set_position($x = null, $y = null) {
-    if ( is_array($x) )
+    if (is_array($x))
       extract($x);
     
-    if ( is_numeric($x) ) {
+    if (is_numeric($x)) {
       $this->_position[0] = $x;
       $this->_position["x"] = $x;
     }
 
-    if ( is_numeric($y) ) {
+    if (is_numeric($y)) {
       $this->_position[1] = $y;
       $this->_position["y"] = $y;
     }
@@ -417,18 +417,18 @@ 
 
   function prepend_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
+    if ($update_node) 
       $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
 
     // Remove the child from its parent
-    if ( $child->_parent )
+    if ($child->_parent)
       $child->_parent->remove_child($child, false);
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
     
     // Handle the first child
-    if ( !$this->_first_child ) {
+    if (!$this->_first_child) {
       $this->_first_child = $child;
       $this->_last_child = $child;
       $child->_next_sibling = null;
@@ -444,18 +444,18 @@ 
   
   function append_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
+    if ($update_node) 
       $this->_node->appendChild($child->_node);
 
     // Remove the child from its parent
-    if ( $child->_parent )
+    if ($child->_parent)
       $child->_parent->remove_child($child, false);
 
     $child->_parent = $this;
     $child->_next_sibling = null;
     
     // Handle the first child
-    if ( !$this->_last_child ) {
+    if (!$this->_last_child) {
       $this->_first_child = $child;
       $this->_last_child = $child;
       $child->_prev_sibling = null;
@@ -472,32 +472,32 @@ 
   // Inserts a new child immediately before the specified frame
   function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
 
-    if ( $ref === $this->_first_child ) {
+    if ($ref === $this->_first_child) {
       $this->prepend_child($new_child, $update_node);
       return;
     }
 
-    if ( is_null($ref) ) {
+    if (is_null($ref)) {
       $this->append_child($new_child, $update_node);
       return;
     }
     
-    if ( $ref->_parent !== $this )
+    if ($ref->_parent !== $this)
       throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node    
-    if ( $update_node )
+    if ($update_node)
       $this->_node->insertBefore($new_child->_node, $ref->_node);
 
     // Remove the child from its parent
-    if ( $new_child->_parent )
+    if ($new_child->_parent)
       $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_next_sibling = $ref;
     $new_child->_prev_sibling = $ref->_prev_sibling;
 
-    if ( $ref->_prev_sibling )
+    if ($ref->_prev_sibling)
       $ref->_prev_sibling->_next_sibling = $new_child;
     
     $ref->_prev_sibling = $new_child;
@@ -506,22 +506,22 @@ 
   // Inserts a new child immediately after the specified frame
   function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
 
-    if ( $ref === $this->_last_child ) {
+    if ($ref === $this->_last_child) {
       $this->append_child($new_child, $update_node);
       return;
     }
 
-    if ( is_null($ref) ) {
+    if (is_null($ref)) {
       $this->prepend_child($new_child, $update_node);
       return;
     }
     
-    if ( $ref->_parent !== $this )
+    if ($ref->_parent !== $this)
       throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node
-    if ( $update_node ) {
-      if ( $ref->_next_sibling ) {
+    if ($update_node) {
+      if ($ref->_next_sibling) {
         $next_node = $ref->_next_sibling->_node;
         $this->_node->insertBefore($new_child->_node, $next_node);
       } else {
@@ -530,14 +530,14 @@ 
     }
     
     // Remove the child from its parent
-    if ( $new_child->_parent)
+    if ($new_child->_parent)
       $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_prev_sibling = $ref;
     $new_child->_next_sibling = $ref->_next_sibling;
 
-    if ( $ref->_next_sibling ) 
+    if ($ref->_next_sibling) 
       $ref->_next_sibling->_prev_sibling = $new_child;
 
     $ref->_next_sibling = $new_child;
@@ -546,22 +546,22 @@ 
 
   function remove_child(Frame $child, $update_node = true) {
 
-    if ( $child->_parent !== $this )
+    if ($child->_parent !== $this)
       throw new DOMPDF_Exception("Child not found in this frame");
 
-    if ( $update_node )
+    if ($update_node)
       $this->_node->removeChild($child->_node);
     
-    if ( $child === $this->_first_child )
+    if ($child === $this->_first_child)
       $this->_first_child = $child->_next_sibling;
 
-    if ( $child === $this->_last_child )
+    if ($child === $this->_last_child)
       $this->_last_child = $child->_prev_sibling;
 
-    if ( $child->_prev_sibling )
+    if ($child->_prev_sibling)
       $child->_prev_sibling->_next_sibling = $child->_next_sibling;
 
-    if ( $child->_next_sibling )
+    if ($child->_next_sibling)
       $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
 
     $child->_next_sibling = null;
@@ -582,68 +582,68 @@ 
 //       return "";
     
     
-    $str = "<b>" . $this->_node->nodeName . ":</b><br/>";
+    $str = "<b>".$this->_node->nodeName.":</b><br/>";
     //$str .= spl_object_hash($this->_node) . "<br/>";
-    $str .= "Id: " .$this->get_id() . "<br/>";
-    $str .= "Class: " .get_class($this) . "<br/>";
+    $str .= "Id: ".$this->get_id()."<br/>";
+    $str .= "Class: ".get_class($this)."<br/>";
     
-    if ( $this->_node->nodeName === "#text" ) {
+    if ($this->_node->nodeName === "#text") {
       $tmp = htmlspecialchars($this->_node->nodeValue);
-      $str .= "<pre>'" .  mb_substr($tmp,0,70) .
-        (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
+      $str .= "<pre>'".mb_substr($tmp, 0, 70).
+        (mb_strlen($tmp) > 70 ? "..." : "")."'</pre>";
     }
-    if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
-        " (" . spl_object_hash($this->_parent->_node) . ") " .
+    if ($this->_parent)
+      $str .= "\nParent:".$this->_parent->_node->nodeName.
+        " (".spl_object_hash($this->_parent->_node).") ".
         "<br/>";
 
-    if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
-        " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
+    if ($this->_prev_sibling)
+      $str .= "Prev: ".$this->_prev_sibling->_node->nodeName.
+        " (".spl_object_hash($this->_prev_sibling->_node).") ".
         "<br/>";
 
-    if ( $this->_next_sibling )
-      $str .= "Next: " . $this->_next_sibling->_node->nodeName .
-        " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
+    if ($this->_next_sibling)
+      $str .= "Next: ".$this->_next_sibling->_node->nodeName.
+        " (".spl_object_hash($this->_next_sibling->_node).") ".
         "<br/>";
 
     $d = $this->get_decorator();
     while ($d && $d != $d->get_decorator()) {
-      $str .= "Decorator: " . get_class($d) . "<br/>";
+      $str .= "Decorator: ".get_class($d)."<br/>";
       $d = $d->get_decorator();
     }
 
-    $str .= "Position: " . pre_r($this->_position, true);
-    $str .= "\nContaining block: " . pre_r($this->_containing_block, true);
-    $str .= "\nMargin width: " . pre_r($this->get_margin_width(), true);
-    $str .= "\nMargin height: " . pre_r($this->get_margin_height(), true);
+    $str .= "Position: ".pre_r($this->_position, true);
+    $str .= "\nContaining block: ".pre_r($this->_containing_block, true);
+    $str .= "\nMargin width: ".pre_r($this->get_margin_width(), true);
+    $str .= "\nMargin height: ".pre_r($this->get_margin_height(), true);
     
-    $str .= "\nStyle: <pre>". $this->_style->__toString() . "</pre>";
+    $str .= "\nStyle: <pre>".$this->_style->__toString()."</pre>";
 
-    if ( $this->_decorator instanceof Block_Frame_Decorator ) {
+    if ($this->_decorator instanceof Block_Frame_Decorator) {
       $str .= "Lines:<pre>";
       foreach ($this->_decorator->get_lines() as $line) {
         foreach ($line["frames"] as $frame) {
           if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
-            $str .= "'". htmlspecialchars($frame->get_text()) ."'";
+            $str .= "'".htmlspecialchars($frame->get_text())."'";
           } else {
-            $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
+            $str .= "\nBlock: ".$frame->get_node()->nodeName." (".spl_object_hash($frame->get_node()).")";
           }
         }
         
         $str .=
           //"\ncount => " . $line["count"] . "\n".
-          "\ny => " . $line["y"] . "\n" .
-          "w => " . $line["w"] . "\n" .
-          "h => " . $line["h"] . "\n";
+          "\ny => ".$line["y"]."\n".
+          "w => ".$line["w"]."\n".
+          "h => ".$line["h"]."\n";
       }
       $str .= "</pre>";
     }
     $str .= "\n";
-    if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
-                                    array("\n","",""),
+    if (php_sapi_name() === "cli")
+      $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"),
+                                    array("\n", "", ""),
                                     $str));
     
     return $str;
@@ -693,7 +693,7 @@ 
   }
 
   function valid() {
-    return isset($this->_cur);// && ($this->_cur->get_prev_sibling() === $this->_prev);
+    return isset($this->_cur); // && ($this->_cur->get_prev_sibling() === $this->_prev);
   }
   function key() { return $this->_num; }
   function current() { return $this->_cur; }
@@ -701,7 +701,7 @@ 
   function next() {
 
     $ret = $this->_cur;
-    if ( !$ret )
+    if (!$ret)
       return null;
     
     $this->_cur = $this->_cur->get_next_sibling();
@@ -758,13 +758,13 @@ 
     $b = end($this->_stack);
     
     // Pop last element
-    unset($this->_stack[ key($this->_stack) ]);
+    unset($this->_stack[key($this->_stack)]);
     $this->_num++;
     
     // Push all children onto the stack in reverse order
-    if ( $c = $b->get_last_child() ) {
+    if ($c = $b->get_last_child()) {
       $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
+      while ($c = $c->get_prev_sibling())
         $this->_stack[] = $c;
     }
     return $b;

Braces +87 added lines, -58 removed lines

@@ -182,8 +182,9 @@ 
   function dispose($recursive = false) {
 
     if ( $recursive ) {
-      while ( $child = $this->_first_child )
-        $child->dispose(true);
+      while ( $child = $this->_first_child ) {
+              $child->dispose(true);
+      }
     }
 
     // Remove this frame from the tree
@@ -246,14 +247,16 @@ 
   
   // Layout property accessors
   function get_containing_block($i = null) {
-    if ( isset($i) )
-      return $this->_containing_block[$i];    
+    if ( isset($i) ) {
+          return $this->_containing_block[$i];
+    }
     return $this->_containing_block;
   }
   
   function get_position($i = null) {
-    if ( isset($i) )
-      return $this->_position[$i];
+    if ( isset($i) ) {
+          return $this->_position[$i];
+    }
     return array($this->_position["x"],
                  $this->_position["y"],
                  "x"=>$this->_position["x"],
@@ -354,13 +357,15 @@ 
     // We can only set attributes of DOMElement objects (nodeType == 1).
     // Since these are the only objects that we can assign CSS rules to,
     // this shortcoming is okay.
-    if ( $this->_node->nodeType == 1)
-      $this->_node->setAttribute("frame_id", $id);
+    if ( $this->_node->nodeType == 1) {
+          $this->_node->setAttribute("frame_id", $id);
+    }
   }
 
   function set_style(Style $style) {
-    if ( is_null($this->_style) )
-      $this->_original_style = clone $style;
+    if ( is_null($this->_style) ) {
+          $this->_original_style = clone $style;
+    }
     
     $this->_style = $style;
   }
@@ -399,8 +404,9 @@ 
   }
 
   function set_position($x = null, $y = null) {
-    if ( is_array($x) )
-      extract($x);
+    if ( is_array($x) ) {
+          extract($x);
+    }
     
     if ( is_numeric($x) ) {
       $this->_position[0] = $x;
@@ -417,12 +423,14 @@ 
 
   function prepend_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
-      $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+    if ( $update_node ) {
+          $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+    }
 
     // Remove the child from its parent
-    if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+    if ( $child->_parent ) {
+          $child->_parent->remove_child($child, false);
+    }
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
@@ -444,12 +452,14 @@ 
   
   function append_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
-      $this->_node->appendChild($child->_node);
+    if ( $update_node ) {
+          $this->_node->appendChild($child->_node);
+    }
 
     // Remove the child from its parent
-    if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+    if ( $child->_parent ) {
+          $child->_parent->remove_child($child, false);
+    }
 
     $child->_parent = $this;
     $child->_next_sibling = null;
@@ -482,23 +492,27 @@ 
       return;
     }
     
-    if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    if ( $ref->_parent !== $this ) {
+          throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    }
 
     // Update the node    
-    if ( $update_node )
-      $this->_node->insertBefore($new_child->_node, $ref->_node);
+    if ( $update_node ) {
+          $this->_node->insertBefore($new_child->_node, $ref->_node);
+    }
 
     // Remove the child from its parent
-    if ( $new_child->_parent )
-      $new_child->_parent->remove_child($new_child, false);
+    if ( $new_child->_parent ) {
+          $new_child->_parent->remove_child($new_child, false);
+    }
     
     $new_child->_parent = $this;
     $new_child->_next_sibling = $ref;
     $new_child->_prev_sibling = $ref->_prev_sibling;
 
-    if ( $ref->_prev_sibling )
-      $ref->_prev_sibling->_next_sibling = $new_child;
+    if ( $ref->_prev_sibling ) {
+          $ref->_prev_sibling->_next_sibling = $new_child;
+    }
     
     $ref->_prev_sibling = $new_child;
   }
@@ -516,8 +530,9 @@ 
       return;
     }
     
-    if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    if ( $ref->_parent !== $this ) {
+          throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    }
 
     // Update the node
     if ( $update_node ) {
@@ -530,15 +545,17 @@ 
     }
     
     // Remove the child from its parent
-    if ( $new_child->_parent)
-      $new_child->_parent->remove_child($new_child, false);
+    if ( $new_child->_parent) {
+          $new_child->_parent->remove_child($new_child, false);
+    }
     
     $new_child->_parent = $this;
     $new_child->_prev_sibling = $ref;
     $new_child->_next_sibling = $ref->_next_sibling;
 
-    if ( $ref->_next_sibling ) 
-      $ref->_next_sibling->_prev_sibling = $new_child;
+    if ( $ref->_next_sibling ) {
+          $ref->_next_sibling->_prev_sibling = $new_child;
+    }
 
     $ref->_next_sibling = $new_child;
   }
@@ -546,23 +563,29 @@ 
 
   function remove_child(Frame $child, $update_node = true) {
 
-    if ( $child->_parent !== $this )
-      throw new DOMPDF_Exception("Child not found in this frame");
+    if ( $child->_parent !== $this ) {
+          throw new DOMPDF_Exception("Child not found in this frame");
+    }
 
-    if ( $update_node )
-      $this->_node->removeChild($child->_node);
+    if ( $update_node ) {
+          $this->_node->removeChild($child->_node);
+    }
     
-    if ( $child === $this->_first_child )
-      $this->_first_child = $child->_next_sibling;
+    if ( $child === $this->_first_child ) {
+          $this->_first_child = $child->_next_sibling;
+    }
 
-    if ( $child === $this->_last_child )
-      $this->_last_child = $child->_prev_sibling;
+    if ( $child === $this->_last_child ) {
+          $this->_last_child = $child->_prev_sibling;
+    }
 
-    if ( $child->_prev_sibling )
-      $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+    if ( $child->_prev_sibling ) {
+          $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+    }
 
-    if ( $child->_next_sibling )
-      $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
+    if ( $child->_next_sibling ) {
+          $child->_next_sibling->_prev_sibling = $child->_prev_sibling;
+    }
 
     $child->_next_sibling = null;
     $child->_prev_sibling = null;
@@ -592,20 +615,23 @@ 
       $str .= "<pre>'" .  mb_substr($tmp,0,70) .
         (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
     }
-    if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
+    if ( $this->_parent ) {
+          $str .= "\nParent:" . $this->_parent->_node->nodeName .
         " (" . spl_object_hash($this->_parent->_node) . ") " .
         "<br/>";
+    }
 
-    if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
+    if ( $this->_prev_sibling ) {
+          $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
         "<br/>";
+    }
 
-    if ( $this->_next_sibling )
-      $str .= "Next: " . $this->_next_sibling->_node->nodeName .
+    if ( $this->_next_sibling ) {
+          $str .= "Next: " . $this->_next_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
         "<br/>";
+    }
 
     $d = $this->get_decorator();
     while ($d && $d != $d->get_decorator()) {
@@ -641,10 +667,11 @@ 
       $str .= "</pre>";
     }
     $str .= "\n";
-    if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+    if ( php_sapi_name() === "cli" ) {
+          $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n","",""),
                                     $str));
+    }
     
     return $str;
   }
@@ -701,8 +728,9 @@ 
   function next() {
 
     $ret = $this->_cur;
-    if ( !$ret )
-      return null;
+    if ( !$ret ) {
+          return null;
+    }
     
     $this->_cur = $this->_cur->get_next_sibling();
     $this->_num++;
@@ -764,8 +792,9 @@ 
     // Push all children onto the stack in reverse order
     if ( $c = $b->get_last_child() ) {
       $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
-        $this->_stack[] = $c;
+      while ( $c = $c->get_prev_sibling() ) {
+              $this->_stack[] = $c;
+      }
     }
     return $b;
   }

Indentation +378 added lines, -379 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: frame.cls.php,v $
- * Created on: 2004-06-02
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: frame.cls.php,v $
+     * Created on: 2004-06-02
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: frame.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -53,105 +52,105 @@ 
  */
 class Frame {
   
-  /**
-   * The DOMNode object this frame represents
-   *
-   * @var DOMNode
-   */
-  protected $_node;
-
-  /**
-   * Unique identifier for this frame.  Used to reference this frame
-   * via the node.
-   *
-   * @var string
-   */
-  protected $_id;
-
-  /**
-   * Unique id counter
-   */
-  static protected $ID_COUNTER = 0;
+    /**
+     * The DOMNode object this frame represents
+     *
+     * @var DOMNode
+     */
+    protected $_node;
+
+    /**
+     * Unique identifier for this frame.  Used to reference this frame
+     * via the node.
+     *
+     * @var string
+     */
+    protected $_id;
+
+    /**
+     * Unique id counter
+     */
+    static protected $ID_COUNTER = 0;
   
-  /**
-   * This frame's calculated style
-   *
-   * @var Style
-   */
-  protected $_style;
-
-  /**
-   * This frame's original style.  Needed for cases where frames are
-   * split across pages.
-   *
-   * @var Style
-   */
-  protected $_original_style;
+    /**
+     * This frame's calculated style
+     *
+     * @var Style
+     */
+    protected $_style;
+
+    /**
+     * This frame's original style.  Needed for cases where frames are
+     * split across pages.
+     *
+     * @var Style
+     */
+    protected $_original_style;
   
-  /**
-   * This frame's parent in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_parent;
-
-  /**
-   * This frame's first child.  All children are handled as a
-   * doubly-linked list.
-   *
-   * @var Frame
-   */
-  protected $_first_child;
-
-  /**
-   * This frame's last child.
-   *
-   * @var Frame
-   */
-  protected $_last_child;
-
-  /**
-   * This frame's previous sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_prev_sibling;
-
-  /**
-   * This frame's next sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_next_sibling;
+    /**
+     * This frame's parent in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_parent;
+
+    /**
+     * This frame's first child.  All children are handled as a
+     * doubly-linked list.
+     *
+     * @var Frame
+     */
+    protected $_first_child;
+
+    /**
+     * This frame's last child.
+     *
+     * @var Frame
+     */
+    protected $_last_child;
+
+    /**
+     * This frame's previous sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_prev_sibling;
+
+    /**
+     * This frame's next sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_next_sibling;
   
-  /**
-   * This frame's containing block (used in layout): array(x, y, w, h)
-   *
-   * @var array
-   */
-  protected $_containing_block;
-
-  /**
-   * Position on the page of the top-left corner of the margin box of
-   * this frame: array(x,y)
-   *
-   * @var array
-   */
-  protected $_position;
-
-  /**
-   * This frame's decorator
-   *
-   * @var Frame_Decorator
-   */
-  protected $_decorator;
-    
-  /**
-   * Class constructor
-   *
-   * @param DOMNode $node the DOMNode this frame represents
-   */
-  function __construct(DomNode $node) {
+    /**
+     * This frame's containing block (used in layout): array(x, y, w, h)
+     *
+     * @var array
+     */
+    protected $_containing_block;
+
+    /**
+     * Position on the page of the top-left corner of the margin box of
+     * this frame: array(x,y)
+     *
+     * @var array
+     */
+    protected $_position;
+
+    /**
+     * This frame's decorator
+     *
+     * @var Frame_Decorator
+     */
+    protected $_decorator;
+    
+    /**
+     * Class constructor
+     *
+     * @param DOMNode $node the DOMNode this frame represents
+     */
+    function __construct(DomNode $node) {
     $this->_node = $node;
       
     $this->_parent = null;
@@ -163,48 +162,48 @@ 
     $this->_original_style = null;
     
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
 
     $this->_decorator = null;
 
     $this->set_id( self::$ID_COUNTER++ );
-  }
+    }
 
-  /**
-   * "Destructor": forcibly free all references held by this frame
-   *
-   * @param bool $recursive if true, call dispose on all children
-   */
-  function dispose($recursive = false) {
+    /**
+     * "Destructor": forcibly free all references held by this frame
+     *
+     * @param bool $recursive if true, call dispose on all children
+     */
+    function dispose($recursive = false) {
 
     if ( $recursive ) {
-      while ( $child = $this->_first_child )
+        while ( $child = $this->_first_child )
         $child->dispose(true);
     }
 
     // Remove this frame from the tree
     if ( $this->_prev_sibling ) {
-      $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
+        $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
     }
 
     if ( $this->_next_sibling ) {
-      $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
+        $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_first_child === $this ) {
-      $this->_parent->_first_child = $this->_next_sibling;
+        $this->_parent->_first_child = $this->_next_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_last_child === $this ) {
-      $this->_parent->_last_child = $this->_prev_sibling;
+        $this->_parent->_last_child = $this->_prev_sibling;
     }
 
     if ( $this->_parent ) {
-      $this->_parent->get_node()->removeChild($this->_node);
+        $this->_parent->get_node()->removeChild($this->_node);
     }
 
     $this->_style->dispose();
@@ -212,369 +211,369 @@ 
     $this->_original_style->dispose();
     unset($this->_original_style);
     
-  }
+    }
 
-  // Re-initialize the frame
-  function reset() {
+    // Re-initialize the frame
+    function reset() {
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
 
     unset($this->_style);    
     $this->_style = clone $this->_original_style;
     
-  }
+    }
   
-  //........................................................................
-
-  // Accessor methods
-  function get_node() { return $this->_node; }
-  function get_id() { return $this->_id; }
-  function get_style() { return $this->_style; }
-  function get_original_style() { return $this->_original_style; }
-  function get_parent() { return $this->_parent; }
-  function get_decorator() { return $this->_decorator; }
-  function get_first_child() { return $this->_first_child; }
-  function get_last_child() { return $this->_last_child; }
-  function get_prev_sibling() { return $this->_prev_sibling; }
-  function get_next_sibling() { return $this->_next_sibling; }
-
-  function get_children() { return new FrameList($this); }
+    //........................................................................
+
+    // Accessor methods
+    function get_node() { return $this->_node; }
+    function get_id() { return $this->_id; }
+    function get_style() { return $this->_style; }
+    function get_original_style() { return $this->_original_style; }
+    function get_parent() { return $this->_parent; }
+    function get_decorator() { return $this->_decorator; }
+    function get_first_child() { return $this->_first_child; }
+    function get_last_child() { return $this->_last_child; }
+    function get_prev_sibling() { return $this->_prev_sibling; }
+    function get_next_sibling() { return $this->_next_sibling; }
+
+    function get_children() { return new FrameList($this); }
   
-  // Layout property accessors
-  function get_containing_block($i = null) {
+    // Layout property accessors
+    function get_containing_block($i = null) {
     if ( isset($i) )
-      return $this->_containing_block[$i];    
+        return $this->_containing_block[$i];    
     return $this->_containing_block;
-  }
+    }
   
-  function get_position($i = null) {
+    function get_position($i = null) {
     if ( isset($i) )
-      return $this->_position[$i];
+        return $this->_position[$i];
     return array($this->_position["x"],
-                 $this->_position["y"],
-                 "x"=>$this->_position["x"],
-                 "y"=>$this->_position["y"]);
-  }
+                    $this->_position["y"],
+                    "x"=>$this->_position["x"],
+                    "y"=>$this->_position["y"]);
+    }
     
-  //........................................................................
+    //........................................................................
 
-  // Return the height of the margin box of the frame, in pt.  Meaningless
-  // unless the height has been calculated properly.
-  function get_margin_height() {      
+    // Return the height of the margin box of the frame, in pt.  Meaningless
+    // unless the height has been calculated properly.
+    function get_margin_height() {      
     return $this->_style->length_in_pt(array($this->_style->height,
-                                             $this->_style->margin_top,
-                                             $this->_style->margin_bottom,
-                                             $this->_style->border_top_width,
-                                             $this->_style->border_bottom_width,
-                                             $this->_style->padding_top,
-                                             $this->_style->padding_bottom),
-                                       $this->_containing_block["w"]);
-  }
-
-  // Return the width of the margin box of the frame, in pt.  Meaningless
-  // unless the width has been calculted properly.
-  function get_margin_width() {
+                                                $this->_style->margin_top,
+                                                $this->_style->margin_bottom,
+                                                $this->_style->border_top_width,
+                                                $this->_style->border_bottom_width,
+                                                $this->_style->padding_top,
+                                                $this->_style->padding_bottom),
+                                        $this->_containing_block["w"]);
+    }
+
+    // Return the width of the margin box of the frame, in pt.  Meaningless
+    // unless the width has been calculted properly.
+    function get_margin_width() {
     return $this->_style->length_in_pt(array($this->_style->width,
-                                     $this->_style->margin_left,
-                                     $this->_style->margin_right,
-                                     $this->_style->border_left_width,
-                                     $this->_style->border_right_width,
-                                     $this->_style->padding_left,
-                                     $this->_style->padding_right),
-                               $this->_containing_block["w"]);
-  }
-
-  // Return the padding box (x,y,w,h) of the frame
-  function get_padding_box() {
+                                        $this->_style->margin_left,
+                                        $this->_style->margin_right,
+                                        $this->_style->border_left_width,
+                                        $this->_style->border_right_width,
+                                        $this->_style->padding_left,
+                                        $this->_style->padding_right),
+                                $this->_containing_block["w"]);
+    }
+
+    // Return the padding box (x,y,w,h) of the frame
+    function get_padding_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt(array($this->_style->margin_left,
                                         $this->_style->border_left_width),
-                                  $this->_containing_block["w"]);
+                                    $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt(array($this->_style->margin_top,
                                 $this->_style->border_top_width),
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     
     $w = $this->_style->length_in_pt(array($this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right),
-                             $this->_containing_block["w"]);
+                                    $this->_style->width,
+                                    $this->_style->padding_right),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom),
-                             $this->_containing_block["w"]);
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
-  }
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
+    }
 
-  // Return the border box of the frame
-  function get_border_box() {
+    // Return the border box of the frame
+    function get_border_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt($this->_style->margin_left,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt($this->_style->margin_top,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
 
     $w = $this->_style->length_in_pt(array($this->_style->border_left_width,
-                                   $this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right,
-                                   $this->_style->border_right_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_left,
+                                    $this->_style->width,
+                                    $this->_style->padding_right,
+                                    $this->_style->border_right_width),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->border_top_width,
-                                   $this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom,
-                                   $this->_style->border_bottom_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_top,
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom,
+                                    $this->_style->border_bottom_width),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
     
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_id($id) {
+    // Set methods
+    function set_id($id) {
     $this->_id = $id;
 
     // We can only set attributes of DOMElement objects (nodeType == 1).
     // Since these are the only objects that we can assign CSS rules to,
     // this shortcoming is okay.
     if ( $this->_node->nodeType == 1)
-      $this->_node->setAttribute("frame_id", $id);
-  }
+        $this->_node->setAttribute("frame_id", $id);
+    }
 
-  function set_style(Style $style) {
+    function set_style(Style $style) {
     if ( is_null($this->_style) )
-      $this->_original_style = clone $style;
+        $this->_original_style = clone $style;
     
     $this->_style = $style;
-  }
+    }
   
-  function set_decorator(Frame_Decorator $decorator) {
+    function set_decorator(Frame_Decorator $decorator) {
     $this->_decorator = $decorator;
-  }
+    }
   
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     if ( is_array($x) ){
-  		foreach($x AS $key => $val){
-			$$key = $val;
-		}
+            foreach($x AS $key => $val){
+            $$key = $val;
+        }
     }
     
     if (is_numeric($x)) {
-      $this->_containing_block[0] = $x;
-      $this->_containing_block["x"] = $x;
+        $this->_containing_block[0] = $x;
+        $this->_containing_block["x"] = $x;
     }
     
     if (is_numeric($y)) {
-      $this->_containing_block[1] = $y;
-      $this->_containing_block["y"] = $y;
+        $this->_containing_block[1] = $y;
+        $this->_containing_block["y"] = $y;
     }
     
     if (is_numeric($w)) {
-      $this->_containing_block[2] = $w;
-      $this->_containing_block["w"] = $w;
+        $this->_containing_block[2] = $w;
+        $this->_containing_block["w"] = $w;
     }
     
     if (is_numeric($h)) {
-      $this->_containing_block[3] = $h;
-      $this->_containing_block["h"] = $h;
+        $this->_containing_block[3] = $h;
+        $this->_containing_block["h"] = $h;
     }
     
-  }
+    }
 
-  function set_position($x = null, $y = null) {
+    function set_position($x = null, $y = null) {
     if ( is_array($x) )
-      extract($x);
+        extract($x);
     
     if ( is_numeric($x) ) {
-      $this->_position[0] = $x;
-      $this->_position["x"] = $x;
+        $this->_position[0] = $x;
+        $this->_position["x"] = $x;
     }
 
     if ( is_numeric($y) ) {
-      $this->_position[1] = $y;
-      $this->_position["y"] = $y;
+        $this->_position[1] = $y;
+        $this->_position["y"] = $y;
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function prepend_child(Frame $child, $update_node = true) {
+    function prepend_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+        $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
     
     // Handle the first child
     if ( !$this->_first_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_next_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_next_sibling = null;
       
     } else {
 
-      $this->_first_child->_prev_sibling = $child;
-      $child->_next_sibling = $this->_first_child;      
-      $this->_first_child = $child;
+        $this->_first_child->_prev_sibling = $child;
+        $child->_next_sibling = $this->_first_child;      
+        $this->_first_child = $child;
       
     }
-  }
+    }
   
-  function append_child(Frame $child, $update_node = true) {
+    function append_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->appendChild($child->_node);
+        $this->_node->appendChild($child->_node);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
 
     $child->_parent = $this;
     $child->_next_sibling = null;
     
     // Handle the first child
     if ( !$this->_last_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_prev_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_prev_sibling = null;
       
     } else {
 
-      $this->_last_child->_next_sibling = $child;
-      $child->_prev_sibling = $this->_last_child;
-      $this->_last_child = $child;
+        $this->_last_child->_next_sibling = $child;
+        $child->_prev_sibling = $this->_last_child;
+        $this->_last_child = $child;
 
     }
-  }  
+    }  
 
-  // Inserts a new child immediately before the specified frame
-  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
+    // Inserts a new child immediately before the specified frame
+    function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
 
     if ( $ref === $this->_first_child ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node    
     if ( $update_node )
-      $this->_node->insertBefore($new_child->_node, $ref->_node);
+        $this->_node->insertBefore($new_child->_node, $ref->_node);
 
     // Remove the child from its parent
     if ( $new_child->_parent )
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_next_sibling = $ref;
     $new_child->_prev_sibling = $ref->_prev_sibling;
 
     if ( $ref->_prev_sibling )
-      $ref->_prev_sibling->_next_sibling = $new_child;
+        $ref->_prev_sibling->_next_sibling = $new_child;
     
     $ref->_prev_sibling = $new_child;
-  }
+    }
   
-  // Inserts a new child immediately after the specified frame
-  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
+    // Inserts a new child immediately after the specified frame
+    function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
 
     if ( $ref === $this->_last_child ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node
     if ( $update_node ) {
-      if ( $ref->_next_sibling ) {
+        if ( $ref->_next_sibling ) {
         $next_node = $ref->_next_sibling->_node;
         $this->_node->insertBefore($new_child->_node, $next_node);
-      } else {
+        } else {
         $new_child->_node = $this->_node->appendChild($new_child);
-      }
+        }
     }
     
     // Remove the child from its parent
     if ( $new_child->_parent)
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_prev_sibling = $ref;
     $new_child->_next_sibling = $ref->_next_sibling;
 
     if ( $ref->_next_sibling ) 
-      $ref->_next_sibling->_prev_sibling = $new_child;
+        $ref->_next_sibling->_prev_sibling = $new_child;
 
     $ref->_next_sibling = $new_child;
-  }
+    }
 
 
-  function remove_child(Frame $child, $update_node = true) {
+    function remove_child(Frame $child, $update_node = true) {
 
     if ( $child->_parent !== $this )
-      throw new DOMPDF_Exception("Child not found in this frame");
+        throw new DOMPDF_Exception("Child not found in this frame");
 
     if ( $update_node )
-      $this->_node->removeChild($child->_node);
+        $this->_node->removeChild($child->_node);
     
     if ( $child === $this->_first_child )
-      $this->_first_child = $child->_next_sibling;
+        $this->_first_child = $child->_next_sibling;
 
     if ( $child === $this->_last_child )
-      $this->_last_child = $child->_prev_sibling;
+        $this->_last_child = $child->_prev_sibling;
 
     if ( $child->_prev_sibling )
-      $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+        $child->_prev_sibling->_next_sibling = $child->_next_sibling;
 
     if ( $child->_next_sibling )
-      $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
+        $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
 
     $child->_next_sibling = null;
     $child->_prev_sibling = null;
     $child->_parent = null;
     return $child;
         
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Debugging function:
-  function __toString() {
+    // Debugging function:
+    function __toString() {
 
     // Skip empty text frames
 //     if ( $this->_node->nodeName === "#text" &&
@@ -588,29 +587,29 @@ 
     $str .= "Class: " .get_class($this) . "<br/>";
     
     if ( $this->_node->nodeName === "#text" ) {
-      $tmp = htmlspecialchars($this->_node->nodeValue);
-      $str .= "<pre>'" .  mb_substr($tmp,0,70) .
+        $tmp = htmlspecialchars($this->_node->nodeValue);
+        $str .= "<pre>'" .  mb_substr($tmp,0,70) .
         (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
     }
     if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
+        $str .= "\nParent:" . $this->_parent->_node->nodeName .
         " (" . spl_object_hash($this->_parent->_node) . ") " .
         "<br/>";
 
     if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
+        $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
         "<br/>";
 
     if ( $this->_next_sibling )
-      $str .= "Next: " . $this->_next_sibling->_node->nodeName .
+        $str .= "Next: " . $this->_next_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
         "<br/>";
 
     $d = $this->get_decorator();
     while ($d && $d != $d->get_decorator()) {
-      $str .= "Decorator: " . get_class($d) . "<br/>";
-      $d = $d->get_decorator();
+        $str .= "Decorator: " . get_class($d) . "<br/>";
+        $d = $d->get_decorator();
     }
 
     $str .= "Position: " . pre_r($this->_position, true);
@@ -621,33 +620,33 @@ 
     $str .= "\nStyle: <pre>". $this->_style->__toString() . "</pre>";
 
     if ( $this->_decorator instanceof Block_Frame_Decorator ) {
-      $str .= "Lines:<pre>";
-      foreach ($this->_decorator->get_lines() as $line) {
+        $str .= "Lines:<pre>";
+        foreach ($this->_decorator->get_lines() as $line) {
         foreach ($line["frames"] as $frame) {
-          if ($frame instanceof Text_Frame_Decorator) {
+            if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
             $str .= "'". htmlspecialchars($frame->get_text()) ."'";
-          } else {
+            } else {
             $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
-          }
+            }
         }
         
         $str .=
-          //"\ncount => " . $line["count"] . "\n".
-          "\ny => " . $line["y"] . "\n" .
-          "w => " . $line["w"] . "\n" .
-          "h => " . $line["h"] . "\n";
-      }
-      $str .= "</pre>";
+            //"\ncount => " . $line["count"] . "\n".
+            "\ny => " . $line["y"] . "\n" .
+            "w => " . $line["w"] . "\n" .
+            "h => " . $line["h"] . "\n";
+        }
+        $str .= "</pre>";
     }
     $str .= "\n";
     if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+        $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n","",""),
                                     $str));
     
     return $str;
-  }
+    }
         
 }
 
@@ -660,10 +659,10 @@ 
  * @package dompdf
  */
 class FrameList implements IteratorAggregate {
-  protected $_frame;
+    protected $_frame;
 
-  function __construct($frame) { $this->_frame = $frame; }
-  function getIterator() { return new FrameListIterator($this->_frame); }
+    function __construct($frame) { $this->_frame = $frame; }
+    function getIterator() { return new FrameListIterator($this->_frame); }
 }
   
 /**
@@ -677,37 +676,37 @@ 
  */
 class FrameListIterator implements Iterator {
 
-  protected $_parent;
-  protected $_cur;
-  protected $_num;
+    protected $_parent;
+    protected $_cur;
+    protected $_num;
 
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     $this->_parent = $frame;
     $this->_cur = $frame->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function rewind() { 
+    function rewind() { 
     $this->_cur = $this->_parent->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function valid() {
+    function valid() {
     return isset($this->_cur);// && ($this->_cur->get_prev_sibling() === $this->_prev);
-  }
-  function key() { return $this->_num; }
-  function current() { return $this->_cur; }
+    }
+    function key() { return $this->_num; }
+    function current() { return $this->_cur; }
 
-  function next() {
+    function next() {
 
     $ret = $this->_cur;
     if ( !$ret )
-      return null;
+        return null;
     
     $this->_cur = $this->_cur->get_next_sibling();
     $this->_num++;
     return $ret;
-  }
+    }
 }
 
 //------------------------------------------------------------------------
@@ -720,9 +719,9 @@ 
  */
 class FrameTreeList implements IteratorAggregate {
 
-  protected $_root;
-  function __construct(Frame $root) { $this->_root = $root; }
-  function getIterator() { return new FrameTreeIterator($this->_root); }
+    protected $_root;
+    function __construct(Frame $root) { $this->_root = $root; }
+    function getIterator() { return new FrameTreeIterator($this->_root); }
 
 }
 
@@ -736,25 +735,25 @@ 
  */
 class FrameTreeIterator implements Iterator {
 
-  protected $_root;
-  protected $_stack = array();
-  protected $_num;
+    protected $_root;
+    protected $_stack = array();
+    protected $_num;
   
-  function __construct(Frame $root) {
+    function __construct(Frame $root) {
     $this->_stack[] = $this->_root = $root;
     $this->_num = 0;
-  }
+    }
 
-  function rewind() {
+    function rewind() {
     $this->_stack = array($this->_root);
     $this->_num = 0;
-  }
+    }
     
-  function valid() { return count($this->_stack) > 0; }
-  function key() { return $this->_num; }
-  function current() { return end($this->_stack); }
+    function valid() { return count($this->_stack) > 0; }
+    function key() { return $this->_num; }
+    function current() { return end($this->_stack); }
 
-  function next() {
+    function next() {
     $b = end($this->_stack);
     
     // Pop last element
@@ -763,10 +762,10 @@ 
     
     // Push all children onto the stack in reverse order
     if ( $c = $b->get_last_child() ) {
-      $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
+        $this->_stack[] = $c;
+        while ( $c = $c->get_prev_sibling() )
         $this->_stack[] = $c;
     }
     return $b;
-  }
+    }
 }

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

Doc Comments +14 added lines

@@ -155,7 +155,15 @@ 
   function get_id() { return $this->_frame->get_id(); }
   function get_style() { return $this->_frame->get_style(); }
   function get_original_style() { return $this->_frame->get_original_style(); }
+
+  /**
+   * @param string $i
+   */
   function get_containing_block($i = null) { return $this->_frame->get_containing_block($i); }
+
+  /**
+   * @param string $i
+   */
   function get_position($i = null) { return $this->_frame->get_position($i); }
   function get_dompdf() { return $this->_dompdf; }
 //   function get_decorator() {
@@ -173,6 +181,12 @@ 
   function set_id($id) { $this->_frame->set_id($id); }
   function set_style(Style $style) { $this->_frame->set_style($style); }
 
+  /**
+   * @param double $x
+   * @param double $y
+   * @param double $w
+   * @param double $h
+   */
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     $this->_frame->set_containing_block($x, $y, $w, $h);
   }

Spacing +34 added lines, -34 removed lines

@@ -101,8 +101,8 @@ 
    */
   function dispose($recursive = false) {
     
-    if ( $recursive ) {
-      while ( $child = $this->get_first_child() )
+    if ($recursive) {
+      while ($child = $this->get_first_child())
         $child->dispose(true);
     }
     
@@ -183,41 +183,41 @@ 
   function __toString() { return $this->_frame->__toString(); }
   
   function prepend_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $child->_frame;
     
     $this->_frame->prepend_child($child, $update_node);
   }
 
   function append_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $child->_frame;
 
     $this->_frame->append_child($child, $update_node);
   }
 
   function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
+    while ($new_child instanceof Frame_Decorator)
       $new_child = $new_child->_frame;
 
-    if ( $ref instanceof Frame_Decorator )
+    if ($ref instanceof Frame_Decorator)
       $ref = $ref->_frame;
 
     $this->_frame->insert_child_before($new_child, $ref, $update_node);
   }
 
   function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
+    while ($new_child instanceof Frame_Decorator)
       $new_child = $new_child->_frame;
 
-    while ( $ref instanceof Frame_Decorator )
+    while ($ref instanceof Frame_Decorator)
       $ref = $ref->_frame;
     
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
   }
 
   function remove_child(Frame $child, $update_node = true) {
-    while  ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $new_child->_frame;
 
     $this->_frame->remove_child($child, $update_node);
@@ -229,11 +229,11 @@ 
 
     $p = $this->_frame->get_parent();
     
-    if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($p && $deco = $p->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $p )
+    } else if ($p)
       return $p;
     else
       return null;
@@ -241,11 +241,11 @@ 
 
   function get_first_child() {
     $c = $this->_frame->get_first_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $c )
+    } else if ($c)
       return $c;
     else
       return null;
@@ -253,11 +253,11 @@ 
 
   function get_last_child() {
     $c = $this->_frame->get_last_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $c )
+    } else if ($c)
       return $c;
     else
       return null;
@@ -265,11 +265,11 @@ 
 
   function get_prev_sibling() {
     $s = $this->_frame->get_prev_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $s )
+    } else if ($s)
       return $s;
     else
       return null;
@@ -277,11 +277,11 @@ 
   
   function get_next_sibling() {
     $s = $this->_frame->get_next_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $s )
+    } else if ($s)
       return $s;
     else
       return null;
@@ -299,7 +299,7 @@ 
 
   function set_positioner(Positioner $posn) {
     $this->_positioner = $posn;
-    if ( $this->_frame instanceof Frame_Decorator )
+    if ($this->_frame instanceof Frame_Decorator)
       $this->_frame->set_positioner($posn);
   }
   
@@ -307,8 +307,8 @@ 
 
   function set_reflower(Frame_Reflower $reflower) {
     $this->_reflower = $reflower;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_reflower( $reflower );
+    if ($this->_frame instanceof Frame_Decorator)
+      $this->_frame->set_reflower($reflower);
   }
   
   function get_reflower() { return $this->_reflower; }
@@ -317,7 +317,7 @@ 
   
   function set_root(Frame $root) {
     $this->_root = $root;
-      if ( $this->_frame instanceof Frame_Decorator )
+      if ($this->_frame instanceof Frame_Decorator)
         $this->_frame->set_root($root);
   }
   
@@ -330,8 +330,8 @@ 
     // Find our nearest block level parent
     $p = $this->get_parent();
     
-    while ( $p ) {
-      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
+    while ($p) {
+      if (in_array($p->get_style()->display, Style::$BLOCK_TYPES))
         break;
 
       $p = $p->get_parent();
@@ -353,15 +353,15 @@ 
    */
   function split($child = null) {
 
-    if ( is_null( $child ) ) {
+    if (is_null($child)) {
       $this->get_parent()->split($this);
       return;
     }
     
-    if ( $child->get_parent() !== $this )
+    if ($child->get_parent() !== $this)
       throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
 
-    $split = $this->copy( $this->_frame->get_node()->cloneNode() );
+    $split = $this->copy($this->_frame->get_node()->cloneNode());
     $split->reset();
     $this->get_parent()->insert_child_after($split, $this);
 
@@ -379,7 +379,7 @@ 
 
   //........................................................................
 
-  final function position() { $this->_positioner->position();  }
+  final function position() { $this->_positioner->position(); }
   
   final function reflow() {
     // Uncomment this to see the frames before they're laid out, instead of

Braces +85 added lines, -60 removed lines

@@ -102,8 +102,9 @@ 
   function dispose($recursive = false) {
     
     if ( $recursive ) {
-      while ( $child = $this->get_first_child() )
-        $child->dispose(true);
+      while ( $child = $this->get_first_child() ) {
+              $child->dispose(true);
+      }
     }
     
     unset($this->_root);
@@ -134,8 +135,9 @@ 
     $deco = Frame_Factory::decorate_frame($frame, $this->_dompdf);
     $deco->set_root($this->_root);
 
-    foreach ($this->get_children() as $child)
-      $deco->append_child($child->deep_copy());
+    foreach ($this->get_children() as $child) {
+          $deco->append_child($child->deep_copy());
+    }
 
     return $deco;
   }
@@ -146,8 +148,9 @@ 
     $this->_frame->reset();
 
     // Reset all children
-    foreach ($this->get_children() as $child)
-      $child->reset();
+    foreach ($this->get_children() as $child) {
+          $child->reset();
+    }
 
   }
   
@@ -183,42 +186,49 @@ 
   function __toString() { return $this->_frame->__toString(); }
   
   function prepend_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+    while ( $child instanceof Frame_Decorator ) {
+          $child = $child->_frame;
+    }
     
     $this->_frame->prepend_child($child, $update_node);
   }
 
   function append_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+    while ( $child instanceof Frame_Decorator ) {
+          $child = $child->_frame;
+    }
 
     $this->_frame->append_child($child, $update_node);
   }
 
   function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+    while ( $new_child instanceof Frame_Decorator ) {
+          $new_child = $new_child->_frame;
+    }
 
-    if ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+    if ( $ref instanceof Frame_Decorator ) {
+          $ref = $ref->_frame;
+    }
 
     $this->_frame->insert_child_before($new_child, $ref, $update_node);
   }
 
   function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+    while ( $new_child instanceof Frame_Decorator ) {
+          $new_child = $new_child->_frame;
+    }
 
-    while ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+    while ( $ref instanceof Frame_Decorator ) {
+          $ref = $ref->_frame;
+    }
     
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
   }
 
   function remove_child(Frame $child, $update_node = true) {
-    while  ( $child instanceof Frame_Decorator )
-      $child = $new_child->_frame;
+    while  ( $child instanceof Frame_Decorator ) {
+          $child = $new_child->_frame;
+    }
 
     $this->_frame->remove_child($child, $update_node);
   }
@@ -230,61 +240,71 @@ 
     $p = $this->_frame->get_parent();
     
     if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $p )
-      return $p;
-    else
-      return null;
+    } else if ( $p ) {
+          return $p;
+    } else {
+          return null;
+    }
   }
 
   function get_first_child() {
     $c = $this->_frame->get_first_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $c )
-      return $c;
-    else
-      return null;
+    } else if ( $c ) {
+          return $c;
+    } else {
+          return null;
+    }
   }
 
   function get_last_child() {
     $c = $this->_frame->get_last_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $c )
-      return $c;
-    else
-      return null;
+    } else if ( $c ) {
+          return $c;
+    } else {
+          return null;
+    }
   }
 
   function get_prev_sibling() {
     $s = $this->_frame->get_prev_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $s )
-      return $s;
-    else
-      return null;
+    } else if ( $s ) {
+          return $s;
+    } else {
+          return null;
+    }
   }
   
   function get_next_sibling() {
     $s = $this->_frame->get_next_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $s )
-      return $s;
-    else
-      return null;
+    } else if ( $s ) {
+          return $s;
+    } else {
+          return null;
+    }
   }
 
   function get_children() {
@@ -299,16 +319,18 @@ 
 
   function set_positioner(Positioner $posn) {
     $this->_positioner = $posn;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_positioner($posn);
+    if ( $this->_frame instanceof Frame_Decorator ) {
+          $this->_frame->set_positioner($posn);
+    }
   }
   
   //........................................................................
 
   function set_reflower(Frame_Reflower $reflower) {
     $this->_reflower = $reflower;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_reflower( $reflower );
+    if ( $this->_frame instanceof Frame_Decorator ) {
+          $this->_frame->set_reflower( $reflower );
+    }
   }
   
   function get_reflower() { return $this->_reflower; }
@@ -317,8 +339,9 @@ 
   
   function set_root(Frame $root) {
     $this->_root = $root;
-      if ( $this->_frame instanceof Frame_Decorator )
-        $this->_frame->set_root($root);
+      if ( $this->_frame instanceof Frame_Decorator ) {
+              $this->_frame->set_root($root);
+      }
   }
   
   function get_root() { return $this->_root; }
@@ -331,8 +354,9 @@ 
     $p = $this->get_parent();
     
     while ( $p ) {
-      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
-        break;
+      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) ) {
+              break;
+      }
 
       $p = $p->get_parent();
     }
@@ -358,8 +382,9 @@ 
       return;
     }
     
-    if ( $child->get_parent() !== $this )
-      throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+    if ( $child->get_parent() !== $this ) {
+          throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+    }
 
     $split = $this->copy( $this->_frame->get_node()->cloneNode() );
     $split->reset();

Indentation +216 added lines, -217 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: frame_decorator.cls.php,v $
- * Created on: 2004-06-02
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: frame_decorator.cls.php,v $
+     * Created on: 2004-06-02
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,62 +46,62 @@ 
  */
 abstract class Frame_Decorator extends Frame {
   
-  /**
-   * The root node of the DOM tree
-   *
-   * @var Frame
-   */
-  protected $_root;
-
-  /**
-   * The decorated frame
-   *
-   * @var Frame
-   */
-  protected $_frame;
-
-  /**
-   * Positioner object used to position this frame (Strategy pattern)
-   *
-   * @var Positioner
-   */
-  protected $_positioner;
-
-  /**
-   * Reflower object used to calculate frame dimensions (Strategy pattern)
-   *
-   * @var Frame_Reflower
-   */
-  protected $_reflower;
+    /**
+     * The root node of the DOM tree
+     *
+     * @var Frame
+     */
+    protected $_root;
+
+    /**
+     * The decorated frame
+     *
+     * @var Frame
+     */
+    protected $_frame;
+
+    /**
+     * Positioner object used to position this frame (Strategy pattern)
+     *
+     * @var Positioner
+     */
+    protected $_positioner;
+
+    /**
+     * Reflower object used to calculate frame dimensions (Strategy pattern)
+     *
+     * @var Frame_Reflower
+     */
+    protected $_reflower;
   
-  /**
-   * Reference to the current dompdf instance
-   *
-   * @var DOMPDF
-   */
-  protected $_dompdf;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the decoration target
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Reference to the current dompdf instance
+     *
+     * @var DOMPDF
+     */
+    protected $_dompdf;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the decoration target
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     $this->_frame = $frame;
     $this->_root = null;
     $this->_dompdf = $dompdf;
     $frame->set_decorator($this);
-  }
-
-  /**
-   * "Destructor": foribly free all references held by this object
-   *
-   * @param bool $recursive if true, call dispose on all children
-   */
-  function dispose($recursive = false) {
+    }
+
+    /**
+     * "Destructor": foribly free all references held by this object
+     *
+     * @param bool $recursive if true, call dispose on all children
+     */
+    function dispose($recursive = false) {
     
     if ( $recursive ) {
-      while ( $child = $this->get_first_child() )
+        while ( $child = $this->get_first_child() )
         $child->dispose(true);
     }
     
@@ -112,52 +111,52 @@ 
     unset($this->_positioner);
     unset($this->_reflower);
 
-  }
+    }
 
-  // Return a copy of this frame with $node as its node
-  function copy(DomNode $node) {
+    // Return a copy of this frame with $node as its node
+    function copy(DomNode $node) {
     $frame = new Frame($node);
     $frame->set_style(clone $this->_frame->get_original_style());
     $deco = Frame_Factory::decorate_frame($frame, $this->_dompdf);
     $deco->set_root($this->_root);
     return $deco;
-  }
-
-  /**
-   * Create a deep copy: copy this node and all children
-   *
-   * @return Frame
-   */
-  function deep_copy() {
+    }
+
+    /**
+     * Create a deep copy: copy this node and all children
+     *
+     * @return Frame
+     */
+    function deep_copy() {
     $frame = new Frame($this->get_node()->cloneNode());
     $frame->set_style(clone $this->_frame->get_original_style());
     $deco = Frame_Factory::decorate_frame($frame, $this->_dompdf);
     $deco->set_root($this->_root);
 
     foreach ($this->get_children() as $child)
-      $deco->append_child($child->deep_copy());
+        $deco->append_child($child->deep_copy());
 
     return $deco;
-  }
-  //........................................................................
+    }
+    //........................................................................
   
-  // Delegate calls to decorated frame object
-  function reset() {
+    // Delegate calls to decorated frame object
+    function reset() {
     $this->_frame->reset();
 
     // Reset all children
     foreach ($this->get_children() as $child)
-      $child->reset();
+        $child->reset();
 
-  }
+    }
   
-  function get_node() { return $this->_frame->get_node(); }
-  function get_id() { return $this->_frame->get_id(); }
-  function get_style() { return $this->_frame->get_style(); }
-  function get_original_style() { return $this->_frame->get_original_style(); }
-  function get_containing_block($i = null) { return $this->_frame->get_containing_block($i); }
-  function get_position($i = null) { return $this->_frame->get_position($i); }
-  function get_dompdf() { return $this->_dompdf; }
+    function get_node() { return $this->_frame->get_node(); }
+    function get_id() { return $this->_frame->get_id(); }
+    function get_style() { return $this->_frame->get_style(); }
+    function get_original_style() { return $this->_frame->get_original_style(); }
+    function get_containing_block($i = null) { return $this->_frame->get_containing_block($i); }
+    function get_position($i = null) { return $this->_frame->get_position($i); }
+    function get_dompdf() { return $this->_dompdf; }
 //   function get_decorator() {
 //     if ( isset($this->_decorator) )
 //       return $this->_decorator;
@@ -165,201 +164,201 @@ 
 //       return $this;
 //   }
 
-  function get_margin_height() { return $this->_frame->get_margin_height(); }
-  function get_margin_width() { return $this->_frame->get_margin_width(); }
-  function get_padding_box() { return $this->_frame->get_padding_box(); }
-  function get_border_box() { return $this->_frame->get_border_box(); }
+    function get_margin_height() { return $this->_frame->get_margin_height(); }
+    function get_margin_width() { return $this->_frame->get_margin_width(); }
+    function get_padding_box() { return $this->_frame->get_padding_box(); }
+    function get_border_box() { return $this->_frame->get_border_box(); }
 
-  function set_id($id) { $this->_frame->set_id($id); }
-  function set_style(Style $style) { $this->_frame->set_style($style); }
+    function set_id($id) { $this->_frame->set_id($id); }
+    function set_style(Style $style) { $this->_frame->set_style($style); }
 
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     $this->_frame->set_containing_block($x, $y, $w, $h);
-  }
+    }
 
-  function set_position($x = null, $y = null) {
+    function set_position($x = null, $y = null) {
     $this->_frame->set_position($x, $y);
-  }
-  function __toString() { return $this->_frame->__toString(); }
+    }
+    function __toString() { return $this->_frame->__toString(); }
   
-  function prepend_child(Frame $child, $update_node = true) {
+    function prepend_child(Frame $child, $update_node = true) {
     while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+        $child = $child->_frame;
     
     $this->_frame->prepend_child($child, $update_node);
-  }
+    }
 
-  function append_child(Frame $child, $update_node = true) {
+    function append_child(Frame $child, $update_node = true) {
     while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+        $child = $child->_frame;
 
     $this->_frame->append_child($child, $update_node);
-  }
+    }
 
-  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
+    function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
     while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+        $new_child = $new_child->_frame;
 
     if ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+        $ref = $ref->_frame;
 
     $this->_frame->insert_child_before($new_child, $ref, $update_node);
-  }
+    }
 
-  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
+    function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
     while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+        $new_child = $new_child->_frame;
 
     while ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+        $ref = $ref->_frame;
     
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
-  }
+    }
 
-  function remove_child(Frame $child, $update_node = true) {
+    function remove_child(Frame $child, $update_node = true) {
     while  ( $child instanceof Frame_Decorator )
-      $child = $new_child->_frame;
+        $child = $new_child->_frame;
 
     $this->_frame->remove_child($child, $update_node);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function get_parent() {
+    function get_parent() {
 
     $p = $this->_frame->get_parent();
     
     if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+        while ( $tmp = $deco->get_decorator() )
         $deco = $tmp;      
-      return $deco;
+        return $deco;
     } else if ( $p )
-      return $p;
+        return $p;
     else
-      return null;
-  }
+        return null;
+    }
 
-  function get_first_child() {
+    function get_first_child() {
     $c = $this->_frame->get_first_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+        while ( $tmp = $deco->get_decorator() )
         $deco = $tmp;      
-      return $deco;
+        return $deco;
     } else if ( $c )
-      return $c;
+        return $c;
     else
-      return null;
-  }
+        return null;
+    }
 
-  function get_last_child() {
+    function get_last_child() {
     $c = $this->_frame->get_last_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+        while ( $tmp = $deco->get_decorator() )
         $deco = $tmp;      
-      return $deco;
+        return $deco;
     } else if ( $c )
-      return $c;
+        return $c;
     else
-      return null;
-  }
+        return null;
+    }
 
-  function get_prev_sibling() {
+    function get_prev_sibling() {
     $s = $this->_frame->get_prev_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+        while ( $tmp = $deco->get_decorator() )
         $deco = $tmp;      
-      return $deco;
+        return $deco;
     } else if ( $s )
-      return $s;
+        return $s;
     else
-      return null;
-  }
+        return null;
+    }
   
-  function get_next_sibling() {
+    function get_next_sibling() {
     $s = $this->_frame->get_next_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+        while ( $tmp = $deco->get_decorator() )
         $deco = $tmp;      
-      return $deco;
+        return $deco;
     } else if ( $s )
-      return $s;
+        return $s;
     else
-      return null;
-  }
+        return null;
+    }
 
-  function get_children() {
+    function get_children() {
     return new FrameList($this);
-  }
+    }
 
-  function get_subtree() {
+    function get_subtree() {
     return new FrameTreeList($this);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function set_positioner(Positioner $posn) {
+    function set_positioner(Positioner $posn) {
     $this->_positioner = $posn;
     if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_positioner($posn);
-  }
+        $this->_frame->set_positioner($posn);
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function set_reflower(Frame_Reflower $reflower) {
+    function set_reflower(Frame_Reflower $reflower) {
     $this->_reflower = $reflower;
     if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_reflower( $reflower );
-  }
+        $this->_frame->set_reflower( $reflower );
+    }
   
-  function get_reflower() { return $this->_reflower; }
+    function get_reflower() { return $this->_reflower; }
   
-  //........................................................................
+    //........................................................................
   
-  function set_root(Frame $root) {
+    function set_root(Frame $root) {
     $this->_root = $root;
-      if ( $this->_frame instanceof Frame_Decorator )
+        if ( $this->_frame instanceof Frame_Decorator )
         $this->_frame->set_root($root);
-  }
+    }
   
-  function get_root() { return $this->_root; }
+    function get_root() { return $this->_root; }
   
-  //........................................................................
+    //........................................................................
 
-  function find_block_parent() {
+    function find_block_parent() {
 
     // Find our nearest block level parent
     $p = $this->get_parent();
     
     while ( $p ) {
-      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
+        if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
         break;
 
-      $p = $p->get_parent();
+        $p = $p->get_parent();
     }
 
     return $p;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split this frame at $child.
-   *
-   * The current frame is cloned and $child and all children following
-   * $child are added to the clone.  The clone is then passed to the
-   * current frame's parent->split() method.
-   *
-   * @param Frame $child
-   */
-  function split($child = null) {
+    /**
+     * split this frame at $child.
+     *
+     * The current frame is cloned and $child and all children following
+     * $child are added to the clone.  The clone is then passed to the
+     * current frame's parent->split() method.
+     *
+     * @param Frame $child
+     */
+    function split($child = null) {
 
     if ( is_null( $child ) ) {
-      $this->get_parent()->split($this);
-      return;
+        $this->get_parent()->split($this);
+        return;
     }
     
     if ( $child->get_parent() !== $this )
-      throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+        throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
 
     $split = $this->copy( $this->_frame->get_node()->cloneNode() );
     $split->reset();
@@ -368,29 +367,29 @@ 
     // Add $frame and all following siblings to the new split node
     $iter = $child;
     while ($iter) {
-      $frame = $iter;      
-      $iter = $iter->get_next_sibling();
-      $frame->reset();
-      $split->append_child($frame);
+        $frame = $iter;      
+        $iter = $iter->get_next_sibling();
+        $frame->reset();
+        $split->append_child($frame);
     }
 
     $this->get_parent()->split($split);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  final function position() { $this->_positioner->position();  }
+    final function position() { $this->_positioner->position();  }
   
-  final function reflow() {
+    final function reflow() {
     // Uncomment this to see the frames before they're laid out, instead of
     // during rendering.
     //echo $this->_frame; flush();
     $this->_reflower->reflow();
-  }
+    }
 
-  final function get_min_max_width() { return $this->get_reflower()->get_min_max_width(); }
+    final function get_min_max_width() { return $this->get_reflower()->get_min_max_width(); }
   
-  //........................................................................
+    //........................................................................
 
 
 }

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

Doc Comments +4 added lines

@@ -60,6 +60,10 @@
   }
 
   // FIXME: this is admittedly a little smelly...
+
+  /**
+   * @param DOMPDF $dompdf
+   */
   static function decorate_frame(Frame $frame, $dompdf) {
     if ( is_null($dompdf) )
       throw new Exception("foo");

Indentation +53 added lines, -54 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame_factory.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -52,119 +51,119 @@ 
  */
 class Frame_Factory {
 
-  static function decorate_root(Frame $root, DOMPDF $dompdf) {
+    static function decorate_root(Frame $root, DOMPDF $dompdf) {
     $frame = new Page_Frame_Decorator($root, $dompdf);
     $frame->set_reflower( new Page_Frame_Reflower($frame) );
     $root->set_decorator($frame);
     return $frame;
-  }
+    }
 
-  // FIXME: this is admittedly a little smelly...
-  static function decorate_frame(Frame $frame, $dompdf) {
+    // FIXME: this is admittedly a little smelly...
+    static function decorate_frame(Frame $frame, $dompdf) {
     if ( is_null($dompdf) )
-      throw new Exception("foo");
+        throw new Exception("foo");
     switch ($frame->get_style()->display) {
       
     case "block":
       $positioner = "Block";        
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
+        $decorator = "Block";
+        $reflower = "Block";
+        break;
     
     case "inline-block":
       $positioner = "Inline";
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
+        $decorator = "Block";
+        $reflower = "Block";
+        break;
 
     case "inline":
       $positioner = "Inline";
-      if ( $frame->get_node()->nodeName === "#text" ) {
+        if ( $frame->get_node()->nodeName === "#text" ) {
         $decorator = "Text";
         $reflower = "Text";
-      } else {
+        } else {
         $decorator = "Inline";
         $reflower = "Inline";
-      }
-      break;   
+        }
+        break;   
 
     case "table":
       $positioner = "Block";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
+        $decorator = "Table";
+        $reflower = "Table";
+        break;
       
     case "inline-table":
       $positioner = "Inline";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
+        $decorator = "Table";
+        $reflower = "Table";
+        break;
 
     case "table-row-group":
     case "table-header-group":
     case "table-footer-group":
       $positioner = "Null";
-      $decorator = "Table_Row_Group";
-      $reflower = "Table_Row_Group";
-      break;
+        $decorator = "Table_Row_Group";
+        $reflower = "Table_Row_Group";
+        break;
       
     case "table-row":
       $positioner = "Null";
-      $decorator = "Table_Row";
-      $reflower = "Table_Row";
-      break;
+        $decorator = "Table_Row";
+        $reflower = "Table_Row";
+        break;
 
     case "table-cell":
       $positioner = "Table_Cell";
-      $decorator = "Table_Cell";
-      $reflower = "Table_Cell";
-      break;
+        $decorator = "Table_Cell";
+        $reflower = "Table_Cell";
+        break;
         
     case "list-item":
       $positioner = "Block";
-      $decorator  = "Block";
-      $reflower   = "Block";
-      break;
+        $decorator  = "Block";
+        $reflower   = "Block";
+        break;
 
     case "-dompdf-list-bullet":
       if ( $frame->get_style()->list_style_position === "inside" )
         $positioner = "Inline";
-      else        
+        else        
         $positioner = "List_Bullet";
 
-      if ( $frame->get_style()->list_style_image !== "none" )
+        if ( $frame->get_style()->list_style_image !== "none" )
         $decorator = "List_Bullet_Image";
-      else
+        else
         $decorator = "List_Bullet";
       
-      $reflower = "List_Bullet";
-      break;
+        $reflower = "List_Bullet";
+        break;
 
     case "-dompdf-image":
       $positioner = "Inline";
-      $decorator = "Image";
-      $reflower = "Image";
-      break;
+        $decorator = "Image";
+        $reflower = "Image";
+        break;
       
     case "-dompdf-br":
       $positioner = "Inline";
-      $decorator = "Inline";
-      $reflower = "Inline";
-      break;
+        $decorator = "Inline";
+        $reflower = "Inline";
+        break;
 
     default:
       // FIXME: should throw some sort of warning or something?
     case "none":
       $positioner = "Null";
-      $decorator = "Null";
-      $reflower = "Null";
-      break;
+        $decorator = "Null";
+        $reflower = "Null";
+        break;
 
     }
 
     if ( $frame->get_style()->position === "absolute" ||
          $frame->get_style()->position === "fixed" )
-      $positioner = "Absolute";
+        $positioner = "Absolute";
     
     $positioner .= "_Positioner";
     $decorator .= "_Frame_Decorator";
@@ -176,10 +175,10 @@ 
     
     // Generated content is a special case
     if ( $frame->get_node()->nodeName === "_dompdf_generated" ) {
-      // Decorate the reflower
-      $gen = new Generated_Frame_Reflower( $deco );
-      $gen->set_reflower( $reflow );
-      $reflow = $gen;
+        // Decorate the reflower
+        $gen = new Generated_Frame_Reflower( $deco );
+        $gen->set_reflower( $reflow );
+        $reflow = $gen;
     }
     
     $deco->set_reflower( $reflow );
@@ -204,6 +203,6 @@ 
 //     }   
     
     return $deco;
-  }
+    }
   
 }

Switch Indentation +88 added lines, -88 removed lines

@@ -65,100 +65,100 @@
       throw new Exception("foo");
     switch ($frame->get_style()->display) {
       
-    case "block":
-      $positioner = "Block";        
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
+        case "block":
+          $positioner = "Block";        
+          $decorator = "Block";
+          $reflower = "Block";
+          break;
     
-    case "inline-block":
-      $positioner = "Inline";
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
-
-    case "inline":
-      $positioner = "Inline";
-      if ( $frame->get_node()->nodeName === "#text" ) {
-        $decorator = "Text";
-        $reflower = "Text";
-      } else {
-        $decorator = "Inline";
-        $reflower = "Inline";
-      }
-      break;   
-
-    case "table":
-      $positioner = "Block";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
+        case "inline-block":
+          $positioner = "Inline";
+          $decorator = "Block";
+          $reflower = "Block";
+          break;
+
+        case "inline":
+          $positioner = "Inline";
+          if ( $frame->get_node()->nodeName === "#text" ) {
+            $decorator = "Text";
+            $reflower = "Text";
+          } else {
+            $decorator = "Inline";
+            $reflower = "Inline";
+          }
+          break;   
+
+        case "table":
+          $positioner = "Block";
+          $decorator = "Table";
+          $reflower = "Table";
+          break;
       
-    case "inline-table":
-      $positioner = "Inline";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
-
-    case "table-row-group":
-    case "table-header-group":
-    case "table-footer-group":
-      $positioner = "Null";
-      $decorator = "Table_Row_Group";
-      $reflower = "Table_Row_Group";
-      break;
+        case "inline-table":
+          $positioner = "Inline";
+          $decorator = "Table";
+          $reflower = "Table";
+          break;
+
+        case "table-row-group":
+        case "table-header-group":
+        case "table-footer-group":
+          $positioner = "Null";
+          $decorator = "Table_Row_Group";
+          $reflower = "Table_Row_Group";
+          break;
       
-    case "table-row":
-      $positioner = "Null";
-      $decorator = "Table_Row";
-      $reflower = "Table_Row";
-      break;
-
-    case "table-cell":
-      $positioner = "Table_Cell";
-      $decorator = "Table_Cell";
-      $reflower = "Table_Cell";
-      break;
+        case "table-row":
+          $positioner = "Null";
+          $decorator = "Table_Row";
+          $reflower = "Table_Row";
+          break;
+
+        case "table-cell":
+          $positioner = "Table_Cell";
+          $decorator = "Table_Cell";
+          $reflower = "Table_Cell";
+          break;
         
-    case "list-item":
-      $positioner = "Block";
-      $decorator  = "Block";
-      $reflower   = "Block";
-      break;
-
-    case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
-        $positioner = "Inline";
-      else        
-        $positioner = "List_Bullet";
-
-      if ( $frame->get_style()->list_style_image !== "none" )
-        $decorator = "List_Bullet_Image";
-      else
-        $decorator = "List_Bullet";
+        case "list-item":
+          $positioner = "Block";
+          $decorator  = "Block";
+          $reflower   = "Block";
+          break;
+
+        case "-dompdf-list-bullet":
+          if ( $frame->get_style()->list_style_position === "inside" )
+            $positioner = "Inline";
+          else        
+            $positioner = "List_Bullet";
+
+          if ( $frame->get_style()->list_style_image !== "none" )
+            $decorator = "List_Bullet_Image";
+          else
+            $decorator = "List_Bullet";
       
-      $reflower = "List_Bullet";
-      break;
-
-    case "-dompdf-image":
-      $positioner = "Inline";
-      $decorator = "Image";
-      $reflower = "Image";
-      break;
+          $reflower = "List_Bullet";
+          break;
+
+        case "-dompdf-image":
+          $positioner = "Inline";
+          $decorator = "Image";
+          $reflower = "Image";
+          break;
       
-    case "-dompdf-br":
-      $positioner = "Inline";
-      $decorator = "Inline";
-      $reflower = "Inline";
-      break;
-
-    default:
-      // FIXME: should throw some sort of warning or something?
-    case "none":
-      $positioner = "Null";
-      $decorator = "Null";
-      $reflower = "Null";
-      break;
+        case "-dompdf-br":
+          $positioner = "Inline";
+          $decorator = "Inline";
+          $reflower = "Inline";
+          break;
+
+        default:
+          // FIXME: should throw some sort of warning or something?
+        case "none":
+          $positioner = "Null";
+          $decorator = "Null";
+          $reflower = "Null";
+          break;
 
     }
 

Spacing +12 added lines, -12 removed lines

@@ -54,14 +54,14 @@ 
 
   static function decorate_root(Frame $root, DOMPDF $dompdf) {
     $frame = new Page_Frame_Decorator($root, $dompdf);
-    $frame->set_reflower( new Page_Frame_Reflower($frame) );
+    $frame->set_reflower(new Page_Frame_Reflower($frame));
     $root->set_decorator($frame);
     return $frame;
   }
 
   // FIXME: this is admittedly a little smelly...
   static function decorate_frame(Frame $frame, $dompdf) {
-    if ( is_null($dompdf) )
+    if (is_null($dompdf))
       throw new Exception("foo");
     switch ($frame->get_style()->display) {
       
@@ -79,7 +79,7 @@ 
 
     case "inline":
       $positioner = "Inline";
-      if ( $frame->get_node()->nodeName === "#text" ) {
+      if ($frame->get_node()->nodeName === "#text") {
         $decorator = "Text";
         $reflower = "Text";
       } else {
@@ -127,12 +127,12 @@ 
       break;
 
     case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
+      if ($frame->get_style()->list_style_position === "inside")
         $positioner = "Inline";
       else        
         $positioner = "List_Bullet";
 
-      if ( $frame->get_style()->list_style_image !== "none" )
+      if ($frame->get_style()->list_style_image !== "none")
         $decorator = "List_Bullet_Image";
       else
         $decorator = "List_Bullet";
@@ -162,8 +162,8 @@ 
 
     }
 
-    if ( $frame->get_style()->position === "absolute" ||
-         $frame->get_style()->position === "fixed" )
+    if ($frame->get_style()->position === "absolute" ||
+         $frame->get_style()->position === "fixed")
       $positioner = "Absolute";
     
     $positioner .= "_Positioner";
@@ -171,18 +171,18 @@ 
     $reflower .= "_Frame_Reflower";
 
     $deco = new $decorator($frame, $dompdf);
-    $deco->set_positioner( new $positioner($deco) );
+    $deco->set_positioner(new $positioner($deco));
     $reflow = new $reflower($deco);
     
     // Generated content is a special case
-    if ( $frame->get_node()->nodeName === "_dompdf_generated" ) {
+    if ($frame->get_node()->nodeName === "_dompdf_generated") {
       // Decorate the reflower
-      $gen = new Generated_Frame_Reflower( $deco );
-      $gen->set_reflower( $reflow );
+      $gen = new Generated_Frame_Reflower($deco);
+      $gen->set_reflower($reflow);
       $reflow = $gen;
     }
     
-    $deco->set_reflower( $reflow );
+    $deco->set_reflower($reflow);
 
     // Images are a special case
 //    if ( $frame->get_node()->nodeName === "img" ) {

Braces +17 added lines, -13 removed lines

@@ -61,8 +61,9 @@ 
 
   // FIXME: this is admittedly a little smelly...
   static function decorate_frame(Frame $frame, $dompdf) {
-    if ( is_null($dompdf) )
-      throw new Exception("foo");
+    if ( is_null($dompdf) ) {
+          throw new Exception("foo");
+    }
     switch ($frame->get_style()->display) {
       
     case "block":
@@ -127,15 +128,17 @@ 
       break;
 
     case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
-        $positioner = "Inline";
-      else        
-        $positioner = "List_Bullet";
-
-      if ( $frame->get_style()->list_style_image !== "none" )
-        $decorator = "List_Bullet_Image";
-      else
-        $decorator = "List_Bullet";
+      if ( $frame->get_style()->list_style_position === "inside" ) {
+              $positioner = "Inline";
+      } else {
+              $positioner = "List_Bullet";
+      }
+
+      if ( $frame->get_style()->list_style_image !== "none" ) {
+              $decorator = "List_Bullet_Image";
+      } else {
+              $decorator = "List_Bullet";
+      }
       
       $reflower = "List_Bullet";
       break;
@@ -163,8 +166,9 @@ 
     }
 
     if ( $frame->get_style()->position === "absolute" ||
-         $frame->get_style()->position === "fixed" )
-      $positioner = "Absolute";
+         $frame->get_style()->position === "fixed" ) {
+          $positioner = "Absolute";
+    }
     
     $positioner .= "_Positioner";
     $decorator .= "_Frame_Decorator";

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

Doc Comments +17 added lines

@@ -305,6 +305,10 @@ 
  */
 
 if ( !function_exists("mb_convert_encoding") ) {
+
+  /**
+   * @param string|null $to_encoding
+   */
   function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
       return utf8_encode($data);
@@ -327,6 +331,10 @@ 
 }
 
 if ( !function_exists("mb_internal_encoding") ) {
+
+  /**
+   * @param string $encoding
+   */
   function mb_internal_encoding($encoding=NULL) {
     if (isset($encoding)) {
       return true;
@@ -365,6 +373,10 @@ 
 }
 
 if ( !function_exists("mb_strtoupper") ) {
+
+  /**
+   * @param string $str
+   */
   function mb_strtoupper($str) {
     return strtoupper($str);
   }
@@ -380,6 +392,10 @@ 
 }
 
 if ( !function_exists("mb_substr_count") ) {
+
+  /**
+   * @param string $needle
+   */
   function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
   }
@@ -442,6 +458,7 @@ 
  * Print debug messages
  *
  * @param string $type  The type of debug messages to print
+ * @param string $msg
  */
 function dompdf_debug($type, $msg) {
   global $_DOMPDF_DEBUG_TYPES;

Indentation +137 added lines, -137 removed lines

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

Switch Indentation +10 added lines, -10 removed lines

@@ -273,20 +273,20 @@
   $ret = "";
   switch (mb_strlen($num)) {
 
-  case 4:
-    $ret .= $thou[$num[3]];
+      case 4:
+        $ret .= $thou[$num[3]];
 
-  case 3:
-    $ret .= $hund[$num[2]];
+      case 3:
+        $ret .= $hund[$num[2]];
 
-  case 2:
-    $ret .= $tens[$num[1]];
+      case 2:
+        $ret .= $tens[$num[1]];
 
-  case 1:
-    $ret .= $ones[$num[0]];
+      case 1:
+        $ret .= $ones[$num[0]];
 
-  default:
-    break;
+      default:
+        break;
   }
   return $ret;
 

Spacing +77 added lines, -77 removed lines

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

Braces +63 added lines, -42 removed lines

@@ -63,17 +63,20 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
-    return "<pre>" . print_r($mixed, true) . "</pre>";
+  if ($return) {
+      return "<pre>" . print_r($mixed, true) . "</pre>";
+  }
 
-  if ( php_sapi_name() !== "cli")
-    echo ("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo ("<pre>");
+  }
   print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-  else
-    echo ("\n");
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  } else {
+      echo ("\n");
+  }
   flush();
 
 }
@@ -89,12 +92,14 @@ 
  */
 if ( !function_exists("pre_var_dump") ) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
-    echo("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo("<pre>");
+  }
   var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-}
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  }
+  }
 }
 
 /**
@@ -121,8 +126,9 @@ 
   }
 
   // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
-    return $url;
+  if ( mb_strpos($url, "://") !== false ) {
+      return $url;
+  }
 
   $ret = $protocol;
 
@@ -170,24 +176,29 @@ 
 
   if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
-       mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
+       mb_strlen($arr["scheme"]) > 1 ) {
+      // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
+  }
 
     if ( isset($arr["user"]) ) {
       $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
-        $host .= "@" . $arr["pass"];
+      if ( isset($arr["pass"]) ) {
+              $host .= "@" . $arr["pass"];
+      }
 
       $host .= ":";
     }
 
-    if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+    if ( isset($arr["host"]) ) {
+          $host .= $arr["host"];
+    }
 
-    if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+    if ( isset($arr["port"]) ) {
+          $host .= ":" . $arr["port"];
+    }
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
       // Do we have a trailing slash?
@@ -200,17 +211,20 @@ 
       }
     }
 
-    if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+    if ( isset($arr["query"]) ) {
+          $file .= "?" . $arr["query"];
+    }
 
-    if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+    if ( isset($arr["fragment"]) ) {
+          $file .= "#" . $arr["fragment"];
+    }
 
   } else {
 
     $i = mb_strpos($url, "file://");
-    if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+    if ( $i !== false) {
+          $url = mb_substr($url, $i + 7);
+    }
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -262,11 +276,13 @@ 
                        "dc", "dcc", "dccc", "cm");
   static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
-    throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  if ( !is_numeric($num) ) {
+      throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  }
 
-  if ( $num > 4000 || $num < 0 )
-    return "(out of range)";
+  if ( $num > 4000 || $num < 0 ) {
+      return "(out of range)";
+  }
 
   $num = strrev((string)$num);
 
@@ -372,10 +388,11 @@ 
 
 if ( !function_exists("mb_substr") ) {
   function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
-    if ( is_null($length) )
-      return substr($str, $start);
-    else
-      return substr($str, $start, $length);
+    if ( is_null($length) ) {
+          return substr($str, $start);
+    } else {
+          return substr($str, $start, $length);
+    }
   }
 }
 
@@ -402,14 +419,17 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) {
+      // Not a warning or notice
     throw new DOMPDF_Exception($errstr . " $errno");
+  }
 
   global $_dompdf_warnings;
   global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
-    echo $errstr . "\n";
+  if ( $_dompdf_show_warnings ) {
+      echo $errstr . "\n";
+  }
 
   $_dompdf_warnings[] = $errstr;
 }
@@ -496,9 +516,10 @@ 
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
   global $memusage;
-  if ( isset($memusage) )
-    $memusage[$location] = memory_get_usage();
-}
+  if ( isset($memusage) ) {
+      $memusage[$location] = memory_get_usage();
+  }
+  }
 }
 
 /**

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

Doc Comments +4 added lines, -4 removed lines

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

Switch Indentation +35 added lines, -35 removed lines

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

Spacing +34 added lines, -34 removed lines

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

Braces +69 added lines, -48 removed lines

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

Indentation +413 added lines, -414 removed lines

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