chamilo / chamilo-lms

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

Indentation +6 added lines, -7 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,22 +46,22 @@ 
  */
 class Table_Row_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
 
     $cb = $this->_frame->get_containing_block();    
     $p = $this->_frame->get_prev_sibling();
 
     if ( $p ) 
-      $y = $p->get_position("y") + $p->get_margin_height();
+        $y = $p->get_position("y") + $p->get_margin_height();
 
     else
-      $y = $cb["y"];
+        $y = $cb["y"];
 
     $this->_frame->set_position($cb["x"], $y);
 
-  }
+    }
 }

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

Indentation +294 added lines, -295 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_frame_decorator.cls.php,v $
- * Created on: 2004-06-15
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: page_frame_decorator.cls.php,v $
+     * Created on: 2004-06-15
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: page_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,137 +46,137 @@ 
  */
 class Page_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * y value of bottom page margin
-   *
-   * @var float
-   */
-  protected $_bottom_page_margin;
-
-  /**
-   * Flag indicating page is full.
-   *
-   * @var bool
-   */
-  protected $_page_full;
-
-  /**
-   * Number of tables currently being reflowed
-   *
-   * @var int
-   */
-  protected $_in_table;
-
-  /**
-   * The pdf renderer
-   *
-   * @var Renderer
-   */
-  protected $_renderer;
-
-  //........................................................................
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * y value of bottom page margin
+     *
+     * @var float
+     */
+    protected $_bottom_page_margin;
+
+    /**
+     * Flag indicating page is full.
+     *
+     * @var bool
+     */
+    protected $_page_full;
+
+    /**
+     * Number of tables currently being reflowed
+     *
+     * @var int
+     */
+    protected $_in_table;
+
+    /**
+     * The pdf renderer
+     *
+     * @var Renderer
+     */
+    protected $_renderer;
+
+    //........................................................................
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_page_full = false;
     $this->_in_table = 0;
     $this->_bottom_page_margin = null;
-  }
+    }
 
 
-  /**
-   * Set the renderer used for this pdf
-   *
-   * @param Renderer $renderer the renderer to use
-   */
-  function set_renderer($renderer) {
+    /**
+     * Set the renderer used for this pdf
+     *
+     * @param Renderer $renderer the renderer to use
+     */
+    function set_renderer($renderer) {
     $this->_renderer = $renderer;
-  }
-
-  /**
-   * Return the renderer used for this pdf
-   *
-   * @return Renderer
-   */
-  function get_renderer() {
+    }
+
+    /**
+     * Return the renderer used for this pdf
+     *
+     * @return Renderer
+     */
+    function get_renderer() {
     return $this->_renderer;
-  }
-
-  /**
-   * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $w
-   * @param float $h
-   */
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    }
+
+    /**
+     * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $w
+     * @param float $h
+     */
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
     if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
-  }
-
-  /**
-   * Returns true if the page is full and is no longer accepting frames.
-   *
-   * @return bool
-   */
-  function is_full() {
+        $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    }
+
+    /**
+     * Returns true if the page is full and is no longer accepting frames.
+     *
+     * @return bool
+     */
+    function is_full() {
     return $this->_page_full;
-  }
+    }
 
-  /**
-   * Start a new page by resetting the full flag.
-   */
-  function next_page() {
+    /**
+     * Start a new page by resetting the full flag.
+     */
+    function next_page() {
     $this->_renderer->new_page();
     $this->_page_full = false;
-  }
+    }
 
-  /**
-   * Indicate to the page that a table is currently being reflowed.
-   */
-  function table_reflow_start() {
+    /**
+     * Indicate to the page that a table is currently being reflowed.
+     */
+    function table_reflow_start() {
     $this->_in_table++;
-  }
+    }
 
-  /**
-   * Indicate to the page that table reflow is finished.
-   */
-  function table_reflow_end() {
+    /**
+     * Indicate to the page that table reflow is finished.
+     */
+    function table_reflow_end() {
     $this->_in_table--;
-  }
-
-  /**
-   * Return whether we are currently in a nested table or not
-   *
-   * @return bool
-   */
-  function in_nested_table() {
+    }
+
+    /**
+     * Return whether we are currently in a nested table or not
+     *
+     * @return bool
+     */
+    function in_nested_table() {
     return $this->_in_table > 1;
-  }
+    }
   
