chamilo / chamilo-lms

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

Indentation +69 added lines, -69 removed lines

@@ -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/frame_factory.cls.php

Indentation +53 added lines, -54 removed lines

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

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

Indentation +181 added lines, -182 removed lines

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

Indentation +42 added lines, -43 removed lines

@@ -35,7 +35,6 @@ 
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
  * @package dompdf
-
  *
  * Changes
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
@@ -54,34 +53,34 @@ 
  */
 class Text_Renderer extends Abstract_Renderer {
   
-  const DECO_THICKNESS = 0.04;     // Thickness of underline. Screen: 0.08, print: better less, e.g. 0.04
-
-  //Tweaking if $base and $descent are not accurate.
-  //Check method_exists( $this->_canvas, "get_cpdf" )
-  //- For cpdf these can and must stay 0, because font metrics are used directly.
-  //- For other renderers, if different values are wanted, separate the parameter sets.
-  //  But $size and $size-$height seem to be accurate enough
-  const UNDERLINE_OFFSET = 0.0;    // Relative to bottom of text, as fraction of height.
-  const OVERLINE_OFFSET = 0.0;    // Relative to top of text
-  const LINETHROUGH_OFFSET = 0.0; // Relative to centre of text.
-  const DECO_EXTENSION = 0.0;     // How far to extend lines past either end, in pt
+    const DECO_THICKNESS = 0.04;     // Thickness of underline. Screen: 0.08, print: better less, e.g. 0.04
+
+    //Tweaking if $base and $descent are not accurate.
+    //Check method_exists( $this->_canvas, "get_cpdf" )
+    //- For cpdf these can and must stay 0, because font metrics are used directly.
+    //- For other renderers, if different values are wanted, separate the parameter sets.
+    //  But $size and $size-$height seem to be accurate enough
+    const UNDERLINE_OFFSET = 0.0;    // Relative to bottom of text, as fraction of height.
+    const OVERLINE_OFFSET = 0.0;    // Relative to top of text
+    const LINETHROUGH_OFFSET = 0.0; // Relative to centre of text.
+    const DECO_EXTENSION = 0.0;     // How far to extend lines past either end, in pt
     
-  //........................................................................
+    //........................................................................
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
     
     $style = $frame->get_style();
     list($x, $y) = $frame->get_position();
     $cb = $frame->get_containing_block();
 
     if ( ($ml = $style->margin_left) === "auto" || $ml === "none" )
-      $ml = 0;
+        $ml = 0;
 
     if ( ($pl = $style->padding_left) === "auto" || $pl === "none" )
-      $pl = 0;
+        $pl = 0;
 
     if ( ($bl = $style->border_left_width) === "auto" || $bl === "none" )
-      $bl = 0;
+        $bl = 0;
 
     $x += $style->length_in_pt( array($ml, $pl, $bl), $cb["w"] );
 
@@ -96,19 +95,19 @@ 
 //       return;
     
     $this->_canvas->text($x, $y, $text,
-                         $font, $size,
-                         $style->color, $spacing);
+                            $font, $size,
+                            $style->color, $spacing);
 
     if ( method_exists( $this->_canvas, "get_cpdf" ) ) {
-      $base = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][3]*$size)/1000;
-      $descent = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][1]*$size)/1000;
-      //print '<pre>Text_Renderer cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
+        $base = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][3]*$size)/1000;
+        $descent = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][1]*$size)/1000;
+        //print '<pre>Text_Renderer cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
     } else {
-      //Descent is font part below baseline, typically negative. $height is about full height of font box.
-      //$descent = -$size/6; is less accurate, depends on font family.
-      $base = $size;
-      $descent = $size-$height;
-      //print '<pre>Text_Renderer other than cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
+        //Descent is font part below baseline, typically negative. $height is about full height of font box.
+        //$descent = -$size/6; is less accurate, depends on font family.
+        $base = $size;
+        $descent = $size-$height;
+        //print '<pre>Text_Renderer other than cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
     }
     
     // Handle text decoration:
@@ -119,42 +118,42 @@ 
     $p = $frame;
     $stack = array();
     while ( $p = $p->get_parent() )
