chamilo / chamilo-lms

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

Indentation +343 added lines, -344 removed lines

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

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

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;

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();
+  }
+  }
 }
 
 /**

Indentation +184 added lines, -184 removed lines

@@ -1,52 +1,52 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: functions.inc.php,v $
- * Created on: 2004-08-04
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - trailing slash of base_path in build_url is no longer optional when
- *   required. This allows paths not ending in a slash, e.g. on dynamically
- *   created sites with page id in the url parameters.
- * @version 20090601
- * - fix windows paths
- * @version 20090610
- * - relax windows path syntax, use uniform path delimiter. Used for background images.
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: functions.inc.php,v $
+     * Created on: 2004-08-04
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - trailing slash of base_path in build_url is no longer optional when
+     *   required. This allows paths not ending in a slash, e.g. on dynamically
+     *   created sites with page id in the url parameters.
+     * @version 20090601
+     * - fix windows paths
+     * @version 20090610
+     * - relax windows path syntax, use uniform path delimiter. Used for background images.
+     */
 
 /* $Id: functions.inc.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -63,18 +63,18 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
+    if ($return)
     return "<pre>" . print_r($mixed, true) . "</pre>";
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo ("<pre>");
-  print_r($mixed);
+    print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
-  else
+    else
     echo ("\n");
-  flush();
+    flush();
 
 }
 }
@@ -89,10 +89,10 @@ 
  */
 if ( !function_exists("pre_var_dump") ) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo("<pre>");
-  var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
+    var_dump($mixed);
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
 }
 }
@@ -115,41 +115,41 @@ 
  * is appended (o.k. also for Windows)
  */
 function build_url($protocol, $host, $base_path, $url) {
-  if ( mb_strlen($url) == 0 ) {
+    if ( mb_strlen($url) == 0 ) {
     //return $protocol . $host . rtrim($base_path, "/\\") . "/";
     return $protocol . $host . $base_path;
-  }
+    }
 
-  // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
+    // Is the url already fully qualified?
+    if ( mb_strpos($url, "://") !== false )
     return $url;
 
-  $ret = $protocol;
+    $ret = $protocol;
 
-  if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
+    if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
     //On Windows local file, an abs path can begin also with a '\' or a drive letter and colon
     //drive: followed by a relative path would be a drive specific default folder.
     //not known in php app code, treat as abs path
     //($url[1] !== ':' || ($url[2]!=='\\' && $url[2]!=='/'))
     if ($url[0] !== '/' && (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' || ($url[0] !== '\\' && $url[1] !== ':'))) {
-      // For rel path and local acess we ignore the host, and run the path through realpath()
-      $ret .= realpath($base_path).'/';
+        // For rel path and local acess we ignore the host, and run the path through realpath()
+        $ret .= realpath($base_path).'/';
     }
     $ret .= $url;
     return $ret;
-  }
+    }
 
-  //remote urls with backslash in html/css are not really correct, but lets be genereous
-  if ( $url[0] === '/' || $url[0] === '\\' ) {
+    //remote urls with backslash in html/css are not really correct, but lets be genereous
+    if ( $url[0] === '/' || $url[0] === '\\' ) {
     // Absolute path
     $ret .= $host . $url;
-  } else {
+    } else {
     // Relative path
     //$base_path = $base_path !== "" ? rtrim($base_path, "/\\") . "/" : "";
     $ret .= $host . $base_path . $url;
-  }
+    }
 
-  return $ret;
+    return $ret;
 
 }
 
@@ -161,56 +161,56 @@ 
  * @return array
  */
 function explode_url($url) {
-  $protocol = "";
-  $host = "";
-  $path = "";
-  $file = "";
+    $protocol = "";
+    $host = "";
+    $path = "";
+    $file = "";
 
-  $arr = parse_url($url);
+    $arr = parse_url($url);
 
-  if ( isset($arr["scheme"]) &&
+    if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
        mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
 
     if ( isset($arr["user"]) ) {
-      $host .= $arr["user"];
+        $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
+        if ( isset($arr["pass"]) )
         $host .= "@" . $arr["pass"];
 
-      $host .= ":";
+        $host .= ":";
     }
 
     if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+        $host .= $arr["host"];
 
     if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+        $host .= ":" . $arr["port"];
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
-      // Do we have a trailing slash?
-      if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
+        // Do we have a trailing slash?
+        if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
         $path = $arr["path"];
         $file = "";
-      } else {
+        } else {
         $path = dirname($arr["path"]) . "/";
         $file = basename($arr["path"]);
-      }
+        }
     }
 
     if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+        $file .= "?" . $arr["query"];
 
     if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+        $file .= "#" . $arr["fragment"];
 
-  } else {
+    } else {
 
     $i = mb_strpos($url, "file://");
     if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+        $url = mb_substr($url, $i + 7);
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -222,28 +222,28 @@ 
 
     // Check that the path exists
     if ( $path !== false ) {
-      $path .= '/';
+        $path .= '/';
 
     } else {
-      // generate a url to access the file if no real path found.
-      $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
+        // generate a url to access the file if no real path found.
+        $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
 
-      $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
+        $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
 
-      if ( substr($arr["path"], 0, 1) === '/' ) {
+        if ( substr($arr["path"], 0, 1) === '/' ) {
         $path = dirname($arr["path"]);
-      } else {
+        } else {
         $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"];
-      }
+        }
+    }
     }
-  }
-
-  $ret = array($protocol, $host, $path, $file,
-               "protocol" => $protocol,
-               "host" => $host,
-               "path" => $path,
-               "file" => $file);
-  return $ret;
+
+    $ret = array($protocol, $host, $path, $file,
+                "protocol" => $protocol,
+                "host" => $host,
+                "path" => $path,
+                "file" => $file);
+    return $ret;
 }
 
 /**
@@ -254,41 +254,41 @@ 
  */
 function dec2roman($num) {
 
-  static $ones = array("", "i", "ii", "iii", "iv", "v",
-                       "vi", "vii", "viii", "ix");
-  static $tens = array("", "x", "xx", "xxx", "xl", "l",
-                       "lx", "lxx", "lxxx", "xc");
-  static $hund = array("", "c", "cc", "ccc", "cd", "d",
-                       "dc", "dcc", "dccc", "cm");
-  static $thou = array("", "m", "mm", "mmm");
+    static $ones = array("", "i", "ii", "iii", "iv", "v",
+                        "vi", "vii", "viii", "ix");
+    static $tens = array("", "x", "xx", "xxx", "xl", "l",
+                        "lx", "lxx", "lxxx", "xc");
+    static $hund = array("", "c", "cc", "ccc", "cd", "d",
+                        "dc", "dcc", "dccc", "cm");
+    static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
+    if ( !is_numeric($num) )
     throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
 
-  if ( $num > 4000 || $num < 0 )
+    if ( $num > 4000 || $num < 0 )
     return "(out of range)";
 
-  $num = strrev((string)$num);
+    $num = strrev((string)$num);
 
-  $ret = "";
-  switch (mb_strlen($num)) {
+    $ret = "";
+    switch (mb_strlen($num)) {
 
-  case 4:
+    case 4:
     $ret .= $thou[$num[3]];
 
-  case 3:
+    case 3:
     $ret .= $hund[$num[2]];
 
-  case 2:
+    case 2:
     $ret .= $tens[$num[1]];
 
-  case 1:
+    case 1:
     $ret .= $ones[$num[0]];
 
-  default:
+    default:
     break;
-  }
-  return $ret;
+    }
+    return $ret;
 
 }
 