-  /**
-   * Check if a forced page break is required before $frame.  This uses the
-   * frame's page_break_before property as well as the preceeding frame's
-   * page_break_after property.
-   *
-   * @link http://www.w3.org/TR/CSS21/page.html#forced
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
-   */
-  function check_forced_page_break(Frame $frame) {
+    /**
+     * Check if a forced page break is required before $frame.  This uses the
+     * frame's page_break_before property as well as the preceeding frame's
+     * page_break_after property.
+     *
+     * @link http://www.w3.org/TR/CSS21/page.html#forced
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a page break occured
+     */
+    function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
     if ( $this->_page_full )
-      return;
+        return;
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
@@ -185,42 +184,42 @@ 
     $style = $frame->get_style();
 
     if ( !in_array($style->display, $block_types) )
-      return false;
+        return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
     while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+        $prev = $prev->get_prev_sibling();
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
-      // Prevent cascading splits
-      $frame->split();
-      // We have to grab the style again here because split() resets
-      // $frame->style to the frame's orignal style.
-      $frame->get_style()->page_break_before = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        // We have to grab the style again here because split() resets
+        // $frame->style to the frame's orignal style.
+        $frame->get_style()->page_break_before = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
-      // Prevent cascading splits
-      $frame->split();
-      $prev->get_style()->page_break_after = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        $prev->get_style()->page_break_after = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     return false;
-  }
-
-  /**
-   * Determine if a page break is allowed before $frame
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a break is allowed, false otherwise
-   */
-  protected function _page_break_allowed(Frame $frame) {
+    }
+
+    /**
+     * Determine if a page break is allowed before $frame
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a break is allowed, false otherwise
+     */
+    protected function _page_break_allowed(Frame $frame) {
     /**
      *
      * http://www.w3.org/TR/CSS21/page.html#allowed-page-breaks
@@ -276,162 +275,162 @@ 
     // Block Frames (1):
     if ( in_array($display, $block_types) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
         dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rules A & B
+        // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+        if ( $frame->get_style()->page_break_before === "avoid" ) {
         dompdf_debug("page-break", "before: avoid");
         return false;
-      }
+        }
 
-      // Find the preceeding block-level sibling
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+        // Find the preceeding block-level sibling
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && !in_array($prev->get_style()->display, $block_types) )
         $prev = $prev->get_prev_sibling();
 
-      // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+        // Does the previous element allow a page break after?
+        if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
         dompdf_debug("page-break", "after: avoid");
         return false;
-      }
+        }
 
-      // If both $prev & $frame have the same parent, check the parent's
-      // page_break_inside property.
-      $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent inside: avoid");
+        // If both $prev & $frame have the same parent, check the parent's
+        // page_break_inside property.
+        $parent = $frame->get_parent();
+        if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+            dompdf_debug("page-break", "parent inside: avoid");
         return false;
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame is
-      // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame is
+        // on the page before splitting.
+        if ( $parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // If the frame is the first block-level frame, use the value from
-      // $frame's parent instead.
-      if ( !$prev && $parent )
+        // If the frame is the first block-level frame, use the value from
+        // $frame's parent instead.
+        if ( !$prev && $parent )
         return $this->_page_break_allowed( $parent );
 
-      dompdf_debug("page-break", "block: break allowed");
-      return true;
+        dompdf_debug("page-break", "block: break allowed");
+        return true;
 
     }
 
     // Inline frames (2):
     else if ( in_array($display, Style::$INLINE_TYPES) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
+            dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rule C
-      $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
-          dompdf_debug("page-break", "orphans");
+        // Rule C
+        $block_parent = $frame->find_block_parent();
+        if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+            dompdf_debug("page-break", "orphans");
         return false;
-      }
+        }
 
-      // FIXME: Checking widows is tricky without having laid out the
-      // remaining line boxes.  Just ignore it for now...
+        // FIXME: Checking widows is tricky without having laid out the
+        // remaining line boxes.  Just ignore it for now...
 
-      // Rule D
-      $p = $block_parent;
-      while ($p) {
+        // Rule D
+        $p = $block_parent;
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame with
-      // some content is on the page before splitting.
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame with
+        // some content is on the page before splitting.
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+        if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
+        // Skip breaks on empty text nodes
+        if ( $frame->get_node()->nodeName === "#text" &&
            $frame->get_node()->nodeValue == "" )
         return false;
 
-      dompdf_debug("page-break", "inline: break allowed");
-      return true;
+        dompdf_debug("page-break", "inline: break allowed");
+        return true;
 
     // Table-rows
     } else if ( $display === "table-row" ) {
 
-      // Simply check if the parent table's page_break_inside property is
-      // not 'avoid'
-      $p = Table_Frame_Decorator::find_parent_table($frame);
+        // Simply check if the parent table's page_break_inside property is
+        // not 'avoid'
+        $p = Table_Frame_Decorator::find_parent_table($frame);
 
-      while ($p) {
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
-         dompdf_debug("page-break", "table: first-row");
+        // Avoid breaking after the first row of a table
+        if ( $p && $p->get_first_child() === $frame) {
+            dompdf_debug("page-break", "table: first-row");
         return false;
-      }
+        }
 
-      // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+        // If this is a nested table, prevent the page from breaking
+        if ( $this->_in_table > 1 ) {
         dompdf_debug("page-break", "table: nested table");
         return false;
-      }
+        }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
-      return true;
+        dompdf_debug("page-break","table-row/row-groups: break allowed");
+        return true;
 
     } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      // Disallow breaks at row-groups: only split at row boundaries
-      return false;
+        // Disallow breaks at row-groups: only split at row boundaries
+        return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
-      return false;
+        dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+        return false;
+    }
+
     }
 
-  }
-
-  /**
-   * Check if $frame will fit on the page.  If the frame does not fit,
-   * the frame tree is modified so that a page break occurs in the
-   * correct location.
-   *
-   * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
-   */
-  function check_page_break(Frame $frame) {
+    /**
+     * Check if $frame will fit on the page.  If the frame does not fit,
+     * the frame tree is modified so that a page break occurs in the
+     * correct location.
+     *
+     * @param Frame $frame the frame to check
+     * @return Frame the frame following the page break
+     */
+    function check_page_break(Frame $frame) {
     // Do not split if we have already
     if ( $this->_page_full )
-      return false;
+        return false;
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -440,18 +439,18 @@ 
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
     while ( $p ) {
-      $style = $p->get_style();
-      $max_y += $style->length_in_pt(array($style->margin_bottom,
-                                           $style->padding_bottom,
-                                           $style->border_bottom_width));
-      $p = $p->get_parent();
+        $style = $p->get_style();
+        $max_y += $style->length_in_pt(array($style->margin_bottom,
+                                            $style->padding_bottom,
+                                            $style->border_bottom_width));
+        $p = $p->get_parent();
     }
 
 
     // Check if $frame flows off the page
     if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
-      return false;
+        // no: do nothing
+        return false;
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -466,58 +465,58 @@ 
     dompdf_debug("page-break","Starting search");
     while ( $iter ) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
-         dompdf_debug("page-break", "reached root.");
+        if ( $iter === $this ) {
+            dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
-      }
+        }
 
-      if ( $this->_page_break_allowed($iter) ) {
+        if ( $this->_page_break_allowed($iter) ) {
         dompdf_debug("page-break","break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
-      }
+        }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
-         dompdf_debug("page-break", "following last child.");
+        if ( !$flg && $next = $iter->get_last_child() ) {
+            dompdf_debug("page-break", "following last child.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         $iter = $next;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_prev_sibling() ) {
-         dompdf_debug("page-break", "following prev sibling.");
+        if ( $next = $iter->get_prev_sibling() ) {
+            dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
              !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
                   in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = false;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_parent() ) {
-         dompdf_debug("page-break", "following parent.");
+        if ( $next = $iter->get_parent() ) {
+            dompdf_debug("page-break", "following parent.");
 
         if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = true;
         continue;
-      }
+        }
 
-      break;
+        break;
 
     }
 
@@ -528,33 +527,33 @@ 
 
     // If we are in a table, backtrack to the nearest top-level table row
     if ( $this->_in_table ) {
-      $num_tables = $this->_in_table - 1;
+        $num_tables = $this->_in_table - 1;
 
-      $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+        $iter = $frame;
+        while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
         $iter = $iter->get_parent();
         $num_tables--;
-      }
+        }
 
-      $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+        $iter = $frame;
+        while ($iter && $iter->get_style()->display !== "table-row" )
         $iter = $iter->get_parent();
 
-      $iter->split();
-      $this->_page_full = true;
-      return true;
+        $iter->split();
+        $this->_page_full = true;
+        return true;
     }
 
     $frame->split();
     $this->_page_full = true;
     return true;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function split($frame = null) {
+    function split($frame = null) {
     // Do nothing
-  }
+    }
 
 }

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

Indentation +9 added lines, -10 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id */
@@ -44,9 +43,9 @@ 
  */
 class Absolute_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
 
-  function position() {
+    function position() {
 
     $cb = $this->_frame->get_containing_block();
 
@@ -61,27 +60,27 @@ 
 
     if ( $p ) {
 
-      // Get the parent's padding box (see http://www.w3.org/TR/CSS21/visuren.html#propdef-top)
+        // Get the parent's padding box (see http://www.w3.org/TR/CSS21/visuren.html#propdef-top)
 
-      list($x, $y, $w, $h) = $p->get_padding_box();
+        list($x, $y, $w, $h) = $p->get_padding_box();
 
     } else {
 
-      $x = $cb["x"];
-      $y = $cb["y"];
+        $x = $cb["x"];
+        $y = $cb["y"];
 
     }
 
     if ( isset($top) ) {
-      $y += $top;
+        $y += $top;
     } else if ( isset($bottom) ) {
-      // FIXME: need to know this frame's height before we can do this correctly
+        // FIXME: need to know this frame's height before we can do this correctly
     }
 
     $x += $left;
 
     $this->_frame->set_position($x, $y);
 
-  }
+    }
 
 }
\ No newline at end of file

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

Indentation +12 added lines, -13 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: inline_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,11 +46,11 @@ 
  */
 class Inline_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame $frame) { parent::__construct($frame); }
+    function __construct(Frame $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
     $this->_frame->position();
 
@@ -59,23 +58,23 @@ 
 
     // Add our margin, padding & border to the first and last children
     if ( ($f = $this->_frame->get_first_child()) && $f instanceof Text_Frame_Decorator ) {
-      $f->get_style()->margin_left = $style->margin_left;
-      $f->get_style()->padding_left = $style->padding_left;
-      $f->get_style()->border_left = $style->border_left;
+        $f->get_style()->margin_left = $style->margin_left;
+        $f->get_style()->padding_left = $style->padding_left;
+        $f->get_style()->border_left = $style->border_left;
     }
 
     if ( ($l = $this->_frame->get_last_child()) && $l instanceof Text_Frame_Decorator ) {
-      $f->get_style()->margin_right = $style->margin_right;
-      $f->get_style()->padding_right = $style->padding_right;
-      $f->get_style()->border_right = $style->border_right;
+        $f->get_style()->margin_right = $style->margin_right;
+        $f->get_style()->padding_right = $style->padding_right;
+        $f->get_style()->border_right = $style->border_right;
     }
 
     // Set the containing blocks and reflow each child.  The containing
     // block is not changed by line boxes.
     foreach ( $this->_frame->get_children() as $child ) {
       
-      $child->set_containing_block($cb);
-      $child->reflow();
+        $child->set_containing_block($cb);
+        $child->reflow();
+    }
     }
-  }
 }

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

Indentation +96 added lines, -97 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cached_pdf_decorator.cls.php,v $
- * Created on: 2004-07-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cached_pdf_decorator.cls.php,v $
+     * Created on: 2004-07-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: cached_pdf_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -53,90 +52,90 @@ 
  * @package dompdf
  */
 class Cached_PDF_Decorator extends CPDF_Adapter implements Canvas {
-  protected $_pdf;
-  protected $_cache_id;
-  protected $_current_page_id;
-  protected $_fonts;  // fonts used in this document
+    protected $_pdf;
+    protected $_cache_id;
+    protected $_current_page_id;
+    protected $_fonts;  // fonts used in this document
   
-  function __construct($cache_id, CPDF_Adapter $pdf) {
+    function __construct($cache_id, CPDF_Adapter $pdf) {
     $this->_pdf = $pdf;
     $this->_cache_id = $cache_id;
     $this->_fonts = array();
     
     $this->_current_page_id = $this->_pdf->open_object();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_cpdf() { return $this->_pdf->get_cpdf(); }
+    function get_cpdf() { return $this->_pdf->get_cpdf(); }
 
-  function open_object() { $this->_pdf->open_object(); }
-  function reopen_object() { return $this->_pdf->reopen_object(); }
+    function open_object() { $this->_pdf->open_object(); }
+    function reopen_object() { return $this->_pdf->reopen_object(); }
   
-  function close_object() { $this->_pdf->close_object(); }
+    function close_object() { $this->_pdf->close_object(); }
 
-  function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
+    function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
 
-  function serialize_object($id) { $this->_pdf->serialize_object($id); }
+    function serialize_object($id) { $this->_pdf->serialize_object($id); }
 
-  function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
+    function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
     
-  //........................................................................
+    //........................................................................
 
-  function get_width() { return $this->_pdf->get_width(); }
-  function get_height() {  return $this->_pdf->get_height(); }
-  function get_page_number() { return $this->_pdf->get_page_number(); }
-  function get_page_count() { return $this->_pdf->get_page_count(); }
+    function get_width() { return $this->_pdf->get_width(); }
+    function get_height() {  return $this->_pdf->get_height(); }
+    function get_page_number() { return $this->_pdf->get_page_number(); }
+    function get_page_count() { return $this->_pdf->get_page_count(); }
 
-  function set_page_number($num) { $this->_pdf->set_page_number($num); }
-  function set_page_count($count) { $this->_pdf->set_page_count($count); }
+    function set_page_number($num) { $this->_pdf->set_page_number($num); }
+    function set_page_count($count) { $this->_pdf->set_page_count($count); }
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
     $this->_pdf->line($x1, $y1, $x2, $y2, $color, $width, $style);
-  }
+    }
                               
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
     $this->_pdf->rectangle($x1, $y1, $w, $h, $color, $width, $style);
-  }
+    }
  
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_pdf->filled_rectangle($x1, $y1, $w, $h, $color);
-  }
+    }
     
-  function polygon($points, $color, $width = null, $style = array(), $fill = false) {
+    function polygon($points, $color, $width = null, $style = array(), $fill = false) {
     $this->_pdf->polygon($points, $color, $width, $style, $fill);
-  }
+    }
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
     $this->_pdf->circle($x, $y, $r1, $color, $width, $style, $fill);
-  }
+    }
 
-  function image($img_url, $x, $y, $w = null, $h = null) {
+    function image($img_url, $x, $y, $w = null, $h = null) {
     $this->_pdf->image($img_url, $x, $y, $w, $h);
-  }
+    }
   
-  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) {
     $this->_fonts[$font] = true;
     $this->_pdf->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-  }
+    }
 
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_text($x, $y, $text, $font, $size, $color, $adjust, $angle);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function page_script($script, $type = 'text/php') {
+    function page_script($script, $type = 'text/php') {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_script($script, $type);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function new_page() {
+    function new_page() {
     $this->_pdf->close_object();
 
     // Add the object to the current page
@@ -144,43 +143,43 @@ 
     $this->_pdf->new_page();    
 
     Page_Cache::store_page($this->_cache_id,
-                           $this->_pdf->get_page_number() - 1,
-                           $this->_pdf->serialize_object($this->_current_page_id));
+                            $this->_pdf->get_page_number() - 1,
+                            $this->_pdf->serialize_object($this->_current_page_id));
 
     $this->_current_page_id = $this->_pdf->open_object();
     return $this->_current_page_id;
-  }
+    }
   
-  function stream($filename) {
+    function stream($filename) {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
+        $this->_current_page_id = null;
     }
     
     $this->_pdf->stream($filename);
     
-  }
+    }
   
-  function &output() {
+    function &output() {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        $this->_current_page_id = null;
     }
     
     return $this->_pdf->output();
-  }
+    }
   
-  function get_messages() { return $this->_pdf->get_messages(); }
+    function get_messages() { return $this->_pdf->get_messages(); }
   
 }

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

Indentation +328 added lines, -329 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -57,98 +56,98 @@ 
  */
 class TCPDF_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.
 
 
-  /**
-   * Instance of the TCPDF class
-   *
-   * @var TCPDF
-   */
-  private $_pdf;
-
-  /**
-   * PDF width in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height in points
-   *
-   * @var float
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Last line width used
-   *
-   * @var float
-   */
-  private $_last_line_width;
+    /**
+     * Instance of the TCPDF class
+     *
+     * @var TCPDF
+     */
+    private $_pdf;
+
+    /**
+     * PDF width in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height in points
+     *
+     * @var float
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Last line width used
+     *
+     * @var float
+     */
+    private $_last_line_width;
   
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accessing after initial rendering is 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") {
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accessing after initial rendering is 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_SIZE[$paper];
+        $size = self::$PAPER_SIZE[$paper];
     else
-      $size = self::$PAPER_SIZE["letter"];
+        $size = self::$PAPER_SIZE["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];
@@ -163,135 +162,135 @@ 
     $this->_page_text = array();
 
     $this->_last_fill_color     =
-      $this->_last_stroke_color =
-      $this->_last_line_width   = null;
+        $this->_last_stroke_color =
+        $this->_last_line_width   = null;
 
-  }  
+    }  
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
-
-  /**
-   * Sets the stroke colour
-   *
-   * @param array $color
-   */
-  protected function _set_stroke_colour($colour) {
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
+
+    /**
+     * Sets the stroke colour
+     *
+     * @param array $color
+     */
+    protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_stroke_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_stroke_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Sets the fill colour
-   *
-   * @param array $color
-   */
-  protected function _set_fill_colour($colour) {
+    /**
+     * Sets the fill colour
+     *
+     * @param array $color
+     */
+    protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_fill_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_fill_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Return the TCPDF instance
-   *
-   * @return TCPDF
-   */
-  function get_tcpdf() { return $this->_pdf; }
+    /**
+     * Return the TCPDF instance
+     *
+     * @return TCPDF
+     */
+    function get_tcpdf() { return $this->_pdf; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     return $this->_page_number;
-  }
-
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    }
+
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     return $this->_page_count;
-  }
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     $this->_page_count = (int)$count;
-  }
-
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
 
     // FIXME: ugh, need to handle different styles here
     $this->_pdf->line($x1, $y1, $x2, $y2);
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
@@ -299,165 +298,165 @@ 
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     $this->_set_fill_colour($color);
     
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h, "F");
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
     // FIXME: FPDF sucks
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
-
-  function javascript($code){}
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h){}
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+
+    function javascript($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 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 named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname){}
+
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height){}
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0){}
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size){}
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0){}
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size){}
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page(){}
-
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null){}
-
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($options = null){}
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page(){}
+
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null){}
+
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null){}
   
 }
     

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

Indentation +378 added lines, -379 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: gd_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -49,73 +48,73 @@ 
  */
 class GD_Adapter implements Canvas {
 
-  /**
-   * Resoure handle for the image
-   *
-   * @var resource
-   */
-  private $_img;
-
-  /**
-   * Image width in pixels
-   *
-   * @var int
-   */
-  private $_width;
-
-  /**
-   * Image height in pixels
-   *
-   * @var int
-   */
-  private $_height;
-
-  /**
-   * Image antialias factor
-   *
-   * @var float
-   */
-  private $_aa_factor;
-
-  /**
-   * Allocated colors
-   *
-   * @var array
-   */
-  private $_colors;
-
-  /**
-   * Background color
-   *
-   * @var int
-   */
-  private $_bg_color;
+    /**
+     * Resoure handle for the image
+     *
+     * @var resource
+     */
+    private $_img;
+
+    /**
+     * Image width in pixels
+     *
+     * @var int
+     */
+    private $_width;
+
+    /**
+     * Image height in pixels
+     *
+     * @var int
+     */
+    private $_height;
+
+    /**
+     * Image antialias factor
+     *
+     * @var float
+     */
+    private $_aa_factor;
+
+    /**
+     * Allocated colors
+     *
+     * @var array
+     */
+    private $_colors;
+
+    /**
+     * Background color
+     *
+     * @var int
+     */
+    private $_bg_color;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
-   * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
-   * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
-   * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
-   */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
+     * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
+     * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
+     * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
+     */
+    function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+        if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
+        else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
     if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+        list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
     if ( $aa_factor < 1 )
-      $aa_factor = 1;
+        $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
     
@@ -128,8 +127,8 @@ 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
     if ( is_null($bg_color) || !is_array($bg_color) ) {
-      // Pure white bg
-      $bg_color = array(1,1,1,0);
+        // Pure white bg
+        $bg_color = array(1,1,1,0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -137,68 +136,68 @@ 
     imagesavealpha($this->_img, true);
     imagefill($this->_img, 0, 0, $this->_bg_color);
         
-  }
-
-  /**
-   * Return the GF image resource
-   *
-   * @return resource
-   */
-  function get_image() { return $this->_img; }
-
-  /**
-   * Return the image's width in pixels
-   *
-   * @return float
-   */
-  function get_width() { return $this->_width / $this->_aa_factor; }
-
-  /**
-   * Return the image's height in pixels
-   *
-   * @return float
-   */
-  function get_height() { return $this->_height / $this->_aa_factor; }
+    }
+
+    /**
+     * Return the GF image resource
+     *
+     * @return resource
+     */
+    function get_image() { return $this->_img; }
+
+    /**
+     * Return the image's width in pixels
+     *
+     * @return float
+     */
+    function get_width() { return $this->_width / $this->_aa_factor; }
+
+    /**
+     * Return the image's height in pixels
+     *
+     * @return float
+     */
+    function get_height() { return $this->_height / $this->_aa_factor; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     // FIXME
-  }
+    }
    
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     // FIXME
-  }    
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }    
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     // FIXME
-  }    
-
-  /**
-   * Allocate a new color.  Allocate with GD as needed and store
-   * previously allocated colors in $this->_colors.
-   *
-   * @param array $color  The new current color
-   * @return int           The allocated color
-   */
-  private function _allocate_color($color) {
+    }    
+
+    /**
+     * Allocate a new color.  Allocate with GD as needed and store
+     * previously allocated colors in $this->_colors.
+     *
+     * @param array $color  The new current color
+     * @return int           The allocated color
+     */
+    private function _allocate_color($color) {
     
     // Full opacity if no alpha set
     if ( !isset($color[3]) ) 
-      $color[3] = 0;
+        $color[3] = 0;
     
     list($r,$g,$b,$a) = $color;
     
@@ -221,33 +220,33 @@ 
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
     if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+        return $this->_colors[$key];
 
     if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+        $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+        $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
       
     return $this->_colors[$key];
     
-  }
+    }
   
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -260,63 +259,63 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      if ( count($style) == 1 ) {
+        if ( count($style) == 1 ) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
         }
 
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $this->_bg_color;
+            $gd_style[] = $this->_bg_color;
         }
 