-      $stack[] = $p;
+        $stack[] = $p;
     
     while ( count($stack) > 0 ) {
-      $f = array_pop($stack);
+        $f = array_pop($stack);
 
-      $deco_y = $y;
-      if ( ($text_deco = $f->get_style()->text_decoration) === "none" )
+        $deco_y = $y;
+        if ( ($text_deco = $f->get_style()->text_decoration) === "none" )
         continue;
 
-      $color = $f->get_style()->color;
+        $color = $f->get_style()->color;
 
-      switch ($text_deco) {
+        switch ($text_deco) {
 
-      default:
+        default:
         continue;
 
-      case "underline":
+        case "underline":
         $deco_y += $base - $descent+ $size * (self::UNDERLINE_OFFSET - self::DECO_THICKNESS/2);
         break;
 
-      case "overline":
+        case "overline":
         $deco_y += $size * (self::OVERLINE_OFFSET + self::DECO_THICKNESS/2);
         break;
 
-      case "line-through":
+        case "line-through":
         $deco_y += $base * 0.7 + $size * self::LINETHROUGH_OFFSET;
         break;
 
-      }
+        }
 
-      $dx = 0;
-      $x1 = $x - self::DECO_EXTENSION;
-      $x2 = $x + $style->width + $dx + self::DECO_EXTENSION;
-      $this->_canvas->line($x1, $deco_y, $x2, $deco_y, $color, $size * self::DECO_THICKNESS);
+        $dx = 0;
+        $x1 = $x - self::DECO_EXTENSION;
+        $x2 = $x + $style->width + $dx + self::DECO_EXTENSION;
+        $this->_canvas->line($x1, $deco_y, $x2, $deco_y, $color, $size * self::DECO_THICKNESS);
 
     }
-  }
+    }
 
 }

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

Indentation +524 added lines, -524 removed lines

@@ -74,144 +74,144 @@ 
  */
 class CPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