@@ -305,84 +305,84 @@ 
  */
 
 if ( !function_exists("mb_convert_encoding") ) {
-  function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
+    function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
-      return utf8_encode($data);
+        return utf8_encode($data);
     } else {
-      return utf8_decode($data);
+        return utf8_decode($data);
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_detect_encoding") ) {
-  function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
+    function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
     return 'iso-8859-1';
-  }
+    }
 }
 
 if ( !function_exists("mb_detect_order") ) {
-  function mb_detect_order($encoding_list=array('iso-8859-1')) {
+    function mb_detect_order($encoding_list=array('iso-8859-1')) {
     return 'iso-8859-1';
-  }
+    }
 }
 
 if ( !function_exists("mb_internal_encoding") ) {
-  function mb_internal_encoding($encoding=NULL) {
+    function mb_internal_encoding($encoding=NULL) {
     if (isset($encoding)) {
-      return true;
+        return true;
     } else {
-      return 'iso-8859-1';
+        return 'iso-8859-1';
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strlen") ) {
-  function mb_strlen($str, $encoding='iso-8859-1') {
+    function mb_strlen($str, $encoding='iso-8859-1') {
     if (str_replace('-', '', strtolower($encoding)) == 'utf8') {
-      return strlen(utf8_encode($data));
+        return strlen(utf8_encode($data));
     } else {
-      return strlen(utf8_decode($data));
+        return strlen(utf8_decode($data));
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strpos") ) {
-  function mb_strpos($haystack, $needle, $offset = 0) {
+    function mb_strpos($haystack, $needle, $offset = 0) {
     return strpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strrpos") ) {
-  function mb_strrpos($haystack, $needle, $offset = 0) {
+    function mb_strrpos($haystack, $needle, $offset = 0) {
     return strrpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtolower") ) {
-  function mb_strtolower($str) {
+    function mb_strtolower($str) {
     return strtolower($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtoupper") ) {
-  function mb_strtoupper($str) {
+    function mb_strtoupper($str) {
     return strtoupper($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_substr") ) {
-  function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
+    function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
     if ( is_null($length) )
-      return substr($str, $start);
+        return substr($str, $start);
     else
-      return substr($str, $start, $length);
-  }
+        return substr($str, $start, $length);
+    }
 }
 
 if ( !function_exists("mb_substr_count") ) {
-  function mb_substr_count($haystack, $needle) {
+    function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
-  }
+    }
 }
 
 /**
@@ -402,40 +402,40 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+    if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
     throw new DOMPDF_Exception($errstr . " $errno");
 
-  global $_dompdf_warnings;
-  global $_dompdf_show_warnings;
+    global $_dompdf_warnings;
+    global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
+    if ( $_dompdf_show_warnings )
     echo $errstr . "\n";
 
-  $_dompdf_warnings[] = $errstr;
+    $_dompdf_warnings[] = $errstr;
 }
 
 /**
  * Print a useful backtrace
  */
 function bt() {
-  $bt = debug_backtrace();
+    $bt = debug_backtrace();
 
-  array_shift($bt); // remove actual bt() call
-  echo "\n";
+    array_shift($bt); // remove actual bt() call
+    echo "\n";
 
-  $i = 0;
-  foreach ($bt as $call) {
+    $i = 0;
+    foreach ($bt as $call) {
     $file = basename($call["file"]) . " (" . $call["line"] . ")";
     if ( isset($call["class"]) ) {
-      $func = $call["class"] . "->" . $call["function"] . "()";
+        $func = $call["class"] . "->" . $call["function"] . "()";
     } else {
-      $func = $call["function"] . "()";
+        $func = $call["function"] . "()";
     }
 
     echo "#" . str_pad($i, 2, " ", STR_PAD_RIGHT) . ": " . str_pad($file.":", 42) . " $func\n";
     $i++;
-  }
-  echo "\n";
+    }
+    echo "\n";
 }
 
 /**
@@ -444,15 +444,15 @@ 
  * @param string $type  The type of debug messages to print
  */
 function dompdf_debug($type, $msg) {
-  global $_DOMPDF_DEBUG_TYPES;
-  global $_dompdf_show_warnings;
-  global $_dompdf_debug;
-  if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
+    global $_DOMPDF_DEBUG_TYPES;
+    global $_dompdf_show_warnings;
+    global $_dompdf_debug;
+    if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
     $arr = debug_backtrace();
 
     echo basename($arr[0]["file"]) . " (" . $arr[0]["line"] ."): " . $arr[1]["function"] . ": ";
     pre_r($msg);
-  }
+    }
 }
 
 /**
@@ -460,20 +460,20 @@ 
  */
 if ( !function_exists("print_memusage") ) {
 function print_memusage() {
-  global $memusage;
-  echo ("Memory Usage\n");
-  $prev = 0;
-  $initial = reset($memusage);
-  echo (str_pad("Initial:", 40) . $initial . "\n\n");
+    global $memusage;
+    echo ("Memory Usage\n");
+    $prev = 0;
+    $initial = reset($memusage);
+    echo (str_pad("Initial:", 40) . $initial . "\n\n");
 
-  foreach ($memusage as $key=>$mem) {
+    foreach ($memusage as $key=>$mem) {
     $mem -= $initial;
     echo (str_pad("$key:" , 40));
     echo (str_pad("$mem", 12) . "(diff: " . ($mem - $prev) . ")\n");
     $prev = $mem;
-  }
+    }
 
-  echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
+    echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
 }
 }
 
@@ -495,8 +495,8 @@ 
  */
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
-  global $memusage;
-  if ( isset($memusage) )
+    global $memusage;
+    if ( isset($memusage) )
     $memusage[$location] = memory_get_usage();
 }
 }
@@ -507,7 +507,7 @@ 
  * @link http://us.php.net/manual/en/function.sys-get-temp-dir.php#85261
  */
 if ( !function_exists('sys_get_temp_dir')) {
-  function sys_get_temp_dir() {
+    function sys_get_temp_dir() {
     if (!empty($_ENV['TMP'])) { return realpath($_ENV['TMP']); }
     if (!empty($_ENV['TMPDIR'])) { return realpath( $_ENV['TMPDIR']); }
     if (!empty($_ENV['TEMP'])) { return realpath( $_ENV['TEMP']); }
@@ -516,5 +516,5 @@ 
     unlink($tempfile);
     return realpath(dirname($tempfile));
     }
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/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) {    

Indentation +378 added lines, -379 removed lines

@@ -34,7 +34,6 @@ 
  * @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;
-  }
+    }
   
   
 }

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

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

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
   /**
    * Return the bullet's width
    *
-   * @return int
+   * @return double
    */
   function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
@@ -159,7 +159,7 @@ 
   /**
    * Override get_margin_height()
    *
-   * @return int
+   * @return double
    */
   function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box

Spacing +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     // Resample the bullet image to be consistent with 'auto' sized images
     // See also Image_Frame_Reflower::get_min_max_width
     // Tested php ver: value measured in px, suffix "px" not in value: rtrim unnecessary.
-    $this->_width = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-    $this->_height = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+    $this->_width = (((float) rtrim($width, "px")) * 72) / DOMPDF_DPI;
+    $this->_height = (((float) rtrim($height, "px")) * 72) / DOMPDF_DPI;
  
     //If an image is taller as the containing block/box, the box should be extended.
     //Neighbour elements are overwriting the overlapping image areas.
@@ -116,7 +116,7 @@ 
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
-    return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
+    return $this->_frame->get_style()->get_font_size() * List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
   }
 
@@ -145,7 +145,7 @@ 
 
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
-    if ( $this->_frame->get_style()->list_style_position === "outside" ||
+    if ($this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
       return 0;
     //This aligns the "inside" image position with the text.

Braces +3 added lines, -2 removed lines

@@ -146,8 +146,9 @@
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
-         $this->_width == 0) 
-      return 0;
+         $this->_width == 0) {
+          return 0;
+    }
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.

Indentation +110 added lines, -110 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: list_bullet_image_frame_decorator.cls.php,v $
- * Created on: 2005-06-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>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - added comment
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: list_bullet_image_frame_decorator.cls.php,v $
+     * Created on: 2005-06-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>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - added comment
+     */
 
 /* $Id: list_bullet_image_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -52,34 +52,34 @@ 
  */
 class List_Bullet_Image_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * The underlying image frame
-   * 
-   * @var Image_Frame_Decorator
-   */
-  protected $_img;
+    /**
+     * The underlying image frame
+     * 
+     * @var Image_Frame_Decorator
+     */
+    protected $_img;
 
-  /**
-   * The image's width in pixels
-   *
-   * @var int
-   */
-  protected $_width;
+    /**
+     * The image's width in pixels
+     *
+     * @var int
+     */
+    protected $_width;
   
-  /**
-   * The image's height in pixels
-   *
-   * @var int
-   */
-  protected $_height;
+    /**
+     * The image's height in pixels
+     *
+     * @var int
+     */
+    protected $_height;
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the bullet frame to decorate
-   * @param DOMPDF $dompdf the document's dompdf object
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the bullet frame to decorate
+     * @param DOMPDF $dompdf the document's dompdf object
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     $style = $frame->get_style();
     $url = $style->list_style_image;
     $frame->get_node()->setAttribute("src", $url);
@@ -104,38 +104,38 @@ 
     //  $style->min_height = $this->_height;
     //}
     //$style->height = "auto";   
-  }
+    }
 
-  /**
-   * Return the bullet's width
-   *
-   * @return int
-   */
-  function get_width() {
+    /**
+     * Return the bullet's width
+     *
+     * @return int
+     */
+    function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
     return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return the bullet's height
-   *
-   * @return int
-   */
-  function get_height() {
+    /**
+     * Return the bullet's height
+     *
+     * @return int
+     */
+    function get_height() {
     //based on image height
     return $this->_height;
-  }
+    }
   
-  /**
-   * Override get_margin_width
-   *
-   * @return int
-   */
-  function get_margin_width() {
+    /**
+     * Override get_margin_width
+     *
+     * @return int
+     */
+    function get_margin_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the extra indentation of text to make room for the bullet image.
@@ -147,42 +147,42 @@ 
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
-      return 0;
+        return 0;
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.
     //Where this comes from is unknown.
     //The corresponding List_Bullet_Frame_Decorator sets a smaller margin. bullet size?
     return $this->_width + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Override get_margin_height()
-   *
-   * @return int
-   */
-  function get_margin_height() {
+    /**
+     * Override get_margin_height()
+     *
+     * @return int
+     */
+    function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box
     //based on image height
     return $this->_height + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return image url
-   *
-   * @return string
-   */
-  function get_image_url() {
+    /**
+     * Return image url
+     *
+     * @return string
+     */
+    function get_image_url() {
     return $this->_img->get_image_url();
-  }
+    }
 
-  /**
-   * Return the image extension
-   *
-   * @return string
-   */
-  function get_image_ext() {
+    /**
+     * Return the image extension
+     *
+     * @return string
+     */
+    function get_image_ext() {
     return $this->_img->get_image_ext();
-  }
+    }
   
 }

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

Doc Comments +7 added lines

@@ -70,12 +70,19 @@
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
+  /**
+   * @param string $sql
+   */
   private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
+  /**
+   * @param integer $page_num
+   * @param string|null $data
+   */
   static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
       "page_num=". pg_escape_string($page_num);

Indentation +70 added lines, -71 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -57,13 +57,13 @@ 
   static private $__connection = null;
   
   function init() {
-    if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
-        " dbname=" . self::DB_NAME .
-        " user=" . self::DB_USER .
-        " password=" . self::DB_PASS;
+    if (is_null(self::$__connection)) {
+      $con_str = "host=".DB_HOST.
+        " dbname=".self::DB_NAME.
+        " user=".self::DB_USER.
+        " password=".self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+      if (!self::$__connection = pg_connect($con_str))
         throw new Exception("Database connection failed.");
     }
   }
@@ -71,36 +71,36 @@ 
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
+    if (!($res = pg_query(self::$__connection, $sql)))
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
   static function store_page($id, $page_num, $data) {
-    $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+    $where = "WHERE id='".pg_escape_string($id)."' AND ".
+      "page_num=".pg_escape_string($page_num);
 
-    $res = self::__query("SELECT timestamp FROM page_cache ". $where);
+    $res = self::__query("SELECT timestamp FROM page_cache ".$where);
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    if ($row) 
+      self::__query("UPDATE page_cache SET data='".pg_escape_string($data)."' ".$where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('".pg_escape_string($id)."', ".
+                     pg_escape_string($page_num).", ".
+                     "'".pg_escape_string($data)."')");
 
   }
 
   static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
-    self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    self::__query("DELETE FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
-                    pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('".
+                    pg_escape_string($id)."', '".pg_escape_string($font)."')");
     self::__query("COMMIT");
   }
   
@@ -116,8 +116,8 @@ 
 //   }
 
   static function get_page_timestamp($id, $page_num) {
-    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='".pg_escape_string($id)."' AND ".
+                          "page_num=".pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
@@ -127,22 +127,22 @@ 
 
   // Adds the cached document referenced by $id to the provided pdf
   static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
-    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
       $pdf->get_cpdf()->selectFont($row["font_name"]);
     
-    $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT data FROM page_cache WHERE id='".pg_escape_string($id)."'");
 
-    if ( $new_page )
+    if ($new_page)
       $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+      if (!$first) 
         $pdf->new_page();
       else 
         $first = false;        

Braces +25 added lines, -18 removed lines

@@ -63,16 +63,18 @@ 
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
-        throw new Exception("Database connection failed.");
+      if ( !self::$__connection = pg_connect($con_str) ) {
+              throw new Exception("Database connection failed.");
+      }
     }
   }
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+    if ( !($res = pg_query(self::$__connection, $sql)) ) {
+          throw new Exception(pg_last_error(self::$__connection));
+    }
     return $res;
   }
   
@@ -84,12 +86,13 @@ 
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
-    else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+    if ( $row ) {
+          self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    } else {
+          self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
                      pg_escape_string($page_num) . ", ".
                      "'". pg_escape_string($data) . "')");
+    }
 
   }
 
@@ -98,9 +101,10 @@ 
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
-    foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+    foreach (array_keys($fonts) as $font) {
+          self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+    }
     self::__query("COMMIT");
   }
   
@@ -131,21 +135,24 @@ 
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
-    while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+    while ($row = pg_fetch_assoc($res)) {
+          $pdf->get_cpdf()->selectFont($row["font_name"]);
+    }
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
-    if ( $new_page )
-      $pdf->new_page();
+    if ( $new_page ) {
+          $pdf->new_page();
+    }
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
-        $pdf->new_page();
-      else 
-        $first = false;        
+      if ( !$first ) {
+              $pdf->new_page();
+      } else {
+              $first = false;
+      }
       
       $page = $pdf->reopen_serialized_object($row["data"]);
       //$pdf->close_object();

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

Doc Comments +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
    * @link http://www.w3.org/TR/CSS21/page.html#forced
    *
    * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
+   * @return null|boolean true if a page break occured
    */
   function check_forced_page_break(Frame $frame) {
 
@@ -426,7 +426,7 @@ 
    * correct location.
    *
    * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
+   * @return boolean the frame following the page break
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already

Spacing +55 added lines, -55 removed lines

@@ -117,9 +117,9 @@ 
    * @param float $h
    */
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    parent::set_containing_block($x,$y,$w,$h);
+    parent::set_containing_block($x, $y, $w, $h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
+    if (isset($h))
       $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
@@ -176,7 +176,7 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return;
 
     $block_types = array("block", "list-item", "table");
@@ -184,15 +184,15 @@ 
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
+    if (!in_array($style->display, $block_types))
       return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+    while ($prev && !in_array($prev->get_style()->display, $block_types))
       $prev = $prev->get_prev_sibling();
 
-    if ( in_array($style->page_break_before, $page_breaks) ) {
+    if (in_array($style->page_break_before, $page_breaks)) {
 
       // Prevent cascading splits
       $frame->split();
@@ -203,7 +203,7 @@ 
       return true;
     }
 
-    if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
+    if (($prev && in_array($prev->get_style()->page_break_after, $page_breaks))) {
       // Prevent cascading splits
       $frame->split();
       $prev->get_style()->page_break_after = "auto";
@@ -270,32 +270,32 @@ 
      */
 
     $block_types = array("block", "list-item", "table");
-    dompdf_debug("page-break", "_page_break_allowed(" . $frame->get_node()->nodeName. ")");
+    dompdf_debug("page-break", "_page_break_allowed(".$frame->get_node()->nodeName.")");
     $display = $frame->get_style()->display;
 
     // Block Frames (1):
-    if ( in_array($display, $block_types) ) {
+    if (in_array($display, $block_types)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-        dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+        dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+      if ($frame->get_style()->page_break_before === "avoid") {
         dompdf_debug("page-break", "before: avoid");
         return false;
       }
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+      while ($prev && !in_array($prev->get_style()->display, $block_types))
         $prev = $prev->get_prev_sibling();
 
       // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+      if ($prev && $prev->get_style()->page_break_after === "avoid") {
         dompdf_debug("page-break", "after: avoid");
         return false;
       }
@@ -303,7 +303,7 @@ 
       // If both $prev & $frame have the same parent, check the parent's
       // page_break_inside property.
       $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+      if ($prev && $parent && $parent->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent inside: avoid");
         return false;
       }
@@ -311,7 +311,7 @@ 
       // To prevent cascading page breaks when a top-level element has
       // page-break-inside: avoid, ensure that at least one frame is
       // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
@@ -319,8 +319,8 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if (!$prev && $parent)
+        return $this->_page_break_allowed($parent);
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -328,17 +328,17 @@ 
     }
 
     // Inline frames (2):
-    else if ( in_array($display, Style::$INLINE_TYPES) ) {
+    else if (in_array($display, Style::$INLINE_TYPES)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+          dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rule C
       $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+      if (count($block_parent->get_lines()) < $frame->get_style()->orphans) {
           dompdf_debug("page-break", "orphans");
         return false;
       }
@@ -349,7 +349,7 @@ 
       // Rule D
       $p = $block_parent;
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -360,32 +360,32 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+      while ($prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == ""))
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($block_parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
       }
 
       // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
+      if ($frame->get_node()->nodeName === "#text" &&
+           $frame->get_node()->nodeValue == "")
         return false;
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
 
     // Table-rows
-    } else if ( $display === "table-row" ) {
+    } else if ($display === "table-row") {
 
       // Simply check if the parent table's page_break_inside property is
       // not 'avoid'
       $p = Table_Frame_Decorator::find_parent_table($frame);
 
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -393,28 +393,28 @@ 
       }
 
       // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
+      if ($p && $p->get_first_child() === $frame) {
          dompdf_debug("page-break", "table: first-row");
         return false;
       }
 
       // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+      if ($this->_in_table > 1) {
         dompdf_debug("page-break", "table: nested table");
         return false;
       }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
+      dompdf_debug("page-break", "table-row/row-groups: break allowed");
       return true;
 
-    } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+    } else if (in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       // Disallow breaks at row-groups: only split at row boundaries
       return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+      dompdf_debug("page-break", "? ".$frame->get_style()->display."");
       return false;
     }
 
@@ -430,7 +430,7 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return false;
 
     // Determine the frame's maximum y value
@@ -439,7 +439,7 @@ 
     // If a split is to occur here, then the bottom margins & paddings of all
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
-    while ( $p ) {
+    while ($p) {
       $style = $p->get_style();
       $max_y += $style->length_in_pt(array($style->margin_bottom,
                                            $style->padding_bottom,
@@ -449,12 +449,12 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
+    if ($max_y <= $this->_bottom_page_margin)
       // no: do nothing
       return false;
 
     dompdf_debug("page-break", "check_page_break");
-    dompdf_debug("page-break", "in_table: " . $this->_in_table);
+    dompdf_debug("page-break", "in_table: ".$this->_in_table);
 
 
     // yes: determine page break location
@@ -463,42 +463,42 @@ 
 
     $in_table = $this->_in_table;
 
-    dompdf_debug("page-break","Starting search");
-    while ( $iter ) {
+    dompdf_debug("page-break", "Starting search");
+    while ($iter) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
+      if ($iter === $this) {
          dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
       }
 
-      if ( $this->_page_break_allowed($iter) ) {
-        dompdf_debug("page-break","break allowed, splitting.");
+      if ($this->_page_break_allowed($iter)) {
+        dompdf_debug("page-break", "break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
       }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
+      if (!$flg && $next = $iter->get_last_child()) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
         $iter = $next;
         continue;
       }
 
-      if ( $next = $iter->get_prev_sibling() ) {
+      if ($next = $iter->get_prev_sibling()) {
          dompdf_debug("page-break", "following prev sibling.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        else if (!in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -506,10 +506,10 @@ 
         continue;
       }
 
-      if ( $next = $iter->get_parent() ) {
+      if ($next = $iter->get_parent()) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -527,17 +527,17 @@ 
     dompdf_debug("page-break", "no valid break found, just splitting.");
 
     // If we are in a table, backtrack to the nearest top-level table row
-    if ( $this->_in_table ) {
+    if ($this->_in_table) {
       $num_tables = $this->_in_table - 1;
 
       $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+      while ($iter && $num_tables && $iter->get_style->display !== "table") {
         $iter = $iter->get_parent();
         $num_tables--;
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+      while ($iter && $iter->get_style()->display !== "table-row")
         $iter = $iter->get_parent();
 
       $iter->split();

Braces +46 added lines, -32 removed lines

@@ -119,8 +119,10 @@ 
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    if ( isset($h) ) {
+          $this->_bottom_page_margin = $h;
+    }
+    // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
   /**
@@ -176,21 +178,24 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
-      return;
+    if ( $this->_page_full ) {
+          return;
+    }
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
-      return false;
+    if ( !in_array($style->display, $block_types) ) {
+          return false;
+    }
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+    while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+          $prev = $prev->get_prev_sibling();
+    }
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
@@ -291,8 +296,9 @@ 
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       // Does the previous element allow a page break after?
       if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
@@ -319,8 +325,9 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if ( !$prev && $parent ) {
+              return $this->_page_break_allowed( $parent );
+      }
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -360,8 +367,9 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
@@ -371,8 +379,9 @@ 
 
       // Skip breaks on empty text nodes
       if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
-        return false;
+           $frame->get_node()->nodeValue == "" ) {
+              return false;
+      }
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
@@ -430,8 +439,9 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
-      return false;
+    if ( $this->_page_full ) {
+          return false;
+    }
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -449,9 +459,10 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
+    if ( $max_y <= $this->_bottom_page_margin ) {
+          // no: do nothing
       return false;
+    }
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -483,8 +494,9 @@ 
       if ( !$flg && $next = $iter->get_last_child() ) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        }
 
         $iter = $next;
         continue;
@@ -494,12 +506,12 @@ 
          dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
-
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        } else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = false;
@@ -509,8 +521,9 @@ 
       if ( $next = $iter->get_parent() ) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = true;
@@ -537,8 +550,9 @@ 
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
-        $iter = $iter->get_parent();
+      while ($iter && $iter->get_style()->display !== "table-row" ) {
+              $iter = $iter->get_parent();
+      }
 
       $iter->split();
       $this->_page_full = true;

Indentation +259 added lines, -260 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: page_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,137 +46,137 @@ 
  */
 class Page_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * y value of bottom page margin
-   *
-   * @var float
-   */
-  protected $_bottom_page_margin;
-
-  /**
-   * Flag indicating page is full.
-   *
-   * @var bool
-   */
-  protected $_page_full;
-
-  /**
-   * Number of tables currently being reflowed
-   *
-   * @var int
-   */
-  protected $_in_table;
-
-  /**
-   * The pdf renderer
-   *
-   * @var Renderer
-   */
-  protected $_renderer;
-
-  //........................................................................
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * y value of bottom page margin
+     *
+     * @var float
+     */
+    protected $_bottom_page_margin;
+
+    /**
+     * Flag indicating page is full.
+     *
+     * @var bool
+     */
+    protected $_page_full;
+
+    /**
+     * Number of tables currently being reflowed
+     *
+     * @var int
+     */
+    protected $_in_table;
+
+    /**
+     * The pdf renderer
+     *
+     * @var Renderer
+     */
+    protected $_renderer;
+
+    //........................................................................
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_page_full = false;
     $this->_in_table = 0;
     $this->_bottom_page_margin = null;
-  }
+    }
 
 
-  /**
-   * Set the renderer used for this pdf
-   *
-   * @param Renderer $renderer the renderer to use
-   */
-  function set_renderer($renderer) {
+    /**
+     * Set the renderer used for this pdf
+     *
+     * @param Renderer $renderer the renderer to use
+     */
+    function set_renderer($renderer) {
     $this->_renderer = $renderer;
-  }
-
-  /**
-   * Return the renderer used for this pdf
-   *
-   * @return Renderer
-   */
-  function get_renderer() {
+    }
+
+    /**
+     * Return the renderer used for this pdf
+     *
+     * @return Renderer
+     */
+    function get_renderer() {
     return $this->_renderer;
-  }
-
-  /**
-   * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $w
-   * @param float $h
-   */
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    }
+
+    /**
+     * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $w
+     * @param float $h
+     */
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
     if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
-  }
-
-  /**
-   * Returns true if the page is full and is no longer accepting frames.
-   *
-   * @return bool
-   */
-  function is_full() {
+        $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    }
+
+    /**
+     * Returns true if the page is full and is no longer accepting frames.
+     *
+     * @return bool
+     */
+    function is_full() {
     return $this->_page_full;
-  }
+    }
 
-  /**
-   * Start a new page by resetting the full flag.
-   */
-  function next_page() {
+    /**
+     * Start a new page by resetting the full flag.
+     */
+    function next_page() {
     $this->_renderer->new_page();
     $this->_page_full = false;
-  }
+    }
 
-  /**
-   * Indicate to the page that a table is currently being reflowed.
-   */
-  function table_reflow_start() {
+    /**
+     * Indicate to the page that a table is currently being reflowed.
+     */
+    function table_reflow_start() {
     $this->_in_table++;
-  }
+    }
 
-  /**
-   * Indicate to the page that table reflow is finished.
-   */
-  function table_reflow_end() {
+    /**
+     * Indicate to the page that table reflow is finished.
+     */
+    function table_reflow_end() {
     $this->_in_table--;
-  }
-
-  /**
-   * Return whether we are currently in a nested table or not
-   *
-   * @return bool
-   */
-  function in_nested_table() {
+    }
+
+    /**
+     * Return whether we are currently in a nested table or not
+     *
+     * @return bool
+     */
+    function in_nested_table() {
     return $this->_in_table > 1;
-  }
+    }
   
-  /**
-   * Check if a forced page break is required before $frame.  This uses the
-   * frame's page_break_before property as well as the preceeding frame's
-   * page_break_after property.
-   *
-   * @link http://www.w3.org/TR/CSS21/page.html#forced
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
-   */
-  function check_forced_page_break(Frame $frame) {
+    /**
+     * Check if a forced page break is required before $frame.  This uses the
+     * frame's page_break_before property as well as the preceeding frame's
+     * page_break_after property.
+     *
+     * @link http://www.w3.org/TR/CSS21/page.html#forced
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a page break occured
+     */
+    function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
     if ( $this->_page_full )
-      return;
+        return;
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
@@ -185,42 +184,42 @@ 
     $style = $frame->get_style();
 
     if ( !in_array($style->display, $block_types) )
-      return false;
+        return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
     while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+        $prev = $prev->get_prev_sibling();
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
-      // Prevent cascading splits
-      $frame->split();
-      // We have to grab the style again here because split() resets
-      // $frame->style to the frame's orignal style.
-      $frame->get_style()->page_break_before = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        // We have to grab the style again here because split() resets
+        // $frame->style to the frame's orignal style.
+        $frame->get_style()->page_break_before = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
-      // Prevent cascading splits
-      $frame->split();
-      $prev->get_style()->page_break_after = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        $prev->get_style()->page_break_after = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     return false;
-  }
-
-  /**
-   * Determine if a page break is allowed before $frame
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a break is allowed, false otherwise
-   */
-  protected function _page_break_allowed(Frame $frame) {
+    }
+
+    /**
+     * Determine if a page break is allowed before $frame
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a break is allowed, false otherwise
+     */
+    protected function _page_break_allowed(Frame $frame) {
     /**
      *
      * http://www.w3.org/TR/CSS21/page.html#allowed-page-breaks
@@ -276,162 +275,162 @@ 
     // Block Frames (1):
     if ( in_array($display, $block_types) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
         dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rules A & B
+        // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+        if ( $frame->get_style()->page_break_before === "avoid" ) {
         dompdf_debug("page-break", "before: avoid");
         return false;
-      }
+        }
 
-      // Find the preceeding block-level sibling
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+        // Find the preceeding block-level sibling
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && !in_array($prev->get_style()->display, $block_types) )
         $prev = $prev->get_prev_sibling();
 
-      // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+        // Does the previous element allow a page break after?
+        if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
         dompdf_debug("page-break", "after: avoid");
         return false;
-      }
+        }
 
-      // If both $prev & $frame have the same parent, check the parent's
-      // page_break_inside property.
-      $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent inside: avoid");
+        // If both $prev & $frame have the same parent, check the parent's
+        // page_break_inside property.
+        $parent = $frame->get_parent();
+        if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+            dompdf_debug("page-break", "parent inside: avoid");
         return false;
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame is
-      // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame is
+        // on the page before splitting.
+        if ( $parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // If the frame is the first block-level frame, use the value from
-      // $frame's parent instead.
-      if ( !$prev && $parent )
+        // If the frame is the first block-level frame, use the value from
+        // $frame's parent instead.
+        if ( !$prev && $parent )
         return $this->_page_break_allowed( $parent );
 
-      dompdf_debug("page-break", "block: break allowed");
-      return true;
+        dompdf_debug("page-break", "block: break allowed");
+        return true;
 
     }
 
     // Inline frames (2):
     else if ( in_array($display, Style::$INLINE_TYPES) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
+            dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rule C
-      $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
-          dompdf_debug("page-break", "orphans");
+        // Rule C
+        $block_parent = $frame->find_block_parent();
+        if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+            dompdf_debug("page-break", "orphans");
         return false;
-      }
+        }
 
-      // FIXME: Checking widows is tricky without having laid out the
-      // remaining line boxes.  Just ignore it for now...
+        // FIXME: Checking widows is tricky without having laid out the
+        // remaining line boxes.  Just ignore it for now...
 
-      // Rule D
-      $p = $block_parent;
-      while ($p) {
+        // Rule D
+        $p = $block_parent;
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame with
-      // some content is on the page before splitting.
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame with
+        // some content is on the page before splitting.
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+        if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
+        // Skip breaks on empty text nodes
+        if ( $frame->get_node()->nodeName === "#text" &&
            $frame->get_node()->nodeValue == "" )
         return false;
 
-      dompdf_debug("page-break", "inline: break allowed");
-      return true;
+        dompdf_debug("page-break", "inline: break allowed");
+        return true;
 
     // Table-rows
     } else if ( $display === "table-row" ) {
 
-      // Simply check if the parent table's page_break_inside property is
-      // not 'avoid'
-      $p = Table_Frame_Decorator::find_parent_table($frame);
+        // Simply check if the parent table's page_break_inside property is
+        // not 'avoid'
+        $p = Table_Frame_Decorator::find_parent_table($frame);
 
-      while ($p) {
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
-         dompdf_debug("page-break", "table: first-row");
+        // Avoid breaking after the first row of a table
+        if ( $p && $p->get_first_child() === $frame) {
+            dompdf_debug("page-break", "table: first-row");
         return false;
-      }
+        }
 
-      // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+        // If this is a nested table, prevent the page from breaking
+        if ( $this->_in_table > 1 ) {
         dompdf_debug("page-break", "table: nested table");
         return false;
-      }
+        }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
-      return true;
+        dompdf_debug("page-break","table-row/row-groups: break allowed");
+        return true;
 
     } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      // Disallow breaks at row-groups: only split at row boundaries
-      return false;
+        // Disallow breaks at row-groups: only split at row boundaries
+        return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
-      return false;
+        dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+        return false;
     }
 
-  }
-
-  /**
-   * Check if $frame will fit on the page.  If the frame does not fit,
-   * the frame tree is modified so that a page break occurs in the
-   * correct location.
-   *
-   * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
-   */
-  function check_page_break(Frame $frame) {
+    }
+
+    /**
+     * Check if $frame will fit on the page.  If the frame does not fit,
+     * the frame tree is modified so that a page break occurs in the
+     * correct location.
+     *
+     * @param Frame $frame the frame to check
+     * @return Frame the frame following the page break
+     */
+    function check_page_break(Frame $frame) {
     // Do not split if we have already
     if ( $this->_page_full )
-      return false;
+        return false;
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -440,18 +439,18 @@ 
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
     while ( $p ) {
-      $style = $p->get_style();
-      $max_y += $style->length_in_pt(array($style->margin_bottom,
-                                           $style->padding_bottom,
-                                           $style->border_bottom_width));
-      $p = $p->get_parent();
+        $style = $p->get_style();
+        $max_y += $style->length_in_pt(array($style->margin_bottom,
+                                            $style->padding_bottom,
+                                            $style->border_bottom_width));
+        $p = $p->get_parent();
     }
 
 
     // Check if $frame flows off the page
     if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
-      return false;
+        // no: do nothing
+        return false;
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -466,58 +465,58 @@ 
     dompdf_debug("page-break","Starting search");
     while ( $iter ) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
-         dompdf_debug("page-break", "reached root.");
+        if ( $iter === $this ) {
+            dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
-      }
+        }
 
-      if ( $this->_page_break_allowed($iter) ) {
+        if ( $this->_page_break_allowed($iter) ) {
         dompdf_debug("page-break","break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
-      }
+        }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
-         dompdf_debug("page-break", "following last child.");
+        if ( !$flg && $next = $iter->get_last_child() ) {
+            dompdf_debug("page-break", "following last child.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         $iter = $next;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_prev_sibling() ) {
-         dompdf_debug("page-break", "following prev sibling.");
+        if ( $next = $iter->get_prev_sibling() ) {
+            dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
              !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
                   in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = false;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_parent() ) {
-         dompdf_debug("page-break", "following parent.");
+        if ( $next = $iter->get_parent() ) {
+            dompdf_debug("page-break", "following parent.");
 
         if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = true;
         continue;
-      }
+        }
 
-      break;
+        break;
 
     }
 
@@ -528,33 +527,33 @@ 
 
     // If we are in a table, backtrack to the nearest top-level table row
     if ( $this->_in_table ) {
-      $num_tables = $this->_in_table - 1;
+        $num_tables = $this->_in_table - 1;
 
-      $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+        $iter = $frame;
+        while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
         $iter = $iter->get_parent();
         $num_tables--;
-      }
+        }
 
-      $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+        $iter = $frame;
+        while ($iter && $iter->get_style()->display !== "table-row" )
         $iter = $iter->get_parent();
 
-      $iter->split();
-      $this->_page_full = true;
-      return true;
+        $iter->split();
+        $this->_page_full = true;
+        return true;
     }
 
     $frame->split();
     $this->_page_full = true;
     return true;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function split($frame = null) {
+    function split($frame = null) {
     // Do nothing
-  }
+    }
 
 }

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

Doc Comments +5 added lines, -2 removed lines

@@ -442,6 +442,9 @@ 
    * @param string corner
    * @param string join
    * @param array dash
+   * @param double $width
+   * @param string $cap
+   * @param string $join
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
@@ -795,8 +798,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,  $blend = "Normal", $opacity = 1.0) {

Indentation +527 added lines, -527 removed lines

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

Switch Indentation +34 added lines, -34 removed lines

@@ -454,37 +454,37 @@ 
       $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
-    case "miter":
-      $this->_pdf->setlinejoin(0);
-      break;
+        case "miter":
+          $this->_pdf->setlinejoin(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinejoin(1);
-      break;
+        case "round":
+          $this->_pdf->setlinejoin(1);
+          break;
 
-    case "bevel":
-      $this->_pdf->setlinejoin(2);
-      break;
+        case "bevel":
+          $this->_pdf->setlinejoin(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     switch ( $cap ) {
-    case "butt":
-      $this->_pdf->setlinecap(0);
-      break;
+        case "butt":
+          $this->_pdf->setlinecap(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinecap(1);
-      break;
+        case "round":
+          $this->_pdf->setlinecap(1);
+          break;
 
-    case "square":
-      $this->_pdf->setlinecap(2);
-      break;
+        case "square":
+          $this->_pdf->setlinecap(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     $this->_pdf->setlinewidth($width);
@@ -855,18 +855,18 @@ 
 
         switch ($_t) {
 
-        case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $this->_page_count), $text);
-          $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
-
-        case "script":
-          if (!$eval) {
-            $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "text":
+              $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                  array($p, $this->_page_count), $text);
+              $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+              break;
+
+            case "script":
+              if (!$eval) {
+                $eval = new PHP_Evaluator($this);
+              }
+              $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

Spacing +82 added lines, -82 removed lines

@@ -185,25 +185,25 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   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;
     }
     $this->_width = $size[2] - $size[0];
-    $this->_height= $size[3] - $size[1];
+    $this->_height = $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if (defined("DOMPDF_PDFLIB_LICENSE"))
+      $this->_pdf->set_parameter("license", DOMPDF_PDFLIB_LICENSE);
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -211,7 +211,7 @@ 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
-    if ( function_exists("date_default_timezone_get") ) {
+    if (function_exists("date_default_timezone_get")) {
       $tz = @date_default_timezone_get();
       date_default_timezone_set("UTC");
       $this->_pdf->set_info("Date", date("Y-m-d"));
@@ -220,11 +220,11 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+    if (self::$IN_MEMORY)
+      $this->_pdf->begin_document("", "");
     else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+      $this->_pdf->begin_document($this->_file, "");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -243,29 +243,29 @@ 
         $face = basename($file);
 
         // Prefer ttfs to afms
-        if ( file_exists($file.".ttf") ) {
+        if (file_exists($file.".ttf")) {
           $outline = "$file.ttf";
           $afm = null;
 
-        } else if ( file_exists($file .".TTF") ) {
+        } else if (file_exists($file.".TTF")) {
           $outline = "$file.TTF";
           $afm = null;
 
-        } else if ( file_exists($file . ".pfb") ) {
+        } else if (file_exists($file.".pfb")) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+          if (file_exists($file.".afm"))
             $afm = "$file.afm";
 
-        } else if ( file_exists($file . ".PFB") ) {
+        } else if (file_exists($file.".PFB")) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+          if (file_exists($file.".AFM"))
             $afm = "$file.AFM";
         } else
           continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
+        if (!is_null($afm))
           $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
       }
     }
@@ -366,10 +366,10 @@ 
    */
   function add_object($object, $where = 'all') {
 
-    if ( mb_strpos($where, "next") !== false ) {
+    if (mb_strpos($where, "next") !== false) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
+      if ($where == "")
         $where = "add";
     }
 
@@ -386,18 +386,18 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
+    if (!isset($this->_objs[$object]))
       return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
 
     // Place the object on this page if required
-    if ( $this->_page_number >= $start &&
+    if ($this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")))
+      $this->_pdf->fit_image($object, 0, 0, "");
 
     unset($this->_objs[$object]);
   }
@@ -407,16 +407,16 @@ 
    */
   protected function _place_objects() {
 
-    foreach ( $this->_objs as $obj => $props ) {
+    foreach ($this->_objs as $obj => $props) {
       $start = $props["start_page"];
       $where = $props["where"];
 
       // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+      if ($this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
-            ($where === "all")) ) {
-        $this->_pdf->fit_image($obj,0,0,"");
+            ($where === "all"))) {
+        $this->_pdf->fit_image($obj, 0, 0, "");
       }
     }
 
@@ -430,9 +430,9 @@ 
 
   function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+  function set_page_number($num) { $this->_page_number = (int) $num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+  function set_page_count($count) { $this->_page_count = (int) $count; }
 
 
   /**
@@ -445,15 +445,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
+    if (count($dash) == 1)
       $dash[] = $dash[0];
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    if (count($dash) > 1)
+      $this->_pdf->setdashpattern("dasharray={".join(" ", $dash)."}");
     else
-      $this->_pdf->setdash(0,0);
+      $this->_pdf->setdash(0, 0);
 
-    switch ( $join ) {
+    switch ($join) {
     case "miter":
       $this->_pdf->setlinejoin(0);
       break;
@@ -470,7 +470,7 @@ 
       break;
     }
 
-    switch ( $cap ) {
+    switch ($cap) {
     case "butt":
       $this->_pdf->setlinecap(0);
       break;
@@ -497,12 +497,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
+    if ($this->_last_stroke_color == $color)
     	return;
 
     $this->_last_stroke_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
   }
 
@@ -512,12 +512,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
+    if ($this->_last_fill_color == $color)
     	return;
 
     $this->_last_fill_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
   }
 
@@ -537,7 +537,7 @@ 
                           "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
-    if ( in_array($test, $native_fonts) ) {
+    if (in_array($test, $native_fonts)) {
       $font = basename($font);
 
     } else {
@@ -545,20 +545,20 @@ 
       $options .= " embedding=true";
     }
 
-    if ( is_null($encoding) ) {
+    if (is_null($encoding)) {
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+      if (defined("DOMPDF_PDFLIB_LICENSE"))
         $encoding = "unicode";
       else
         $encoding = "auto";
 
     }
 
-    $key = $font .":". $encoding .":". $options;
+    $key = $font.":".$encoding.":".$options;
 
-    if ( isset($this->_fonts[$key]) )
+    if (isset($this->_fonts[$key]))
       return $this->_fonts[$key];
 
     else {
@@ -587,7 +587,7 @@ 
     $y1 = $this->y($y1);
     $y2 = $this->y($y2);
 
-    $this->_pdf->moveto($x1,$y1);
+    $this->_pdf->moveto($x1, $y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
   }
@@ -622,20 +622,20 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
-    $this->_pdf->moveto($x,$y);
+    $this->_pdf->moveto($x, $y);
 
     while (count($points) > 1) {
       $y = $this->y(array_pop($points));
       $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+      $this->_pdf->lineto($x, $y);
     }
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->closepath_stroke();
@@ -648,14 +648,14 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->stroke();
@@ -665,15 +665,15 @@ 
   //........................................................................
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
-    $w = (int)$w;
-    $h = (int)$h;
+    $w = (int) $w;
+    $h = (int) $h;
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
+    if ($img_type === "jpg")
       $img_type = "jpeg";
 
-    if ( isset($this->_imgs[$img_url]) )
+    if (isset($this->_imgs[$img_url]))
       $img = $this->_imgs[$img_url];
 
     else {
@@ -682,13 +682,13 @@ 
     }
 
     $y = $this->y($y) - $h;
-    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
+    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'."$w $h".'} fitmethod=entire');
 
   }
 
   //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -696,8 +696,8 @@ 
 
     $y = $this->y($y) - Font_Metrics::get_font_height($font, $size);
 
-    $adjust = (float)$adjust;
-    $angle = -(float)$angle;
+    $adjust = (float) $adjust;
+    $angle = -(float) $angle;
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
@@ -717,7 +717,7 @@ 
    * @param string $anchorname The name of the named destination
    */
   function add_named_dest($anchorname) {
-    $this->_pdf->add_nameddest($anchorname,"");
+    $this->_pdf->add_nameddest($anchorname, "");
   }
 
   //........................................................................
@@ -734,21 +734,21 @@ 
   function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
-    if ( strpos($url, '#') === 0 ) {
+    if (strpos($url, '#') === 0) {
       // Local link
-      $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      $name = substr($url, 1);
+      if ($name)
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=".substr($url, 1)." linewidth=0");
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+      if ($proto == "" || $proto === "file://")
         return; // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+      $url = '{'.rawurldecode($url).'}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
+      $action = $this->_pdf->create_action("URI", "url=".$url);
       $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
     }
   }
@@ -759,7 +759,7 @@ 
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
-    $num_spaces = mb_substr_count($text," ");
+    $num_spaces = mb_substr_count($text, " ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
   }
@@ -798,8 +798,8 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle angle to write the text at, measured CW starting from the x-axis
    */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
+                     $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
   }
@@ -842,7 +842,7 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
+    if (!count($this->_page_text))
       return;
 
     $this->_pdf->suspend_page("");
@@ -856,7 +856,7 @@ 
         switch ($_t) {
 
         case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+          $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"),
                               array($p, $this->_page_count), $text);
           $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
           break;
@@ -883,14 +883,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY ) {
+    if (self::$IN_MEMORY) {
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
@@ -898,7 +898,7 @@ 
       $size = filesize($this->_file);
 
 
-    $filename = str_replace(array("\n","'"),"", $filename);
+    $filename = str_replace(array("\n", "'"), "", $filename);
     $attach = (isset($options["Attachment"]) && $options["Attachment"]) ? "attachment" : "inline";
 
     header("Cache-Control: private");
@@ -907,7 +907,7 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       echo $data;
 
     else {
@@ -915,11 +915,11 @@ 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if (!$fh)
+        throw new DOMPDF_Exception("Unable to load temporary PDF file: ".$this->_file);
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while (!feof($fh))
+        echo fread($fh, $chunk);
       fclose($fh);
 
       //debugpng
@@ -942,14 +942,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       $data = $this->_pdf->get_buffer();
 
     else {

Braces +125 added lines, -95 removed lines

@@ -185,12 +185,13 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   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];
@@ -202,8 +203,9 @@ 
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+	      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	}
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -220,9 +222,9 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
-    else {
+    if ( self::$IN_MEMORY ) {
+          $this->_pdf->begin_document("","");
+    } else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
       $this->_pdf->begin_document($this->_file,"");
     }
@@ -254,19 +256,23 @@ 
         } else if ( file_exists($file . ".pfb") ) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
-            $afm = "$file.afm";
+          if ( file_exists($file . ".afm") ) {
+                      $afm = "$file.afm";
+          }
 
         } else if ( file_exists($file . ".PFB") ) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
-            $afm = "$file.AFM";
-        } else
-          continue;
+          if ( file_exists($file . ".AFM") ) {
+                      $afm = "$file.AFM";
+          }
+        } else {
+                  continue;
+        }
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        if ( !is_null($afm) ) {
+                  $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
       }
     }
   }
@@ -369,8 +375,9 @@ 
     if ( mb_strpos($where, "next") !== false ) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
-        $where = "add";
+      if ( $where == "" ) {
+              $where = "add";
+      }
     }
 
     $this->_objs[$object]["where"] = $where;
@@ -386,8 +393,9 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
-      return;
+    if ( !isset($this->_objs[$object]) ) {
+          return;
+    }
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -396,8 +404,9 @@ 
     if ( $this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")) ) {
+          $this->_pdf->fit_image($object,0,0,"");
+    }
 
     unset($this->_objs[$object]);
   }
@@ -445,13 +454,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+    if ( count($dash) == 1 ) {
+          $dash[] = $dash[0];
+    }
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
-    else
-      $this->_pdf->setdash(0,0);
+    if ( count($dash) > 1 ) {
+          $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    } else {
+          $this->_pdf->setdash(0,0);
+    }
 
     switch ( $join ) {
     case "miter":
@@ -497,8 +508,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
-    	return;
+    if($this->_last_stroke_color == $color) {
+        	return;
+    }
 
     $this->_last_stroke_color = $color;
 
@@ -512,8 +524,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
-    	return;
+    if($this->_last_fill_color == $color) {
+        	return;
+    }
 
     $this->_last_fill_color = $color;
 
@@ -549,19 +562,19 @@ 
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
-        $encoding = "unicode";
-      else
-        $encoding = "auto";
+      if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+              $encoding = "unicode";
+      } else {
+              $encoding = "auto";
+      }
 
     }
 
     $key = $font .":". $encoding .":". $options;
 
-    if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
-
-    else {
+    if ( isset($this->_fonts[$key]) ) {
+          return $this->_fonts[$key];
+    } else {
 
       $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
       return $this->_fonts[$key];
@@ -622,8 +635,9 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
@@ -635,10 +649,11 @@ 
       $this->_pdf->lineto($x,$y);
     }
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->closepath_stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->closepath_stroke();
+    }
   }
 
   //........................................................................
@@ -648,17 +663,19 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->stroke();
+    }
 
   }
 
@@ -670,13 +687,13 @@ 
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
-      $img_type = "jpeg";
-
-    if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+    if ( $img_type === "jpg" ) {
+          $img_type = "jpeg";
+    }
 
-    else {
+    if ( isset($this->_imgs[$img_url]) ) {
+          $img = $this->_imgs[$img_url];
+    } else {
 
       $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
@@ -737,14 +754,17 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      if ( $name ) {
+              $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      }
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
-        return; // Local links are not allowed
+      if ( $proto == "" || $proto === "file://" ) {
+              return;
+      }
+      // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
       $url = '{' . rawurldecode($url) . '}';
       
@@ -842,8 +862,9 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $this->_pdf->suspend_page("");
 
@@ -883,10 +904,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
@@ -894,8 +916,9 @@ 
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
-    } else
-      $size = filesize($this->_file);
+    } else {
+          $size = filesize($this->_file);
+    }
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -907,26 +930,30 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
-      echo $data;
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          echo $data;
+    } else {
 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if ( !$fh ) {
+              throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      }
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while ( !feof($fh) ) {
+              echo fread($fh,$chunk);
+      }
       fclose($fh);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib stream unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 
@@ -942,24 +969,27 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          $data = $this->_pdf->get_buffer();
+    } else {
       $data = file_get_contents($this->_file);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib output unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }