chamilo / chamilo-lms

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

Indentation +149 added lines, -150 removed lines

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

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

Indentation +57 added lines, -57 removed lines

@@ -1,40 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: table_row_group_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-6 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: table_row_group_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-6 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: table_row_group_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -48,26 +48,26 @@ 
  */
 class Table_Row_Group_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame   Frame to decorate
-   * @param DOMPDF $dompdf Current dompdf instance
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame   Frame to decorate
+     * @param DOMPDF $dompdf Current dompdf instance
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
-  }
+    }
 
-  /**
-   * Override split() to remove all child rows and this element from the cellmap
-   *
-   * @param Frame $child
-   */
-  function split($child = null) {
+    /**
+     * Override split() to remove all child rows and this element from the cellmap
+     *
+     * @param Frame $child
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
 
@@ -76,21 +76,21 @@ 
     $iter = $child;
 
     while ( $iter ) {
-      $cellmap->remove_row($iter);
-      $iter = $iter->get_next_sibling();
+        $cellmap->remove_row($iter);
+        $iter = $iter->get_next_sibling();
     }
 
     // If we are splitting at the first child remove the
     // table-row-group from the cellmap as well
     if ( $child === $this->get_first_child() ) {
-      $cellmap->remove_row_group($this);
-      parent::split();
-      return;
+        $cellmap->remove_row_group($this);
+        parent::split();
+        return;
     }
     
     $cellmap->update_row_group($this, $child->get_prev_sibling());
     parent::split($child);
     
-  }
+    }
 }
  

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

Indentation +188 added lines, -189 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,73 +45,73 @@ 
  * @package dompdf
  */
 class Table_Frame_Decorator extends Frame_Decorator {
-  static $VALID_CHILDREN = array("table-row-group",
-                                 "table-row",
-                                 "table-header-group",
-                                 "table-footer-group",
-                                 "table-column",
-                                 "table-column-group",
-                                 "table-caption",
-                                 "table-cell");
-
-  static $ROW_GROUPS = array('table-row-group',
-                             'table-header-group',
-                             'table-footer-group');
-
-  /**
-   * The Cellmap object for this table.  The cellmap maps table cells
-   * to rows and columns, and aids in calculating column widths.
-   *
-   * @var Cellmap
-   */
-  protected $_cellmap;
-
-  /**
-   * The minimum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_min_width;
-
-  /**
-   * The maximum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_max_width;
-
-  /**
-   * Table header rows.  Each table header is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_headers;
-
-  /**
-   * Table footer rows.  Each table footer is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_footers;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    static $VALID_CHILDREN = array("table-row-group",
+                                    "table-row",
+                                    "table-header-group",
+                                    "table-footer-group",
+                                    "table-column",
+                                    "table-column-group",
+                                    "table-caption",
+                                    "table-cell");
+
+    static $ROW_GROUPS = array('table-row-group',
+                                'table-header-group',
+                                'table-footer-group');
+
+    /**
+     * The Cellmap object for this table.  The cellmap maps table cells
+     * to rows and columns, and aids in calculating column widths.
+     *
+     * @var Cellmap
+     */
+    protected $_cellmap;
+
+    /**
+     * The minimum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_min_width;
+
+    /**
+     * The maximum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_max_width;
+
+    /**
+     * Table header rows.  Each table header is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_headers;
+
+    /**
+     * Table footer rows.  Each table footer is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_footers;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_cellmap = new Cellmap($this);
     $this->_min_width = null;
     $this->_max_width = null;
     $this->_headers = array();
     $this->_footers = array();
-  }
+    }
 
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_cellmap->reset();
     $this->_min_width = null;
@@ -120,22 +119,22 @@ 
     $this->_headers = array();
     $this->_footers = array();
     $this->_reflower->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split the table at $row.  $row and all subsequent rows will be
-   * added to the clone.  This method is overidden in order to remove
-   * frames from the cellmap properly.
-   *
-   * @param Frame $row
-   */
-  function split($child = null) {
+    /**
+     * split the table at $row.  $row and all subsequent rows will be
+     * added to the clone.  This method is overidden in order to remove
+     * frames from the cellmap properly.
+     *
+     * @param Frame $row
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
     // If $child is a header or if it is the first non-header row, do
@@ -143,200 +142,200 @@ 
     if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
          !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
 
-      $first_header = null;
+        $first_header = null;
 
-      // Insert copies of the table headers before $child
-      foreach ($this->_headers as $header) {
+        // Insert copies of the table headers before $child
+        foreach ($this->_headers as $header) {
 
         $new_header = $header->deep_copy();
 
         if ( is_null($first_header) )
-          $first_header = $new_header;
+            $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
-      }
+        }
 
-      parent::split($first_header);
+        parent::split($first_header);
 
     } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
 
-      // Individual rows should have already been handled
-      parent::split($child);
+        // Individual rows should have already been handled
+        parent::split($child);
 
     } else {
 
-      $iter = $child;
+        $iter = $child;
 
-      while ($iter) {
+        while ($iter) {
         $this->_cellmap->remove_row($iter);
         $iter = $iter->get_next_sibling();
-      }
+        }
 
-      parent::split($child);
+        parent::split($child);
+    }
     }
-  }
 
-  /**
-   * Static function to locate the parent table of a frame
-   *
-   * @param Frame $frame
-   * @return Frame the table that is an ancestor of $frame
-   */
-  static function find_parent_table(Frame $frame) {
+    /**
+     * Static function to locate the parent table of a frame
+     *
+     * @param Frame $frame
+     * @return Frame the table that is an ancestor of $frame
+     */
+    static function find_parent_table(Frame $frame) {
 
     while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+        if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
 
     return $frame;
-  }
-
-  /**
-   * Return this table's Cellmap
-   *
-   * @return Cellmap
-   */
-  function get_cellmap() { return $this->_cellmap; }
-
-  /**
-   * Return the minimum width of this table
-   *
-   * @return float
-   */
-  function get_min_width() { return $this->_min_width; }
-
-  /**
-   * Return the maximum width of this table
-   *
-   * @return float
-   */
-  function get_max_width() { return $this->_max_width; }
-
-  /**
-   * Set the minimum width of the table
-   *
-   * @param float $width the new minimum width
-   */
-  function set_min_width($width) { $this->_min_width = $width; }
-
-  /**
-   * Set the maximum width of the table
-   *
-   * @param float $width the new maximum width
-   */
-  function set_max_width($width) { $this->_max_width = $width; }
-
-  /**
-   * Restructure tree so that the table has the correct structure.
-   * Invalid children (i.e. all non-table-rows) are moved below the
-   * table.
-   */
-  function normalise() {
+    }
+
+    /**
+     * Return this table's Cellmap
+     *
+     * @return Cellmap
+     */
+    function get_cellmap() { return $this->_cellmap; }
+
+    /**
+     * Return the minimum width of this table
+     *
+     * @return float
+     */
+    function get_min_width() { return $this->_min_width; }
+
+    /**
+     * Return the maximum width of this table
+     *
+     * @return float
+     */
+    function get_max_width() { return $this->_max_width; }
+
+    /**
+     * Set the minimum width of the table
+     *
+     * @param float $width the new minimum width
+     */
+    function set_min_width($width) { $this->_min_width = $width; }
+
+    /**
+     * Set the maximum width of the table
+     *
+     * @param float $width the new maximum width
+     */
+    function set_max_width($width) { $this->_max_width = $width; }
+
+    /**
+     * Restructure tree so that the table has the correct structure.
+     * Invalid children (i.e. all non-table-rows) are moved below the
+     * table.
+     */
+    function normalise() {
 
     // Store frames generated by invalid tags and move them outside the table
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
     while ( $iter ) {
-      $child = $iter;
-      $iter = $iter->get_next_sibling();
+        $child = $iter;
+        $iter = $iter->get_next_sibling();
 
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+        if ( $anon_row ) {
 
         if ( $display === "table-row" ) {
-          // Add the previous anonymous row
-          $this->insert_child_before($table_row, $child);
+            // Add the previous anonymous row
+            $this->insert_child_before($table_row, $child);
 
-          $table_row->normalise();
-          $child->normalise();
-          $anon_row = false;
-          continue;
+            $table_row->normalise();
+            $child->normalise();
+            $anon_row = false;
+            continue;
         }
 
         // add the child to the anonymous row
         $table_row->append_child($child);
         continue;
 
-      } else {
+        } else {
 
         if ( $display === "table-row" ) {
-          $child->normalise();
-          continue;
+            $child->normalise();
+            continue;
         }
 
         if ( $display === "table-cell") {
-          // Create an anonymous table row
-          $tr = $this->get_node()->ownerDocument->createElement("tr");
+            // Create an anonymous table row
+            $tr = $this->get_node()->ownerDocument->createElement("tr");
 
-          $frame = new Frame($tr);
+            $frame = new Frame($tr);
 
-          $css = $this->get_style()->get_stylesheet();
-          $style = $css->create_style();
-          $style->inherit($this->get_style());
+            $css = $this->get_style()->get_stylesheet();
+            $style = $css->create_style();
+            $style->inherit($this->get_style());
 
-          // Lookup styles for tr tags.  If the user wants styles to work
-          // better, they should make the tr explicit... I'm not going to
-          // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+            // Lookup styles for tr tags.  If the user wants styles to work
+            // better, they should make the tr explicit... I'm not going to
+            // try to guess what they intended.
+            if ( $tr_style = $css->lookup("tr") )
             $style->merge($tr_style);
 
-          // Okay, I have absolutely no idea why I need this clone here, but
-          // if it's omitted, php (as of 2004-07-28) segfaults.
-          $frame->set_style(clone $style);
-          $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
-          $table_row->set_root($this->_root);
+            // Okay, I have absolutely no idea why I need this clone here, but
+            // if it's omitted, php (as of 2004-07-28) segfaults.
+            $frame->set_style(clone $style);
+            $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
+            $table_row->set_root($this->_root);
 
-          // Add the cell to the row
-          $table_row->append_child($child);
+            // Add the cell to the row
+            $table_row->append_child($child);
 
-          $anon_row = true;
-          continue;
+            $anon_row = true;
+            continue;
         }
 
         if ( !in_array($display, self::$VALID_CHILDREN) ) {
-          $erroneous_frames[] = $child;
-          continue;
+            $erroneous_frames[] = $child;
+            continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+            if ( $grandchild->get_style()->display === "table-row" )
             $grandchild->normalise();
         }
 
         // Add headers and footers
         if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
+            $this->_headers[] = $child;
 
         else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
-      }
+            $this->_footers[] = $child;
+        }
     }
 
     if ( $anon_row ) {
-      // Add the row to the table
-      $this->_frame->append_child($table_row);
-      $table_row->normalise();
-      $this->_cellmap->add_row();
+        // Add the row to the table
+        $this->_frame->append_child($table_row);
+        $table_row->normalise();
+        $this->_cellmap->add_row();
     }
 
     foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+        $this->move_after($frame);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Moves the specified frame and it's corresponding node outside of
-   * the table.
-   *
-   * @param Frame $frame the frame to move
-   */
-  function move_after(Frame $frame) {
+    /**
+     * Moves the specified frame and it's corresponding node outside of
+     * the table.
+     *
+     * @param Frame $frame the frame to move
+     */
+    function move_after(Frame $frame) {
     $this->get_parent()->insert_child_after($frame, $this);
-  }
+    }
 
 }

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

Indentation +2 added lines, -3 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: null_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,13 +46,13 @@ 
  */
 class Null_Frame_Decorator extends Frame_Decorator {
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $style = $this->_frame->get_style();
     $style->width = 0;
     $style->height = 0;
     $style->margin = 0;
     $style->padding = 0;
-  }
+    }
 
 }

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

Indentation +93 added lines, -94 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_frame_reflower.cls.php,v $
- * Created on: 2004-06-16
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: page_frame_reflower.cls.php,v $
+     * Created on: 2004-06-16
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: page_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,25 +46,25 @@ 
  */
 class Page_Frame_Reflower extends Frame_Reflower {
 
-  /**
-   * Cache of the callbacks array
-   * 
-   * @var array
-   */
-  private $_callbacks;
+    /**
+     * Cache of the callbacks array
+     * 
+     * @var array
+     */
+    private $_callbacks;
   
-  /**
-   * Cache of the canvas
-   *
-   * @var Canvas
-   */
-  private $_canvas;
+    /**
+     * Cache of the canvas
+     *
+     * @var Canvas
+     */
+    private $_canvas;
 
-  function __construct(Page_Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Page_Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
     
     // Paged layout:
@@ -88,74 +87,74 @@ 
 
     while ($child) {
 
-      $child->set_containing_block($content_x, $content_y, $content_width, $content_height);
+        $child->set_containing_block($content_x, $content_y, $content_width, $content_height);
       
-      // Check for begin reflow callback
-      $this->_check_callbacks("begin_page_reflow", $child);
+        // Check for begin reflow callback
+        $this->_check_callbacks("begin_page_reflow", $child);
       
-      $child->reflow();
-      $next_child = $child->get_next_sibling();
+        $child->reflow();
+        $next_child = $child->get_next_sibling();
       
-      // Check for begin render callback
-      $this->_check_callbacks("begin_page_render", $child);
+        // Check for begin render callback
+        $this->_check_callbacks("begin_page_render", $child);
       
-      // Render the page
-      $this->_frame->get_renderer()->render($child);
+        // Render the page
+        $this->_frame->get_renderer()->render($child);
       
-      // Check for end render callback
-      $this->_check_callbacks("end_page_render", $child);
+        // Check for end render callback
+        $this->_check_callbacks("end_page_render", $child);
       
-      if ( $next_child )
-      {
+        if ( $next_child )
+        {
         $this->_frame->next_page();
-      }
+        }
 
-      // Wait to dispose of all frames on the previous page
-      // so callback will have access to them
-      if ( $prev_child )
-      {
+        // Wait to dispose of all frames on the previous page
+        // so callback will have access to them
+        if ( $prev_child )
+        {
         $prev_child->dispose(true);
-      }
-      $prev_child = $child;
-      $child = $next_child;
+        }
+        $prev_child = $child;
+        $child = $next_child;
     }
 
     // Dispose of previous page if it still exists
     if ( $prev_child )
     {
-      $prev_child->dispose(true);
+        $prev_child->dispose(true);
     }
-  }  
+    }  
   
-  //........................................................................
+    //........................................................................
   
-  /**
-   * Check for callbacks that need to be performed when a given event
-   * gets triggered on a page
-   *
-   * @param string $event the type of event
-   * @param Frame $frame the frame that event is triggered on
-   */
-  protected function _check_callbacks($event, $frame) {
+    /**
+     * Check for callbacks that need to be performed when a given event
+     * gets triggered on a page
+     *
+     * @param string $event the type of event
+     * @param Frame $frame the frame that event is triggered on
+     */
+    protected function _check_callbacks($event, $frame) {
     if (!isset($this->_callbacks)) {
-      $dompdf = $this->_frame->get_dompdf();
-      $this->_callbacks = $dompdf->get_callbacks();
-      $this->_canvas = $dompdf->get_canvas();
+        $dompdf = $this->_frame->get_dompdf();
+        $this->_callbacks = $dompdf->get_callbacks();
+        $this->_canvas = $dompdf->get_canvas();
     }
     
     if (is_array($this->_callbacks) && isset($this->_callbacks[$event])) {
-      $info = array(0 => $this->_canvas, "canvas" => $this->_canvas,
+        $info = array(0 => $this->_canvas, "canvas" => $this->_canvas,
                     1 => $frame, "frame" => $frame);
-      $fs = $this->_callbacks[$event];
-      foreach ($fs as $f) {
+        $fs = $this->_callbacks[$event];
+        foreach ($fs as $f) {
         if (is_callable($f)) {
-          if (is_array($f)) {
+            if (is_array($f)) {
             $f[0]->$f[1]($info);
-          } else {
+            } else {
             $f($info);
-          }
+            }
+        }
         }
-      }
     }
-  }  
+    }  
 }

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

Indentation +18 added lines, -19 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,26 +46,26 @@ 
  */
 class Block_Renderer extends Abstract_Renderer {
 
-  //........................................................................
+    //........................................................................
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
     $style = $frame->get_style();
     list($x, $y, $w, $h) = $frame->get_padding_box();
 
     // Draw our background, border and content
     if ( ($bg = $style->background_color) !== "transparent" ) {
-      $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color );
+        $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color );
     }
 
     if ( ($url = $style->background_image) && $url !== "none" )
-      $this->_background_image($url, $x, $y, $w, $h, $style);
+        $this->_background_image($url, $x, $y, $w, $h, $style);
 
 
     $this->_render_border($frame);
 
-  }
+    }
 
-  protected function _render_border(Frame_Decorator $frame, $corner_style = "bevel") {
+    protected function _render_border(Frame_Decorator $frame, $corner_style = "bevel") {
     $cb = $frame->get_containing_block();
     $style = $frame->get_style();
 
@@ -79,36 +78,36 @@ 
                     $style->length_in_pt($bp["left"]["width"]));
 
     foreach ($bp as $side => $props) {
-      list($x, $y, $w, $h) = $bbox;
+        list($x, $y, $w, $h) = $bbox;
 
-      if ( !$props["style"] || $props["style"] === "none" || $props["width"] <= 0 )
+        if ( !$props["style"] || $props["style"] === "none" || $props["width"] <= 0 )
         continue;
 
 
-      switch($side) {
-      case "top":
+        switch($side) {
+        case "top":
         $length = $w;
         break;
 
-      case "bottom":
+        case "bottom":
         $length = $w;
         $y += $h;
         break;
 
-      case "left":
+        case "left":
         $length = $h;
         break;
 
-      case "right":
+        case "right":
         $length = $h;
         $x += $w;
         break;
-      default:
+        default:
         break;
-      }
-      $method = "_border_" . $props["style"];
+        }
+        $method = "_border_" . $props["style"];
 
-      $this->$method($x, $y, $length, $props["color"], $widths, $side, $corner_style);
+        $this->$method($x, $y, $length, $props["color"], $widths, $side, $corner_style);
+    }
     }
-  }
 }

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

Indentation +53 added lines, -54 removed lines

@@ -1,47 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: inline_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>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
-
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 20090610
- * - don't repeat non repeatable background images after a line break
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: inline_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>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 20090610
+     * - don't repeat non repeatable background images after a line break
+     */
 
 /* $Id: inline_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -53,17 +52,17 @@ 
  */
 class Inline_Frame_Decorator extends Frame_Decorator {
   
-  function __construct(Frame $frame, DOMPDF $dompdf) { parent::__construct($frame, $dompdf); }
+    function __construct(Frame $frame, DOMPDF $dompdf) { parent::__construct($frame, $dompdf); }
 
-  function split($frame = null) {
+    function split($frame = null) {
 
     if ( is_null($frame) ) {
-      $this->get_parent()->split($this);
-      return;
+        $this->get_parent()->split($this);
+        return;
     }
     
     if ( $frame->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() ); 
     $this->get_parent()->insert_child_after($split, $this);
@@ -86,18 +85,18 @@ 
     //See e.g. in testcase image_variants, long desriptions
     if ( ($url = $style->background_image) && $url !== "none"
          && ($repeat = $style->background_repeat) && $repeat !== "repeat" &&  $repeat !== "repeat-y"
-       ) {
-      $style->background_image = "none";
+        ) {
+        $style->background_image = "none";
     }           
 
     // Add $frame and all following siblings to the new split node
     $iter = $frame;
     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);
+    }
     }
-  }
   
 } 

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

Indentation +38 added lines, -39 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: null_positioner.cls.php,v $
- * Created on: 2004-07-12
- *
- * 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: null_positioner.cls.php,v $
+     * Created on: 2004-07-12
+     *
+     * 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: null_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,10 +46,10 @@ 
  */
 class Null_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) {
+    function __construct(Frame_Decorator $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function position() { return; }
+    function position() { return; }
   
 }

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

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