-                              "2a0" => array(0,0,3370.39,4767.87),
-                              "a0" => array(0,0,2383.94,3370.39),
-                              "a1" => array(0,0,1683.78,2383.94),
-                              "a2" => array(0,0,1190.55,1683.78),
-                              "a3" => array(0,0,841.89,1190.55),
-                              "a4" => array(0,0,595.28,841.89),
-                              "a5" => array(0,0,419.53,595.28),
-                              "a6" => array(0,0,297.64,419.53),
-                              "a7" => array(0,0,209.76,297.64),
-                              "a8" => array(0,0,147.40,209.76),
-                              "a9" => array(0,0,104.88,147.40),
-                              "a10" => array(0,0,73.70,104.88),
-                              "b0" => array(0,0,2834.65,4008.19),
-                              "b1" => array(0,0,2004.09,2834.65),
-                              "b2" => array(0,0,1417.32,2004.09),
-                              "b3" => array(0,0,1000.63,1417.32),
-                              "b4" => array(0,0,708.66,1000.63),
-                              "b5" => array(0,0,498.90,708.66),
-                              "b6" => array(0,0,354.33,498.90),
-                              "b7" => array(0,0,249.45,354.33),
-                              "b8" => array(0,0,175.75,249.45),
-                              "b9" => array(0,0,124.72,175.75),
-                              "b10" => array(0,0,87.87,124.72),
-                              "c0" => array(0,0,2599.37,3676.54),
-                              "c1" => array(0,0,1836.85,2599.37),
-                              "c2" => array(0,0,1298.27,1836.85),
-                              "c3" => array(0,0,918.43,1298.27),
-                              "c4" => array(0,0,649.13,918.43),
-                              "c5" => array(0,0,459.21,649.13),
-                              "c6" => array(0,0,323.15,459.21),
-                              "c7" => array(0,0,229.61,323.15),
-                              "c8" => array(0,0,161.57,229.61),
-                              "c9" => array(0,0,113.39,161.57),
-                              "c10" => array(0,0,79.37,113.39),
-                              "ra0" => array(0,0,2437.80,3458.27),
-                              "ra1" => array(0,0,1729.13,2437.80),
-                              "ra2" => array(0,0,1218.90,1729.13),
-                              "ra3" => array(0,0,864.57,1218.90),
-                              "ra4" => array(0,0,609.45,864.57),
-                              "sra0" => array(0,0,2551.18,3628.35),
-                              "sra1" => array(0,0,1814.17,2551.18),
-                              "sra2" => array(0,0,1275.59,1814.17),
-                              "sra3" => array(0,0,907.09,1275.59),
-                              "sra4" => array(0,0,637.80,907.09),
-                              "letter" => array(0,0,612.00,792.00),
-                              "legal" => array(0,0,612.00,1008.00),
-                              "ledger" => array(0,0,1224.00, 792.00),
-                              "tabloid" => array(0,0,792.00, 1224.00),
-                              "executive" => array(0,0,521.86,756.00),
-                              "folio" => array(0,0,612.00,936.00),
-                              "commerical #10 envelope" => array(0,0,684,297),
-                              "catalog #10 1/2 envelope" => array(0,0,648,864),
-                              "8.5x11" => array(0,0,612.00,792.00),
-                              "8.5x14" => array(0,0,612.00,1008.0),
-                              "11x17"  => array(0,0,792.00, 1224.00));
-
-
-  /**
-   * Instance of Cpdf class
-   *
-   * @var Cpdf
-   */
-  private $_pdf;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var float;
-   */
-  private $_height;
-
-  /**
-   * Current page number
-   *
-   * @var int
-   */
-  private $_page_number;
-
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accesing after rendering is initially complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Array of temporary cached images to be deleted when processing is complete
-   *
-   * @var array
-   */
-  private $_image_cache;
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
+                                "2a0" => array(0,0,3370.39,4767.87),
+                                "a0" => array(0,0,2383.94,3370.39),
+                                "a1" => array(0,0,1683.78,2383.94),
+                                "a2" => array(0,0,1190.55,1683.78),
+                                "a3" => array(0,0,841.89,1190.55),
+                                "a4" => array(0,0,595.28,841.89),
+                                "a5" => array(0,0,419.53,595.28),
+                                "a6" => array(0,0,297.64,419.53),
+                                "a7" => array(0,0,209.76,297.64),
+                                "a8" => array(0,0,147.40,209.76),
+                                "a9" => array(0,0,104.88,147.40),
+                                "a10" => array(0,0,73.70,104.88),
+                                "b0" => array(0,0,2834.65,4008.19),
+                                "b1" => array(0,0,2004.09,2834.65),
+                                "b2" => array(0,0,1417.32,2004.09),
+                                "b3" => array(0,0,1000.63,1417.32),
+                                "b4" => array(0,0,708.66,1000.63),
+                                "b5" => array(0,0,498.90,708.66),
+                                "b6" => array(0,0,354.33,498.90),
+                                "b7" => array(0,0,249.45,354.33),
+                                "b8" => array(0,0,175.75,249.45),
+                                "b9" => array(0,0,124.72,175.75),
+                                "b10" => array(0,0,87.87,124.72),
+                                "c0" => array(0,0,2599.37,3676.54),
+                                "c1" => array(0,0,1836.85,2599.37),
+                                "c2" => array(0,0,1298.27,1836.85),
+                                "c3" => array(0,0,918.43,1298.27),
+                                "c4" => array(0,0,649.13,918.43),
+                                "c5" => array(0,0,459.21,649.13),
+                                "c6" => array(0,0,323.15,459.21),
+                                "c7" => array(0,0,229.61,323.15),
+                                "c8" => array(0,0,161.57,229.61),
+                                "c9" => array(0,0,113.39,161.57),
+                                "c10" => array(0,0,79.37,113.39),
+                                "ra0" => array(0,0,2437.80,3458.27),
+                                "ra1" => array(0,0,1729.13,2437.80),
+                                "ra2" => array(0,0,1218.90,1729.13),
+                                "ra3" => array(0,0,864.57,1218.90),
+                                "ra4" => array(0,0,609.45,864.57),
+                                "sra0" => array(0,0,2551.18,3628.35),
+                                "sra1" => array(0,0,1814.17,2551.18),
+                                "sra2" => array(0,0,1275.59,1814.17),
+                                "sra3" => array(0,0,907.09,1275.59),
+                                "sra4" => array(0,0,637.80,907.09),
+                                "letter" => array(0,0,612.00,792.00),
+                                "legal" => array(0,0,612.00,1008.00),
+                                "ledger" => array(0,0,1224.00, 792.00),
+                                "tabloid" => array(0,0,792.00, 1224.00),
+                                "executive" => array(0,0,521.86,756.00),
+                                "folio" => array(0,0,612.00,936.00),
+                                "commerical #10 envelope" => array(0,0,684,297),
+                                "catalog #10 1/2 envelope" => array(0,0,648,864),
+                                "8.5x11" => array(0,0,612.00,792.00),
+                                "8.5x14" => array(0,0,612.00,1008.0),
+                                "11x17"  => array(0,0,792.00, 1224.00));
+
+
+    /**
+     * Instance of Cpdf class
+     *
+     * @var Cpdf
+     */
+    private $_pdf;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var float;
+     */
+    private $_height;
+
+    /**
+     * Current page number
+     *
+     * @var int
+     */
+    private $_page_number;
+
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accesing after rendering is initially complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Array of temporary cached images to be deleted when processing is complete
+     *
+     * @var array
+     */
+    private $_image_cache;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
-   * @param string $orientation The orienation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
+     * @param string $orientation The orienation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
 
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+        $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
-      $size = self::$PAPER_SIZES["letter"];
+        $size = self::$PAPER_SIZES["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
     
     $this->_pdf = new Cpdf($size, DOMPDF_UNICODE_ENABLED, DOMPDF_FONT_CACHE, DOMPDF_TEMP_DIR);
@@ -219,8 +219,8 @@ 
 
     // Silence pedantic warnings about missing TZ settings
     $time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
-	$this->_pdf->addInfo("CreationDate", "D:".$time);
-	$this->_pdf->addInfo("ModDate", "D:".$time);
+    $this->_pdf->addInfo("CreationDate", "D:".$time);
+    $this->_pdf->addInfo("ModDate", "D:".$time);
     
 
     $this->_width = $size[2] - $size[0];
@@ -233,253 +233,253 @@ 
     $this->_pages = array($this->_pdf->getFirstPageId());
 
     $this->_image_cache = array();
-  }
-
-  /**
-   * Class destructor
-   *
-   * Deletes all temporary image files
-   */
-  function __destruct() {
+    }
+
+    /**
+     * Class destructor
+     *
+     * Deletes all temporary image files
+     */
+    function __destruct() {
     foreach ($this->_image_cache as $img) {
-      //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[__destruct unlink '.$img.']';
+        if (!DEBUGKEEPTEMP)
         unlink($img);
     }
-  }
+    }
   