-      } else {
+        } else {
 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+            if ( $i % 2 == 0 ) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+                $gd_style[] = $c;
             
-          } else {
+            } else {
             // Off pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+                $gd_style[] = $this->_bg_color;
             
-          }
-          $i++;
+            }
+            $i++;
+        }
         }
-      }
       
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
     
     imagesetthickness($this->_img, $width);
 
     imageline($this->_img, $x1, $y1, $x2, $y2, $c);
     
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -328,36 +327,36 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     imagerectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -369,79 +368,79 @@ 
 
     imagefilledrectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
 
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
     foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+        $points[$i] *= $this->_aa_factor;
 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+        imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+        imagepolygon($this->_img, $points, count($points) / 2, $c);
         
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -452,55 +451,55 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+        imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+        imageellipse($this->_img, $x, $y, $r, $r, $c);
         
-  }
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    }
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h) {
 
     switch ($img_type) {
     case "png":
       $src = @imagecreatefrompng($img_url);
-      break;
+        break;
       
     case "gif":
       $src = @imagecreatefromgif($img_url);
-      break;
+        break;
       
     case "jpg":
     case "jpeg":
       $src = @imagecreatefromjpeg($img_url);
-      break;
+        break;
 
     default:
       break;
@@ -508,7 +507,7 @@ 
     }
 
     if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+        return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -523,23 +522,23 @@ 
     
     imagecopyresampled($this->_img, $src, $x, $y, 0, 0, $w, $h, $img_w, $img_h);
     
-  }
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle Text angle
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    }
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle Text angle
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -551,106 +550,106 @@ 
     $c = $this->_allocate_color($color);
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
     
-  }
+    }
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
-
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    }
+
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     // Not implemented
-  }
-
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    }
+
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
     // Not implemented
-  }
-
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0) {    
+    }
+
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0) {    
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
     return $x2 - $x1;
-  }
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size) {
+    }
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size) {
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
     return $y2 - $y1;
-  }
+    }
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page() {
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page() {
     // FIXME
-  }    
+    }    
 
-  /**
-   * Streams the image directly to the browser
-   *
-   * @param string $filename the name of the image file (ignored)
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   */
-  function stream($filename, $options = null) {
+    /**
+     * Streams the image directly to the browser
+     *
+     * @param string $filename the name of the image file (ignored)
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     */
+    function stream($filename, $options = null) {
 
     // Perform any antialiasing
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
 
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = strtolower($options["type"]);
     
@@ -663,42 +662,42 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      header("Content-type: image/jpeg");
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        header("Content-type: image/jpeg");
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       header("Content-type: image/png");
-      imagepng($dst);
-      break;
+        imagepng($dst);
+        break;
     }
 
     if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
-  }
+        imagedestroy($dst);
+    }
 
-  /**
-   * Returns the PNG as a string
-   *
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PNG as a string
+     *
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     * @return string
+     */
+    function output($options = null) {
 
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
     
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = $options["type"];
     
@@ -711,23 +710,23 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       imagepng($dst);
-      break;
+        break;
     }
 
     $image = ob_get_contents();
     ob_end_clean();
 
     if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+        imagedestroy($dst);
     
     return $image;
-  }
+    }
   
   
 }

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