-  /**
-   * Returns the Cpdf instance
-   *
-   * @return Cpdf
-   */
-  function get_cpdf() { return $this->_pdf; }
-
-  /**
-   * Add meta information to the PDF
-   *
-   * @param string $label  label of the value (Creator, Producter, etc.)
-   * @param string $value  the text to set
-   */
-  function add_info($label, $value) {
+    /**
+     * Returns the Cpdf instance
+     *
+     * @return Cpdf
+     */
+    function get_cpdf() { return $this->_pdf; }
+
+    /**
+     * Add meta information to the PDF
+     *
+     * @param string $label  label of the value (Creator, Producter, etc.)
+     * @param string $value  the text to set
+     */
+    function add_info($label, $value) {
     $this->_pdf->addInfo($label, $value);
-  }
-
-  /**
-   * Opens a new 'object'
-   *
-   * While an object is open, all drawing actions are recored in the object,
-   * as opposed to being drawn on the current page.  Objects can be added
-   * later to a specific page or to several pages.
-   *
-   * The return value is an integer ID for the new object.
-   *
-   * @see CPDF_Adapter::close_object()
-   * @see CPDF_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    }
+
+    /**
+     * Opens a new 'object'
+     *
+     * While an object is open, all drawing actions are recored in the object,
+     * as opposed to being drawn on the current page.  Objects can be added
+     * later to a specific page or to several pages.
+     *
+     * The return value is an integer ID for the new object.
+     *
+     * @see CPDF_Adapter::close_object()
+     * @see CPDF_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $ret = $this->_pdf->openObject();
     $this->_pdf->saveState();
     return $ret;
-  }
-
-  /**
-   * Reopens an existing 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   * @param int $object  the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopens an existing 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     * @param int $object  the ID of a previously opened object
+     */
+    function reopen_object($object) {
     $this->_pdf->reopenObject($object);
     $this->_pdf->saveState();
-  }
-
-  /**
-   * Closes the current 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Closes the current 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restoreState();
     $this->_pdf->closeObject();
-  }
-
-  /**
-   * Adds a specified 'object' to the document
-   *
-   * $object int specifying an object created with {@link
-   * CPDF_Adapter::open_object()}.  $where can be one of:
-   * - 'add' add to current page only
-   * - 'all' add to every page from the current one onwards
-   * - 'odd' add to all odd numbered pages from now on
-   * - 'even' add to all even numbered pages from now on
-   * - 'next' add the object to the next page only
-   * - 'nextodd' add to all odd numbered pages from the next one
-   * - 'nexteven' add to all even numbered pages from the next one
-   *
-   * @see Cpdf::addObject()
-   *
-   * @param int $object
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds a specified 'object' to the document
+     *
+     * $object int specifying an object created with {@link
+     * CPDF_Adapter::open_object()}.  $where can be one of:
+     * - 'add' add to current page only
+     * - 'all' add to every page from the current one onwards
+     * - 'odd' add to all odd numbered pages from now on
+     * - 'even' add to all even numbered pages from now on
+     * - 'next' add the object to the next page only
+     * - 'nextodd' add to all odd numbered pages from the next one
+     * - 'nexteven' add to all even numbered pages from the next one
+     *
+     * @see Cpdf::addObject()
+     *
+     * @param int $object
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
     $this->_pdf->addObject($object, $where);
-  }
-
-  /**
-   * Stops the specified 'object' from appearing in the document.
-   *
-   * The object will stop being displayed on the page following the current
-   * one.
-   *
-   * @param int $object
-   */
-  function stop_object($object) {
+    }
+
+    /**
+     * Stops the specified 'object' from appearing in the document.
+     *
+     * The object will stop being displayed on the page following the current
+     * one.
+     *
+     * @param int $object
+     */
+    function stop_object($object) {
     $this->_pdf->stopObject($object);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function serialize_object($id) {
+    /**
+     * @access private
+     */
+    function serialize_object($id) {
     // Serialize the pdf object's current state for retrieval later
     return $this->_pdf->serializeObject($id);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function reopen_serialized_object($obj) {
+    /**
+     * @access private
+     */
+    function reopen_serialized_object($obj) {
     return $this->_pdf->restoreSerializedObject($obj);
-  }
+    }
     
-  //........................................................................
-
-  /**
-   * Returns the PDF's width in points
-   * @return float
-   */
-  function get_width() { return $this->_width; }
-
-  /**
-   * Returns the PDF's height in points
-   * @return float
-   */
-  function get_height() { return $this->_height; }
-
-  /**
-   * Returns the current page number
-   * @return int
-   */
-  function get_page_number() { return $this->_page_number; }
-
-  /**
-   * Returns the total number of pages in the document
-   * @return int
-   */
-  function get_page_count() { return $this->_page_count; }
-
-  /**
-   * Sets the current page number
-   *
-   * @param int $num
-   */
-  function set_page_number($num) { $this->_page_number = $num; }
-
-  /**
-   * Sets the page count
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {  $this->_page_count = $count; }
+    //........................................................................
+
+    /**
+     * Returns the PDF's width in points
+     * @return float
+     */
+    function get_width() { return $this->_width; }
+
+    /**
+     * Returns the PDF's height in points
+     * @return float
+     */
+    function get_height() { return $this->_height; }
+
+    /**
+     * Returns the current page number
+     * @return int
+     */
+    function get_page_number() { return $this->_page_number; }
+
+    /**
+     * Returns the total number of pages in the document
+     * @return int
+     */
+    function get_page_count() { return $this->_page_count; }
+
+    /**
+     * Sets the current page number
+     *
+     * @param int $num
+     */
+    function set_page_number($num) { $this->_page_number = $num; }
+
+    /**
+     * Sets the page count
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {  $this->_page_count = $count; }
     
-  /**
-   * Sets the stroke colour
-   *
-   * See {@link Style::set_colour()} for the format of the color array.
-   * @param array $color
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the stroke colour
+     *
+     * See {@link Style::set_colour()} for the format of the color array.
+     * @param array $color
+     */
+    protected function _set_stroke_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setStrokeColor($r, $g, $b);
-  }
+    }
   
-  /**
-   * Sets the fill colour
-   *
-   * See {@link Style::set_colour()} for the format of the colour array.
-   * @param array $color
-   */
-  protected function _set_fill_color($color) {
+    /**
+     * Sets the fill colour
+     *
+     * See {@link Style::set_colour()} for the format of the colour array.
+     * @param array $color
+     */
+    protected function _set_fill_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setColor($r, $g, $b);
-  }
-
-  /**
-   * Sets line transparency
-   * @see Cpdf::setLineTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_line_transparency($mode, $opacity) {
+    }
+
+    /**
+     * Sets line transparency
+     * @see Cpdf::setLineTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_line_transparency($mode, $opacity) {
     $this->_pdf->setLineTransparency($mode, $opacity);
-  }
+    }
   
-  /**
-   * Sets fill transparency
-   * @see Cpdf::setFillTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_fill_transparency($mode, $opacity) {
+    /**
+     * Sets fill transparency
+     * @see Cpdf::setFillTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_fill_transparency($mode, $opacity) {
     $this->_pdf->setFillTransparency($mode, $opacity);
-  }
-
-  /**
-   * Sets the line style
-   *
-   * @see Cpdf::setLineStyle()
-   *
-   * @param float width
-   * @param string cap
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    }
+
+    /**
+     * Sets the line style
+     *
+     * @see Cpdf::setLineStyle()
+     *
+     * @param float width
+     * @param string cap
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
     $this->_pdf->setLineStyle($width, $cap, $join, $dash);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
 
-  // Canvas implementation
+    // Canvas implementation
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
                 $blend = "Normal", $opacity = 1.0) {
     //pre_r(compact("x1", "y1", "x2", "y2", "color", "width", "style"));
 
@@ -488,35 +488,35 @@ 
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->line($x1, $this->y($y1),
-                      $x2, $this->y($y2));
-  }
+                        $x2, $this->y($y2));
+    }
                               
-  //........................................................................
-
-  /**
-   * Convert a GIF image to a PNG image
-   *
-   * @return string The url of the newly converted image
-   */
-  protected function _convert_gif_to_png($image_url) {
+    //........................................................................
+
+    /**
+     * Convert a GIF image to a PNG image
+     *
+     * @return string The url of the newly converted image
+     */
+    protected function _convert_gif_to_png($image_url) {
     
     if ( !function_exists("imagecreatefromgif") ) {
-      throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
+        throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
     }
 
     $old_err = set_error_handler("record_warnings");
     $im = imagecreatefromgif($image_url);
 
     if ( $im ) {
-      imageinterlace($im, 0);
+        imageinterlace($im, 0);
 
-      $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
-      $this->_image_cache[] = $filename;
+        $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
+        $this->_image_cache[] = $filename;
 
-      imagepng($im, $filename);
+        imagepng($im, $filename);
 
     } else {
-      $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
 
     }
 
@@ -524,21 +524,21 @@ 
 
     return $filename;
     
-  }
+    }
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
-                     $blend = "Normal", $opacity = 1.0) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
+                        $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->rectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
+    function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_line_style(1, "square", "miter", array());
@@ -546,12 +546,12 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     $this->_pdf->filledRectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = array(),
-                   $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function polygon($points, $color, $width = null, $style = array(),
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -560,19 +560,19 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
     
     // Adjust y values
     for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+        $points[$i] = $this->y($points[$i]);
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null,
-                  $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null,
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -581,14 +581,14 @@ 
     $this->_set_fill_transparency($blend, $opacity);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
     if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
 
@@ -600,15 +600,15 @@ 
       //debugpng
       if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "png":
       //debugpng
       if (DEBUGPNG)  print '!!!png!!!';
 
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "gif":
       // Convert gifs to pngs
@@ -618,41 +618,41 @@ 
         //debugpng
         if (DEBUGPNG)  print '!!!gif addImagePng!!!';
 
-      	//If optimization to direct png creation from gd object is available,
+            //If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
+        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+             $this->_pdf->image_iscached($img_url) ) {
+            //If same image has occured already before, no need to load because
+            //duplicate will anyway be eliminated.
+            $img = null;
+        } else {
+            $img = @imagecreatefromgif($img_url);
+            if (!$img) {
+                return;
+            }
+            imageinterlace($img, 0);
+        }
+        $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+        } else {
         //debugpng
         if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        }
+        break;
 
     default:
       //debugpng
       if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+        break;
     }
     
     return;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0),
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0),
                 $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
 
     list($r, $g, $b) = $color;
@@ -693,142 +693,142 @@ 
     //print '<pre>['.$font.','.$size.','.$this->_pdf->getFontHeight($size).','.$this->_pdf->getFontDescender($size).','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][1].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontHeightOffset'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Ascender'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Descender'].']</pre>';
     //
     //$this->_pdf->addText($x, $this->y($y) - Font_Metrics::get_font_height($font, $size), $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
-	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
-  }
+    //$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
+    //$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
+    $this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function javascript($code) {
+    function javascript($code) {
     $this->_pdf->addJavascript($code);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     $this->_pdf->addDestination($anchorname,"Fit");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
 
     if ( strpos($url, '#') === 0 ) {
-      // Local link
-      $name = substr($url,1);
-      if ( $name )
+        // Local link
+        $name = substr($url,1);
+        if ( $name )
         $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
 
     } else {
-      $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
+        $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
     }
     
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $this->_pdf->selectFont($font);
     if (!DOMPDF_UNICODE_ENABLED) {
-    	$text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
+        $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
     }
     return $this->_pdf->getTextWidth($size, $text, $spacing);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
     $this->_pdf->selectFont($font);
     return $this->_pdf->getFontHeight($size);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  /**
-   * Writes text at the specified x and y coordinates on every page
-   *
-   * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
-   * with their current values.
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
-   */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0) {
+    /**
+     * Writes text at the specified x and y coordinates on every page
+     *
+     * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
+     * with their current values.
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle angle to write the text at, measured CW starting from the x-axis
+     */
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
+                        $adjust = 0, $angle = 0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
     
-  /**
-   * Processes a script on every page
-   *
-   * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
-   *
-   * This function can be used to add page numbers to all pages
-   * after the first one, for example.
-   *
-   * @param string $code the script code
-   * @param string $type the language type for script
-   */
-  function page_script($code, $type = "text/php") {
+    /**
+     * Processes a script on every page
+     *
+     * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
+     *
+     * This function can be used to add page numbers to all pages
+     * after the first one, for example.
+     *
+     * @param string $code the script code
+     * @param string $type the language type for script
+     */
+    function page_script($code, $type = "text/php") {
     $_t = "script";
     $this->_page_text[] = compact("_t", "code", "type");
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function new_page() {
+    function new_page() {
     $this->_page_count++;
 
     $ret = $this->_pdf->newPage();
     $this->_pages[] = $ret;
     return $ret;
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add text to each page after rendering is complete
-   */
-  protected function _add_page_text() {
+    /**
+     * Add text to each page after rendering is complete
+     */
+    protected function _add_page_text() {
     
     if ( !count($this->_page_text) )
-      return;
+        return;
 
     $page_number = 1;
     $eval = null;
 
     foreach ($this->_pages as $pid) {
-      $this->reopen_object($pid);
+        $this->reopen_object($pid);
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
@@ -837,63 +837,63 @@ 
         $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
                             array($page_number, $this->_page_count), $text);
         $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            break;
           
         case "script":
           if (!$eval) {
             $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->close_object();
-      $page_number++;
+        $this->close_object();
+        $page_number++;
+    }
     }
-  }
   
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null) {
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null) {
     // Add page text
     $this->_add_page_text();
     
     $options["Content-Disposition"] = $filename;
     $this->_pdf->stream($options);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Returns the PDF as a string
-   *
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PDF as a string
+     *
+     * @return string
+     */
+    function output($options = null) {
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
+        $debug = 1;
     else
-      $debug = 0;
+        $debug = 0;
     
     return $this->_pdf->output($debug);
     
-  }
+    }
   
-  //........................................................................
-
-  /**
-   * Returns logging messages generated by the Cpdf class
-   *
-   * @return string
-   */
-  function get_messages() { return $this->_pdf->messages; }
+    //........................................................................
+
+    /**
+     * Returns logging messages generated by the Cpdf class
+     *
+     * @return string
+     */
+    function get_messages() { return $this->_pdf->messages; }
   
 }

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

Indentation +24 added lines, -25 removed lines

@@ -35,7 +35,6 @@ 
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
  * @package dompdf
-
  *
  * Changes
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
@@ -53,9 +52,9 @@ 
  */
 class List_Bullet_Renderer extends Abstract_Renderer {
 
-  //........................................................................
+    //........................................................................
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
 
     $style = $frame->get_style();
     $font_size = $style->get_font_size();
@@ -66,36 +65,36 @@ 
     if ( $style->list_style_image !== "none" &&
          strcmp($img = $frame->get_image_url(), DOMPDF_LIB_DIR . "/res/broken_image.png") != 0) {
 
-      list($x,$y) = $frame->get_position();
+        list($x,$y) = $frame->get_position();
       
-      //For expected size and aspect, instead of box size, use image natural size scaled to DPI.
-      // 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.
-      //$w = $frame->get_width();
-      //$h = $frame->get_height();
-      list($width, $height) = getimagesize($img);
-      $w = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-      $h = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+        //For expected size and aspect, instead of box size, use image natural size scaled to DPI.
+        // 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.
+        //$w = $frame->get_width();
+        //$h = $frame->get_height();
+        list($width, $height) = getimagesize($img);
+        $w = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
+        $h = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
       
-      $x -= $w;
-      $y -= ($line_height - $font_size)/2; //Reverse hinting of list_bullet_positioner
+        $x -= $w;
+        $y -= ($line_height - $font_size)/2; //Reverse hinting of list_bullet_positioner
 
-      $this->_canvas->image( $img, $frame->get_image_ext(), $x, $y, $w, $h);
+        $this->_canvas->image( $img, $frame->get_image_ext(), $x, $y, $w, $h);
 
     } else {
 
-      $bullet_style = $style->list_style_type;
+        $bullet_style = $style->list_style_type;
 
-      $fill = false;
+        $fill = false;
 
-      switch ($bullet_style) {
+        switch ($bullet_style) {
 
-      default:
+        default:
       case "disc":
         $fill = true;
 
-      case "circle":
+        case "circle":
         list($x,$y) = $frame->get_position();
         $r = ($font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE /*-List_Bullet_Frame_Decorator::BULLET_THICKNESS*/ ))/2;
         $x -= $font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE/2);
@@ -104,7 +103,7 @@ 
         $this->_canvas->circle($x, $y, $r, $style->color, $o, null, $fill);
         break;
 
-      case "square":
+        case "square":
         list($x, $y) = $frame->get_position();
         $w = $font_size*List_Bullet_Frame_Decorator::BULLET_SIZE;
         $x -= $w;
@@ -112,10 +111,10 @@ 
         $this->_canvas->filled_rectangle($x, $y, $w, $w, $style->color);
         break;
       
-      case "none":
+        case "none":
         break;
 
-      }
+        }
+    }
     }
-  }
 }

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

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...

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

Indentation +137 added lines, -137 removed lines

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

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

Indentation +106 added lines, -107 removed lines

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