Indentation +49 added lines, -50 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: text_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,34 +46,34 @@ 
  */
 class Text_Frame_Decorator extends Frame_Decorator {
   
-  // protected members
-  protected $_text_spacing;
+    // protected members
+    protected $_text_spacing;
   
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     if ( $frame->get_node()->nodeName !== "#text" )
-      throw new DOMPDF_Exception("Text_Decorator can only be applied to #text nodes.");
+        throw new DOMPDF_Exception("Text_Decorator can only be applied to #text nodes.");
     
     parent::__construct($frame, $dompdf);
     $this->_text_spacing = null;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_text_spacing = null;
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  // Accessor methods
-  function get_text_spacing() { return $this->_text_spacing; }
+    // Accessor methods
+    function get_text_spacing() { return $this->_text_spacing; }
       
-  function get_text() {
+    function get_text() {
     // FIXME: this should be in a child class (and is incorrect)
     if ( $this->_frame->get_style()->content !== "normal" ) {
-      $this->_frame->get_node()->data = $this->_frame->get_style()->content;
-      $this->_frame->get_style()->content = "normal";
+        $this->_frame->get_node()->data = $this->_frame->get_style()->content;
+        $this->_frame->get_style()->content = "normal";
     }
 
 //      pre_r("---");
@@ -86,19 +85,19 @@ 
 //      pre_r("width: " . Font_Metrics::get_text_width($text, $style->font_family, $style->font_size));
 
     return $this->_frame->get_node()->data;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Vertical margins & padding do not apply to text frames
+    // Vertical margins & padding do not apply to text frames
 
-  // http://www.w3.org/TR/CSS21/visudet.html#inline-non-replaced:
-  //
-  // The vertical padding, border and margin of an inline, non-replaced box
-  // start at the top and bottom of the content area, not the
-  // 'line-height'. But only the 'line-height' is used to calculate the
-  // height of the line box.
-  function get_margin_height() {
+    // http://www.w3.org/TR/CSS21/visudet.html#inline-non-replaced:
+    //
+    // The vertical padding, border and margin of an inline, non-replaced box
+    // start at the top and bottom of the content area, not the
+    // 'line-height'. But only the 'line-height' is used to calculate the
+    // height of the line box.
+    function get_margin_height() {
     // This function is called in add_frame_to_line() and is used to
     // determine the line height, so we actually want to return the
     // 'line-height' property, not the actual margin box
@@ -116,28 +115,28 @@ 
 
     return ($style->line_height / $size) * Font_Metrics::get_font_height($font, $size);
     
-  }
+    }
 
-  function get_padding_box() {
+    function get_padding_box() {
     $pb = $this->_frame->get_padding_box();
     $pb[3] = $pb["h"] = $this->_frame->get_style()->height;
     return $pb;
-  }
-  //........................................................................
+    }
+    //........................................................................
 
-  // Set method
-  function set_text_spacing($spacing) {
+    // Set method
+    function set_text_spacing($spacing) {
     $this->_text_spacing = $spacing;
 
     $style = $this->_frame->get_style();
     // Re-adjust our width to account for the change in spacing
     $style->width = Font_Metrics::get_text_width($this->get_text(), $style->font_family, $style->font_size, $spacing);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Recalculate the text width
-  function recalculate_width() {
+    // Recalculate the text width
+    function recalculate_width() {
     $style = $this->get_style();
     $text = $this->get_text();
     $size = $style->font_size;
@@ -145,17 +144,17 @@ 
     $word_spacing = $style->length_in_pt($style->word_spacing);
 
     $style->width = Font_Metrics::get_text_width($text, $font, $size, $word_spacing);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  // Text manipulation methods
+    // Text manipulation methods
   
-  // split the text in this frame at the offset specified.  The remaining
-  // text is added a sibling frame following this one and is returned.
-  function split_text($offset) {
+    // split the text in this frame at the offset specified.  The remaining
+    // text is added a sibling frame following this one and is returned.
+    function split_text($offset) {
     if ( $offset == 0 )
-      return;
+        return;
 
     $split = $this->_frame->get_node()->splitText($offset);
     $deco = $this->copy($split);
@@ -164,20 +163,20 @@ 
     $p->insert_child_after($deco, $this, false);
 
     if ( $p instanceof Inline_Frame_Decorator )
-      $p->split($deco);
+        $p->split($deco);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function delete_text($offset, $count) {
+    function delete_text($offset, $count) {
     $this->_frame->get_node()->deleteData($offset, $count);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function set_text($text) {
+    function set_text($text) {
     $this->_frame->get_node()->data = $text;
-  }
+    }
 
 }

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

Indentation +91 added lines, -92 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: generated_frame_reflower.cls.php,v $
- * Created on: 2004-06-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: generated_frame_reflower.cls.php,v $
+     * Created on: 2004-06-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: generated_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,22 +46,22 @@ 
  */
 class Generated_Frame_Reflower extends Frame_Reflower {
 
-  protected $_reflower; // Decoration target
+    protected $_reflower; // Decoration target
 
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function set_reflower(Frame_Reflower $reflow) {
+    function set_reflower(Frame_Reflower $reflow) {
     $this->_reflower = $reflow;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  protected function _parse_string($string) {
+    protected function _parse_string($string) {
     $string = trim($string, "'\"");
     $string = str_replace(array("\\\n",'\\"',"\\'"),
-                          array("",'"',"'"), $string);
+                            array("",'"',"'"), $string);
 
     // Convert escaped hex characters into ascii characters (e.g. \A => newline)
     $string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})(\s)?(?(2)|(?=[^0-9a-fA-F]))/",
@@ -70,40 +69,40 @@ 
                                                     'return chr(hexdec($matches[1]));'),
                                     $string);
     return $string;
-  }
+    }
 
-  protected function _parse_content() {
+    protected function _parse_content() {
     $style = $this->_frame->get_style();
 
     // Matches generated content
     $re = "/\n".
-      "\s(counters?\\([^)]*\\))|\n".
-      "\A(counters?\\([^)]*\\))|\n".
-      "\s([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\3|\n".
-      "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n" .
-      "\s([^\s\"']+)|\n" .
-      "\A([^\s\"']+)\n".
-      "/xi";
+        "\s(counters?\\([^)]*\\))|\n".
+        "\A(counters?\\([^)]*\\))|\n".
+        "\s([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\3|\n".
+        "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n" .
+        "\s([^\s\"']+)|\n" .
+        "\A([^\s\"']+)\n".
+        "/xi";
 
     $content = $style->content;
 
     // split on spaces, except within quotes
     if (!preg_match_all($re, $content, $matches, PREG_SET_ORDER))
-      return;
+        return;
 
     $text = "";
 
     foreach ($matches as $match) {
-      if ( isset($match[2]) && $match[2] !== "" )
+        if ( isset($match[2]) && $match[2] !== "" )
         $match[1] = $match[1];
 
-      if ( isset($match[6]) && $match[6] !== "" )
+        if ( isset($match[6]) && $match[6] !== "" )
         $match[4] = $match[6];
 
-      if ( isset($match[8]) && $match[8] !== "" )
+        if ( isset($match[8]) && $match[8] !== "" )
         $match[7] = $match[8];
 
-      if ( isset($match[1]) && $match[1] !== "" ) {
+        if ( isset($match[1]) && $match[1] !== "" ) {
         // counters?(...)
         $match[1] = mb_strtolower(trim($match[1]));
 
@@ -112,85 +111,85 @@ 
 
         $i = mb_strpos($match[1], ")");
         if ( $i === false )
-          continue;
+            continue;
 
         $args = explode(",", mb_substr($match[1], 7, $i - 7));
         $counter_id = $args[0];
 
         if ( $match[1]{7} === "(" ) {
-          // counter(name [,style])
+            // counter(name [,style])
 
-          if ( isset($args[1]) )
+            if ( isset($args[1]) )
             $type = $args[1];
-          else
+            else
             $type = null;
 
 
-          $p = $this->_frame->find_block_parent();
+            $p = $this->_frame->find_block_parent();
 
-          $text .= $p->counter_value($counter_id, $type);
+            $text .= $p->counter_value($counter_id, $type);
 
         } else if ( $match[1]{7} === "s" ) {
-          // counters(name, string [,style])
-          if ( isset($args[1]) )
+            // counters(name, string [,style])
+            if ( isset($args[1]) )
             $string = $this->_parse_string(trim($args[1]));
-          else
+            else
             $string = "";
 
-          if ( isset($args[2]) )
+            if ( isset($args[2]) )
             $type = $args[2];
-          else
+            else
             $type = null;
 
-          $p = $this->_frame->find_block_parent();
-          $tmp = "";
-          while ($p) {
+            $p = $this->_frame->find_block_parent();
+            $tmp = "";
+            while ($p) {
             $tmp = $p->counter_value($counter_id, $type) . $string . $tmp;
             $p = $p->find_block_parent();
-          }
-          $text .= $tmp;
+            }
+            $text .= $tmp;
 
         } else
-          // countertops?
-          continue;
+            // countertops?
+            continue;
 
-      } else if ( isset($match[4]) && $match[4] !== "" ) {
+        } else if ( isset($match[4]) && $match[4] !== "" ) {
         // String match
         $text .= $this->_parse_string($match[4]);
 
-      } else if ( isset($match[7]) && $match[7] !== "" ) {
+        } else if ( isset($match[7]) && $match[7] !== "" ) {
         // Directive match
 
         if ( $match[7] === "open-quote" ) {
-          // FIXME: do something here
+            // FIXME: do something here
         } else if ( $match[7] === "close-quote" ) {
-          // FIXME: do something else here
+            // FIXME: do something else here
         } else if ( $match[7] === "no-open-quote" ) {
-          // FIXME:
+            // FIXME:
         } else if ( $match[7] === "no-close-quote" ) {
-          // FIXME:
+            // FIXME:
         } else if ( mb_strpos($match[7],"attr(") === 0 ) {
 
-          $i = mb_strpos($match[7],")");
-          if ( $i === false )
+            $i = mb_strpos($match[7],")");
+            if ( $i === false )
             continue;
 
-          $attr = mb_substr($match[7], 6, $i - 6);
-          if ( $attr == "" )
+            $attr = mb_substr($match[7], 6, $i - 6);
+            if ( $attr == "" )
             continue;
 
-          $text .= $this->_frame->get_node()->getAttribute($attr);
+            $text .= $this->_frame->get_node()->getAttribute($attr);
         } else
-          continue;
+            continue;
 
-      }
+        }
     }
 
     return $text;
 
-  }
+    }
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
 
     $text = $this->_parse_content();
@@ -202,5 +201,5 @@ 
 
     $this->_frame->prepend_child(Frame_Factory::decorate_frame($t_frame));
     $this->_reflower->reflow();
-  }
+    }
 }