chamilo / chamilo-lms

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

Indentation +220 added lines, -221 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: canvas.cls.php,v $
- * Created on: 2004-06-06
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: canvas.cls.php,v $
+     * Created on: 2004-06-06
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: canvas.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -54,207 +53,207 @@ 
  */
 interface Canvas {
 
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number();
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_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();
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
+    /**
+     * 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);
+    /**
+     * 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);
+    /**
+     * 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);
 
-  /**
-   * 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);
 
-  /**
-   * 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);
   
-  /**
-   * 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);
 
-  /**
-   * 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);
 
   
-  /**
-   * 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();
 
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null);
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null);
 
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($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/stylesheet.cls.php

Indentation +478 added lines, -478 removed lines

@@ -71,201 +71,201 @@ 
 
 
 
-  /**
-   * the location of the default built-in CSS file.
-   *
-   */
-  const DEFAULT_STYLESHEET = __DEFAULT_STYLESHEET; // Hack: can't
-                                                   // concatenate stuff in
-                                                   // const declarations,
-                                                   // but I can do this?
-  // protected members
-
-  /**
-   *  array of currently defined styles
-   *  @var array
-   */
-  private $_styles;
-
-  /**
-   * base protocol of the document being parsed
-   *
-   * Used to handle relative urls.
-   *
-   * @var string
-   */
-  private $_protocol;
-
-  /**
-   * base hostname of the document being parsed
-   *
-   * Used to handle relative urls.
-   * @var string
-   */
-  private $_base_host;
-
-  /**
-   * base path of the document being parsed
-   *
-   * Used to handle relative urls.
-   * @var string
-   */
-  private $_base_path;
-
-
-  /**
-   * the style defined by @page rules
-   *
-   * @var Style
-   */
-  private $_page_style;
-
-
-  /**
-   * list of loaded files, used to prevent recursion
-   *
-   * @var array
-   */
-  private $_loaded_files;
-
-  /**
-   * accepted CSS media types
-   * List of types and parsing rules for future extensions:
-   * http://www.w3.org/TR/REC-html40/types.html
-   *   screen, tty, tv, projection, handheld, print, braille, aural, all
-   * The following are non standard extensions for undocumented specific environments.
-   *   static, visual, bitmap, paged
-   * Note, even though the generated pdf file is intended for print output,
-   * the desired content might be different (e.g. screen or projection view of html file).
-   * Therefore allow specification of content by dompdf setting DOMPDF_DEFAULT_MEDIA_TYPE.
-   * If given, replace media "print" by DOMPDF_DEFAULT_MEDIA_TYPE.
-   * (Previous version $ACCEPTED_MEDIA_TYPES = $ACCEPTED_GENERIC_MEDIA_TYPES + $ACCEPTED_DEFAULT_MEDIA_TYPE)
-   */
-  static $ACCEPTED_DEFAULT_MEDIA_TYPE = "print";
-  static $ACCEPTED_GENERIC_MEDIA_TYPES = array("all", "static", "visual", "bitmap", "paged");
-
-  /**
-   * The class constructor.
-   *
-   * The base protocol, host & path are initialized to those of
-   * the current script.
-   */
-  function __construct() {
+    /**
+     * the location of the default built-in CSS file.
+     *
+     */
+    const DEFAULT_STYLESHEET = __DEFAULT_STYLESHEET; // Hack: can't
+                                                    // concatenate stuff in
+                                                    // const declarations,
+                                                    // but I can do this?
+    // protected members
+
+    /**
+     *  array of currently defined styles
+     *  @var array
+     */
+    private $_styles;
+
+    /**
+     * base protocol of the document being parsed
+     *
+     * Used to handle relative urls.
+     *
+     * @var string
+     */
+    private $_protocol;
+
+    /**
+     * base hostname of the document being parsed
+     *
+     * Used to handle relative urls.
+     * @var string
+     */
+    private $_base_host;
+
+    /**
+     * base path of the document being parsed
+     *
+     * Used to handle relative urls.
+     * @var string
+     */
+    private $_base_path;
+
+
+    /**
+     * the style defined by @page rules
+     *
+     * @var Style
+     */
+    private $_page_style;
+
+
+    /**
+     * list of loaded files, used to prevent recursion
+     *
+     * @var array
+     */
+    private $_loaded_files;
+
+    /**
+     * accepted CSS media types
+     * List of types and parsing rules for future extensions:
+     * http://www.w3.org/TR/REC-html40/types.html
+     *   screen, tty, tv, projection, handheld, print, braille, aural, all
+     * The following are non standard extensions for undocumented specific environments.
+     *   static, visual, bitmap, paged
+     * Note, even though the generated pdf file is intended for print output,
+     * the desired content might be different (e.g. screen or projection view of html file).
+     * Therefore allow specification of content by dompdf setting DOMPDF_DEFAULT_MEDIA_TYPE.
+     * If given, replace media "print" by DOMPDF_DEFAULT_MEDIA_TYPE.
+     * (Previous version $ACCEPTED_MEDIA_TYPES = $ACCEPTED_GENERIC_MEDIA_TYPES + $ACCEPTED_DEFAULT_MEDIA_TYPE)
+     */
+    static $ACCEPTED_DEFAULT_MEDIA_TYPE = "print";
+    static $ACCEPTED_GENERIC_MEDIA_TYPES = array("all", "static", "visual", "bitmap", "paged");
+
+    /**
+     * The class constructor.
+     *
+     * The base protocol, host & path are initialized to those of
+     * the current script.
+     */
+    function __construct() {
     $this->_styles = array();
     $this->_loaded_files = array();
     list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($_SERVER["SCRIPT_FILENAME"]);
     $this->_page_style = null;
-  }
-
-  /**
-   * Set the base protocol
-   *
-   * @param string $proto
-   */
-  function set_protocol($proto) { $this->_protocol = $proto; }
-
-  /**
-   * Set the base host
-   *
-   * @param string $host
-   */
-  function set_host($host) { $this->_base_host = $host; }
-
-  /**
-   * Set the base path
-   *
-   * @param string $path
-   */
-  function set_base_path($path) { $this->_base_path = $path; }
-
-
-  /**
-   * Return the base protocol for this stylesheet
-   *
-   * @return string
-   */
-  function get_protocol() { return $this->_protocol; }
-
-  /**
-   * Return the base host for this stylesheet
-   *
-   * @return string
-   */
-  function get_host() { return $this->_base_host; }
-
-  /**
-   * Return the base path for this stylesheet
-   *
-   * @return string
-   */
-  function get_base_path() { return $this->_base_path; }
-
-  /**
-   * add a new Style object to the stylesheet
-   *
-   * add_style() adds a new Style object to the current stylesheet, or
-   * merges a new Style with an existing one.
-   *
-   * @param string $key   the Style's selector
-   * @param Style $style  the Style to be added
-   */
-  function add_style($key, Style $style) {
+    }
+
+    /**
+     * Set the base protocol
+     *
+     * @param string $proto
+     */
+    function set_protocol($proto) { $this->_protocol = $proto; }
+
+    /**
+     * Set the base host
+     *
+     * @param string $host
+     */
+    function set_host($host) { $this->_base_host = $host; }
+
+    /**
+     * Set the base path
+     *
+     * @param string $path
+     */
+    function set_base_path($path) { $this->_base_path = $path; }
+
+
+    /**
+     * Return the base protocol for this stylesheet
+     *
+     * @return string
+     */
+    function get_protocol() { return $this->_protocol; }
+
+    /**
+     * Return the base host for this stylesheet
+     *
+     * @return string
+     */
+    function get_host() { return $this->_base_host; }
+
+    /**
+     * Return the base path for this stylesheet
+     *
+     * @return string
+     */
+    function get_base_path() { return $this->_base_path; }
+
+    /**
+     * add a new Style object to the stylesheet
+     *
+     * add_style() adds a new Style object to the current stylesheet, or
+     * merges a new Style with an existing one.
+     *
+     * @param string $key   the Style's selector
+     * @param Style $style  the Style to be added
+     */
+    function add_style($key, Style $style) {
     if (!is_string($key))
-      throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
+        throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
 
     if ( isset($this->_styles[$key]) )
-      $this->_styles[$key]->merge($style);
+        $this->_styles[$key]->merge($style);
     else
-      $this->_styles[$key] = clone $style;
-  }
-
-
-  /**
-   * lookup a specifc Style object
-   *
-   * lookup() returns the Style specified by $key, or null if the Style is
-   * not found.
-   *
-   * @param string $key   the selector of the requested Style
-   * @return Style
-   */
-  function lookup($key) {
+        $this->_styles[$key] = clone $style;
+    }
+
+
+    /**
+     * lookup a specifc Style object
+     *
+     * lookup() returns the Style specified by $key, or null if the Style is
+     * not found.
+     *
+     * @param string $key   the selector of the requested Style
+     * @return Style
+     */
+    function lookup($key) {
     if ( !isset($this->_styles[$key]) )
-      return null;
+        return null;
 
     return $this->_styles[$key];
-  }
-
-  /**
-   * create a new Style object associated with this stylesheet
-   *
-   * @param Style $parent The style of this style's parent in the DOM tree
-   * @return Style
-   */
-  function create_style($parent = null) {
+    }
+
+    /**
+     * create a new Style object associated with this stylesheet
+     *
+     * @param Style $parent The style of this style's parent in the DOM tree
+     * @return Style
+     */
+    function create_style($parent = null) {
     return new Style($this, $parent);
-  }
+    }
 
 
-  /**
-   * load and parse a CSS string
-   *
-   * @param string $css
-   */
-  function load_css(&$css) { $this->_parse_css($css); }
+    /**
+     * load and parse a CSS string
+     *
+     * @param string $css
+     */
+    function load_css(&$css) { $this->_parse_css($css); }
 
 
-  /**
-   * load and parse a CSS file
-   *
-   * @param string $file
-   */
-  function load_css_file($file) {
+    /**
+     * load and parse a CSS file
+     *
+     * @param string $file
+     */
+    function load_css_file($file) {
     global $_dompdf_warnings;
 
     // Prevent circular references
     if ( isset($this->_loaded_files[$file]) )
-      return;
+        return;
 
     $this->_loaded_files[$file] = true;
     $parsed_url = explode_url($file);
@@ -274,36 +274,36 @@ 
 
     if ( !DOMPDF_ENABLE_REMOTE &&
          ($this->_protocol != "" && $this->_protocol !== "file://") ) {
-      record_warnings(E_USER_WARNING, "Remote CSS file '$file' requested, but DOMPDF_ENABLE_REMOTE is false.", __FILE__, __LINE__);
-      return;
+        record_warnings(E_USER_WARNING, "Remote CSS file '$file' requested, but DOMPDF_ENABLE_REMOTE is false.", __FILE__, __LINE__);
+        return;
     }
 
     // Fix submitted by Nick Oostveen for aliased directory support:
     if ( $this->_protocol == "" )
-      $file = $this->_base_path . $filename;
+        $file = $this->_base_path . $filename;
     else
-      $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
+        $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
 
     set_error_handler("record_warnings");
     $css = file_get_contents($file);
     restore_error_handler();
 
     if ( $css == "" ) {
-      record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__);;
-      return;
+        record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__);;
+        return;
     }
 
     $this->_parse_css($css);
 
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/cascade.html#specificity}
-   *
-   * @param string $selector
-   * @return int
-   */
-  private function _specificity($selector) {
+    /**
+     * @link http://www.w3.org/TR/CSS21/cascade.html#specificity}
+     *
+     * @param string $selector
+     * @return int
+     */
+    private function _specificity($selector) {
     // http://www.w3.org/TR/CSS21/cascade.html#specificity
     // ignoring the ":" pseudoclass modifyers
     // also ignored in _css_selector_to_xpath
@@ -325,26 +325,26 @@ 
     //see _css_selector_to_xpath
 
     if ( !in_array($selector[0], array(" ", ">", ".", "#", "+", ":", "[")) ) {
-    	$d++;
+        $d++;
     }
 
     if (DEBUGCSS) {
-      /*DEBUGCSS*/	print "<pre>\n";
-      /*DEBUGCSS*/	printf("_specificity(): 0x%08x \"%s\"\n", ($a << 24) | ($b << 16) | ($c << 8) | ($d), $selector);
-      /*DEBUGCSS*/	print "</pre>";
+        /*DEBUGCSS*/	print "<pre>\n";
+        /*DEBUGCSS*/	printf("_specificity(): 0x%08x \"%s\"\n", ($a << 24) | ($b << 16) | ($c << 8) | ($d), $selector);
+        /*DEBUGCSS*/	print "</pre>";
     }
 
     return ($a << 24) | ($b << 16) | ($c << 8) | ($d);
-  }
+    }
 
 
-  /**
-   * converts a CSS selector to an XPath query.
-   *
-   * @param string $selector
-   * @return string
-   */
-  private function _css_selector_to_xpath($selector) {
+    /**
+     * converts a CSS selector to an XPath query.
+     *
+     * @param string $selector
+     * @return string
+     */
+    private function _css_selector_to_xpath($selector) {
 
     // Collapse white space and strip whitespace around delimiters
 //     $search = array("/\\s+/", "/\\s+([.>#+:])\\s+/");
@@ -362,7 +362,7 @@ 
     // Add an implicit space at the beginning of the selector if there is no
     // delimiter there already.
     if ( !in_array($selector[0], $delimiters) )
-      $selector = " $selector";
+        $selector = " $selector";
 
     $tok = "";
     $len = mb_strlen($selector);
@@ -370,37 +370,37 @@ 
 
     while ( $i < $len ) {
 
-      $s = $selector[$i];
-      $i++;
+        $s = $selector[$i];
+        $i++;
 
-      // Eat characters up to the next delimiter
-      $tok = "";
+        // Eat characters up to the next delimiter
+        $tok = "";
 
-      while ($i < $len) {
+        while ($i < $len) {
         if ( in_array($selector[$i], $delimiters) )
-          break;
+            break;
         $tok .= $selector[$i++];
-      }
+        }
 
-      switch ($s) {
+        switch ($s) {
 
-      case " ":
+        case " ":
       case ">":
         // All elements matching the next token that are direct children of
         // the current token
         $expr = $s === " " ? "descendant" : "child";
 
         if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+            $query .= "/";
 
         if ( !$tok )
-          $tok = "*";
+            $tok = "*";
 
         $query .= "$expr::$tok";
         $tok = "";
         break;
 
-      case ".":
+        case ".":
       case "#":
         // All elements matching the current token with a class/id equal to
         // the _next_ token.
@@ -409,7 +409,7 @@ 
 
         // empty class/id == *
         if ( mb_substr($query, -1, 1) === "/" )
-          $query .= "*";
+            $query .= "*";
 
         // Match multiple classes: $tok contains the current selected
         // class.  Search for class attributes with class="$tok",
@@ -423,28 +423,28 @@ 
         $tok = "";
         break;
 
-      case "+":
+        case "+":
         // All sibling elements that folow the current token
         if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+            $query .= "/";
 
         $query .= "following-sibling::$tok";
         $tok = "";
         break;
 
-      case ":":
+        case ":":
         // Pseudo-classes
         switch ($tok) {
 
         case "first-child":
           $query .= "[1]";
-          $tok = "";
-          break;
+            $tok = "";
+            break;
 
         case "link":
           $query .= "[@href]";
-          $tok = "";
-          break;
+            $tok = "";
+            break;
 
         case "first-line":
           break;
@@ -462,7 +462,7 @@ 
 
         break;
 
-      case "[":
+        case "[":
         // Attribute selectors.  All with an attribute matching the following token(s)
         $attr_delimiters = array("=", "]", "~", "|");
         $tok_len = mb_strlen($tok);
@@ -473,9 +473,9 @@ 
         $value = "";
 
         while ( $j < $tok_len ) {
-          if ( in_array($tok[$j], $attr_delimiters) )
+            if ( in_array($tok[$j], $attr_delimiters) )
             break;
-          $attr .= $tok[$j++];
+            $attr .= $tok[$j++];
         }
 
         switch ( $tok[$j] ) {
@@ -484,67 +484,67 @@ 
         case "|":
           $op .= $tok[$j++];
 
-          if ( $tok[$j] !== "=" )
+            if ( $tok[$j] !== "=" )
             throw new DOMPDF_Exception("Invalid CSS selector syntax: invalid attribute selector: $selector");
 
-          $op .= $tok[$j];
-          break;
+            $op .= $tok[$j];
+            break;
 
         case "=":
           $op = "=";
-          break;
+            break;
 
         }
 
         // Read the attribute value, if required
         if ( $op != "" ) {
-          $j++;
-          while ( $j < $tok_len ) {
+            $j++;
+            while ( $j < $tok_len ) {
             if ( $tok[$j] === "]" )
-              break;
+                break;
             $value .= $tok[$j++];
-          }
+            }
         }
 
         if ( $attr == "" )
-          throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
+            throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
 
         switch ( $op ) {
 
         case "":
           $query .=  "[@$attr]";
-          break;
+            break;
 
         case "=":
           $query .= "[@$attr$op\"$value\"]";
-          break;
+            break;
 
         case "~=":
           // FIXME: this will break if $value contains quoted strings
           // (e.g. [type~="a b c" "d e f"])
           $values = explode(" ", $value);
-          $query .=  "[";
+            $query .=  "[";
 
-          foreach ( $values as $val )
+            foreach ( $values as $val )
             $query .= "@$attr=\"$val\" or ";
 
-          $query = rtrim($query, " or ") . "]";
-          break;
+            $query = rtrim($query, " or ") . "]";
+            break;
 
         case "|=":
           $values = explode("-", $value);
-          $query .= "[";
+            $query .= "[";
 
-          foreach ($values as $val)
+            foreach ($values as $val)
             $query .= "starts-with(@$attr, \"$val\") or ";
 
-          $query = rtrim($query, " or ") . "]";
-          break;
+            $query = rtrim($query, " or ") . "]";
+            break;
 
         }
 
         break;
-      }
+        }
     }
     $i++;
 
@@ -571,21 +571,21 @@ 
 
     // Trim the trailing '/' from the query
     if ( mb_strlen($query) > 2 )
-      $query = rtrim($query, "/");
+        $query = rtrim($query, "/");
 
     return $query;
-  }
-
-  /**
-   * applies all current styles to a particular document tree
-   *
-   * apply_styles() applies all currently loaded styles to the provided
-   * {@link Frame_Tree}.  Aside from parsing CSS, this is the main purpose
-   * of this class.
-   *
-   * @param Frame_Tree $tree
-   */
-  function apply_styles(Frame_Tree $tree) {
+    }
+
+    /**
+     * applies all current styles to a particular document tree
+     *
+     * apply_styles() applies all currently loaded styles to the provided
+     * {@link Frame_Tree}.  Aside from parsing CSS, this is the main purpose
+     * of this class.
+     *
+     * @param Frame_Tree $tree
+     */
+    function apply_styles(Frame_Tree $tree) {
 
     // Use XPath to select nodes.  This would be easier if we could attach
     // Frame objects directly to DOMNodes using the setUserData() method, but
@@ -605,67 +605,67 @@ 
     // Apply all styles in stylesheet
     foreach ($this->_styles as $selector => $style) {
 
-      $query = $this->_css_selector_to_xpath($selector);
+        $query = $this->_css_selector_to_xpath($selector);
 //       pre_var_dump($selector);
 //       pre_var_dump($query);
 //        echo ($style);
 
-      // Retrieve the nodes
-      $nodes = $xp->query($query);
+        // Retrieve the nodes
+        $nodes = $xp->query($query);
 
-      foreach ($nodes as $node) {
+        foreach ($nodes as $node) {
         //echo $node->nodeName . "\n";
         // Retrieve the node id
         if ( $node->nodeType != 1 ) // Only DOMElements get styles
-          continue;
+            continue;
 
         $id = $node->getAttribute("frame_id");
 
         // Assign the current style to the scratch array
         $spec = $this->_specificity($selector);
         $styles[$id][$spec][] = $style;
-      }
+        }
     }
 
     // Now create the styles and assign them to the appropriate frames.  (We
     // iterate over the tree using an implicit Frame_Tree iterator.)
     $root_flg = false;
     foreach ($tree->get_frames() as $frame) {
-      // pre_r($frame->get_node()->nodeName . ":");
-      if ( !$root_flg && $this->_page_style ) {
+        // pre_r($frame->get_node()->nodeName . ":");
+        if ( !$root_flg && $this->_page_style ) {
         $style = $this->_page_style;
         $root_flg = true;
-      } else
+        } else
         $style = $this->create_style();
 
-      // Find nearest DOMElement parent
-      $p = $frame;
-      while ( $p = $p->get_parent() )
+        // Find nearest DOMElement parent
+        $p = $frame;
+        while ( $p = $p->get_parent() )
         if ($p->get_node()->nodeType == 1 )
-          break;
+            break;
 
-      // Styles can only be applied directly to DOMElements; anonymous
-      // frames inherit from their parent
-      if ( $frame->get_node()->nodeType != 1 ) {
+        // Styles can only be applied directly to DOMElements; anonymous
+        // frames inherit from their parent
+        if ( $frame->get_node()->nodeType != 1 ) {
         if ( $p )
-          $style->inherit($p->get_style());
+            $style->inherit($p->get_style());
         $frame->set_style($style);
         continue;
-      }
+        }
 
-      $id = $frame->get_id();
+        $id = $frame->get_id();
 
-      // Handle HTML 4.0 attributes
-      Attribute_Translator::translate_attributes($frame);
+        // Handle HTML 4.0 attributes
+        Attribute_Translator::translate_attributes($frame);
 
-      // Locate any additional style attributes
-      if ( ($str = $frame->get_node()->getAttribute("style")) !== "" ) {
+        // Locate any additional style attributes
+        if ( ($str = $frame->get_node()->getAttribute("style")) !== "" ) {
         $spec = $this->_specificity("!style attribute");
         $styles[$id][$spec][] = $this->_parse_properties($str);
-      }
+        }
 
-      // Grab the applicable styles
-      if ( isset($styles[$id]) ) {
+        // Grab the applicable styles
+        if ( isset($styles[$id]) ) {
 
         $applied_styles = $styles[ $frame->get_id() ];
 
@@ -673,101 +673,101 @@ 
         ksort($applied_styles);
 
         if (DEBUGCSS) {
-          $debug_nodename = $frame->get_node()->nodeName;
-          print "<pre>\n[$debug_nodename\n";
-          foreach ($applied_styles as $spec => $arr) {
+            $debug_nodename = $frame->get_node()->nodeName;
+            print "<pre>\n[$debug_nodename\n";
+            foreach ($applied_styles as $spec => $arr) {
             printf("specificity: 0x%08x\n",$spec);
             foreach ($arr as $s) {
-              print "[\n";
-              $s->debug_print();
-              print "]\n";
+                print "[\n";
+                $s->debug_print();
+                print "]\n";
+            }
             }
-          }
         }
         
         // Merge the new styles with the inherited styles
         foreach ($applied_styles as $arr) {
-          foreach ($arr as $s)
+            foreach ($arr as $s)
             $style->merge($s);
         }
-      }
+        }
 
-      // Inherit parent's styles if required
-      if ( $p ) {
+        // Inherit parent's styles if required
+        if ( $p ) {
 
         if (DEBUGCSS) {
-          print "inherit:\n";
-          print "[\n";
-          $p->get_style()->debug_print();
-          print "]\n";
+            print "inherit:\n";
+            print "[\n";
+            $p->get_style()->debug_print();
+            print "]\n";
         }
 
         $style->inherit( $p->get_style() );
-      }
+        }
 
-      if (DEBUGCSS) {
+        if (DEBUGCSS) {
         print "DomElementStyle:\n";
         print "[\n";
         $style->debug_print();
         print "]\n";
         print "/$debug_nodename]\n</pre>";
-      }
+        }
 
-      /*DEBUGCSS print: see below different print debugging method
+        /*DEBUGCSS print: see below different print debugging method
       pre_r($frame->get_node()->nodeName . ":");
       echo "<pre>";
       echo $style;
       echo "</pre>";*/
-      $frame->set_style($style);
+        $frame->set_style($style);
 
     }
 
     // We're done!  Clean out the registry of all styles since we
     // won't be needing this later.
     foreach ( array_keys($this->_styles) as $key ) {
-      unset($this->_styles[$key]);
+        unset($this->_styles[$key]);
     }
 
-  }
+    }
 
 
-  /**
-   * parse a CSS string using a regex parser
-   *
-   * Called by {@link Stylesheet::parse_css()}
-   *
-   * @param string $str
-   */
-  private function _parse_css($str) {
+    /**
+     * parse a CSS string using a regex parser
+     *
+     * Called by {@link Stylesheet::parse_css()}
+     *
+     * @param string $str
+     */
+    private function _parse_css($str) {
 
     $str = trim($str);
     
     // Destroy comments and remove HTML comments
     $css = preg_replace(array(
-      "'/\*.*?\*/'si", 
-      "/^<!--/",
-      "/-->$/"
+        "'/\*.*?\*/'si", 
+        "/^<!--/",
+        "/-->$/"
     ), "", $str);
 
     // FIXME: handle '{' within strings, e.g. [attr="string {}"]
 
     // Something more legible:
     $re =
-      "/\s*                                   # Skip leading whitespace                             \n".
-      "( @([^\s]+)\s+([^{;]*) (?:;|({)) )?    # Match @rules followed by ';' or '{'                 \n".
-      "(?(1)                                  # Only parse sub-sections if we're in an @rule...     \n".
-      "  (?(4)                                # ...and if there was a leading '{'                   \n".
-      "    \s*( (?:(?>[^{}]+) ({)?            # Parse rulesets and individual @page rules           \n".
-      "            (?(6) (?>[^}]*) }) \s*)+?  \n".
-      "       )                               \n".
-      "   })                                  # Balancing '}'                                \n".
-      "|                                      # Branch to match regular rules (not preceeded by '@')\n".
-      "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
-      "/xs";
+        "/\s*                                   # Skip leading whitespace                             \n".
+        "( @([^\s]+)\s+([^{;]*) (?:;|({)) )?    # Match @rules followed by ';' or '{'                 \n".
+        "(?(1)                                  # Only parse sub-sections if we're in an @rule...     \n".
+        "  (?(4)                                # ...and if there was a leading '{'                   \n".
+        "    \s*( (?:(?>[^{}]+) ({)?            # Parse rulesets and individual @page rules           \n".
+        "            (?(6) (?>[^}]*) }) \s*)+?  \n".
+        "       )                               \n".
+        "   })                                  # Balancing '}'                                \n".
+        "|                                      # Branch to match regular rules (not preceeded by '@')\n".
+        "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
+        "/xs";
 
     if ( preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false )
-      // An error occured
-      throw new DOMPDF_Exception("Error parsing css file: preg_match_all() failed.");
+        // An error occured
+        throw new DOMPDF_Exception("Error parsing css file: preg_match_all() failed.");
 
     // After matching, the array indicies are set as follows:
     //
@@ -782,27 +782,27 @@ 
     //
     //pre_r($matches);
     foreach ( $matches as $match ) {
-      $match[2] = trim($match[2]);
+        $match[2] = trim($match[2]);
 
-      if ( $match[2] !== "" ) {
+        if ( $match[2] !== "" ) {
         // Handle @rules
         switch ($match[2]) {
 
         case "import":
           $this->_parse_import($match[3]);
-          break;
+            break;
 
         case "media":
           $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-          if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+            if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
             $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
-          } else {
+            } else {
             $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
-          }
-          if ( in_array(mb_strtolower(trim($match[3])), $acceptedmedia ) ) {
+            }
+            if ( in_array(mb_strtolower(trim($match[3])), $acceptedmedia ) ) {
             $this->_parse_sections($match[5]);
-          }
-          break;
+            }
+            break;
 
         case "page":
           //This handles @page to be applied to page oriented media
@@ -827,9 +827,9 @@ 
           // Store the style for later...
           if ( is_null($this->_page_style) )
             $this->_page_style = $this->_parse_properties($match[5]);
-          else
+            else
             $this->_page_style->merge($this->_parse_properties($match[5]));
-          break;
+            break;
 
         default:
           // ignore everything else
@@ -837,118 +837,118 @@ 
         }
 
         continue;
-      }
+        }
 
-      if ( $match[7] !== "" )
+        if ( $match[7] !== "" )
         $this->_parse_sections($match[7]);
 
     }
-  }
+    }
 
-  /* See also style.cls Style::_image(), refactoring?, works also for imported css files */
-  protected function _image($val) {
+    /* See also style.cls Style::_image(), refactoring?, works also for imported css files */
+    protected function _image($val) {
     $DEBUGCSS=DEBUGCSS;
     
     if ( mb_strpos($val, "url") === false ) {
-      $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
+        $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     }
     else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+        $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
 
-      // Resolve the url now in the context of the current stylesheet
-      $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->get_protocol() == "" ) {
+        // Resolve the url now in the context of the current stylesheet
+        $parsed_url = explode_url($val);
+        if ( $parsed_url["protocol"] == "" && $this->get_protocol() == "" ) {
         if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
-          $path = $_SERVER["DOCUMENT_ROOT"].'/';
+            $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
-          $path = $this->get_base_path();
+            $path = $this->get_base_path();
         }
         $path .= $parsed_url["path"] . $parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
-      } else {
+        } else {
         $path = build_url($this->get_protocol(),
-                          $this->get_host(),
-                          $this->get_base_path(),
-                          $val);
-      }
+                            $this->get_host(),
+                            $this->get_base_path(),
+                            $val);
+        }
     }
     if ($DEBUGCSS) {
-      print "<pre>[_image\n";
-      print_r($parsed_url);
-      print $this->get_protocol()."\n".$this->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+        print "<pre>[_image\n";
+        print_r($parsed_url);
+        print $this->get_protocol()."\n".$this->get_base_path()."\n".$path."\n";
+        print "_image]</pre>";;
     }
     return $path;
-  }
-
-  /**
-   * parse @import{} sections
-   *
-   * @param string $url  the url of the imported CSS file
-   */
-  private function _parse_import($url) {
+    }
+
+    /**
+     * parse @import{} sections
+     *
+     * @param string $url  the url of the imported CSS file
+     */
+    private function _parse_import($url) {
     $arr = preg_split("/[\s\n,]/", $url,-1, PREG_SPLIT_NO_EMPTY);
     $url = array_shift($arr);
     $accept = false;
 
     if ( count($arr) > 0 ) {
 
-      $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-      if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+        $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
+        if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
         $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
-      } else {
+        } else {
         $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
-      }
+        }
               
-      // @import url media_type [media_type...]
-      foreach ( $arr as $type ) {
+        // @import url media_type [media_type...]
+        foreach ( $arr as $type ) {
         if ( in_array(mb_strtolower(trim($type)), $acceptedmedia) ) {
-          $accept = true;
-          break;
+            $accept = true;
+            break;
+        }
         }
-      }
 
     } else {
-      // unconditional import
-      $accept = true;
+        // unconditional import
+        $accept = true;
     }
 
     if ( $accept ) {
-      // Store our current base url properties in case the new url is elsewhere
-      $protocol = $this->_protocol;
-      $host = $this->_base_host;
-      $path = $this->_base_path;
+        // Store our current base url properties in case the new url is elsewhere
+        $protocol = $this->_protocol;
+        $host = $this->_base_host;
+        $path = $this->_base_path;
       
-      // $url = str_replace(array('"',"url", "(", ")"), "", $url);
-      // If the protocol is php, assume that we will import using file://
-      // $url = build_url($protocol == "php://" ? "file://" : $protocol, $host, $path, $url);
-      // Above does not work for subfolders and absolute urls.
-      // Todo: As above, do we need to replace php or file to an empty protocol for local files?
+        // $url = str_replace(array('"',"url", "(", ")"), "", $url);
+        // If the protocol is php, assume that we will import using file://
+        // $url = build_url($protocol == "php://" ? "file://" : $protocol, $host, $path, $url);
+        // Above does not work for subfolders and absolute urls.
+        // Todo: As above, do we need to replace php or file to an empty protocol for local files?
       
-      $url = $this->_image($url);
+        $url = $this->_image($url);
       
-      $this->load_css_file($url);
+        $this->load_css_file($url);
+
+        // Restore the current base url
+        $this->_protocol = $protocol;
+        $this->_base_host = $host;
+        $this->_base_path = $path;
+    }
 
-      // Restore the current base url
-      $this->_protocol = $protocol;
-      $this->_base_host = $host;
-      $this->_base_path = $path;
     }
 
-  }
-
-  /**
-   * parse regular CSS blocks
-   *
-   * _parse_properties() creates a new Style object based on the provided
-   * CSS rules.
-   *
-   * @param string $str  CSS rules
-   * @return Style
-   */
-  private function _parse_properties($str) {
+    /**
+     * parse regular CSS blocks
+     *
+     * _parse_properties() creates a new Style object based on the provided
+     * CSS rules.
+     *
+     * @param string $str  CSS rules
+     * @return Style
+     */
+    private function _parse_properties($str) {
     $properties = explode(";", $str);
 
     if (DEBUGCSS) print '[_parse_properties';
@@ -956,71 +956,71 @@ 
     // Create the style
     $style = new Style($this);
     foreach ($properties as $prop) {
-      //A css property can have " ! important" appended (whitespace optional)
-      //strip this off to decode core of the property correctly.
-      //Pass on in the style to allow proper handling:
-      //!important properties can only be overridden by other !important ones.
-      //$style->$prop_name = is a shortcut of $style->__set($prop_name,$value);.
-      //If no specific set function available, set _props["prop_name"]
-      //style is always copied completely, or $_props handled separately
-      //Therefore set a _important_props["prop_name"]=true to indicate the modifier
-
-      /* Instead of short code, prefer the typical case with fast code
+        //A css property can have " ! important" appended (whitespace optional)
+        //strip this off to decode core of the property correctly.
+        //Pass on in the style to allow proper handling:
+        //!important properties can only be overridden by other !important ones.
+        //$style->$prop_name = is a shortcut of $style->__set($prop_name,$value);.
+        //If no specific set function available, set _props["prop_name"]
+        //style is always copied completely, or $_props handled separately
+        //Therefore set a _important_props["prop_name"]=true to indicate the modifier
+
+        /* Instead of short code, prefer the typical case with fast code
 	  $important = preg_match("/(.*?)!\s*important/",$prop,$match);
       if ( $important ) {
       	$prop = $match[1];
       }
       $prop = trim($prop);
       */
-      if (DEBUGCSS) print '(';
- 	  $important = false;
-      $prop = trim($prop);
-      if (substr($prop,-9) === 'important') {
-      	$prop_tmp = rtrim(substr($prop,0,-9));
-      	if (substr($prop_tmp,-1) === '!') {
-      		$prop = rtrim(substr($prop_tmp,0,-1));
-      		$important = true;
-      	}
-      }
+        if (DEBUGCSS) print '(';
+        $important = false;
+        $prop = trim($prop);
+        if (substr($prop,-9) === 'important') {
+            $prop_tmp = rtrim(substr($prop,0,-9));
+            if (substr($prop_tmp,-1) === '!') {
+                $prop = rtrim(substr($prop_tmp,0,-1));
+                $important = true;
+            }
+        }
 
-      if ($prop == "") {
+        if ($prop == "") {
         if (DEBUGCSS) print 'empty)';
         continue;
-      }
+        }
 
-      $i = mb_strpos($prop, ":");
-      if ( $i === false ) {
+        $i = mb_strpos($prop, ":");
+        if ( $i === false ) {
         if (DEBUGCSS) print 'novalue'.$prop.')';
         continue;
-      }
+        }
 
-      $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i)));
-      $value = ltrim(mb_substr($prop, $i+1));
-      if (DEBUGCSS) print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
-      //New style, anyway empty
-      //if ($important || !$style->important_get($prop_name) ) {
-      //$style->$prop_name = array($value,$important);
-      //assignment might be replaced by overloading through __set,
-      //and overloaded functions might check _important_props,
-      //therefore set _important_props first.
-      if ($important) {
+        $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i)));
+        $value = ltrim(mb_substr($prop, $i+1));
+        if (DEBUGCSS) print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
+        //New style, anyway empty
+        //if ($important || !$style->important_get($prop_name) ) {
+        //$style->$prop_name = array($value,$important);
+        //assignment might be replaced by overloading through __set,
+        //and overloaded functions might check _important_props,
+        //therefore set _important_props first.
+        if ($important) {
         $style->important_set($prop_name);
-      }
-      //For easier debugging, don't use overloading of assignments with __set
-      $style->$prop_name = $value;
-      //$style->props_set($prop_name, $value);
+        }
+        //For easier debugging, don't use overloading of assignments with __set
+        $style->$prop_name = $value;
+        //$style->props_set($prop_name, $value);
     }
     if (DEBUGCSS) print '_parse_properties]';
 
     return $style;
-  }
-
-  /**
-   * parse selector + rulesets
-   *
-   * @param string $str  CSS selectors and rulesets
-   */
-  private function _parse_sections($str) {
+    }
+
+    /**
+     * parse selector + rulesets
+     *
+     * @param string $str  CSS selectors and rulesets
+     */
+    private function _parse_sections($str) {
     // Pre-process: collapse all whitespace and strip whitespace around '>',
     // '.', ':', '+', '#'
 
@@ -1031,43 +1031,43 @@ 
     $sections = explode("}", $str);
     if (DEBUGCSS) print '[_parse_sections';
     foreach ($sections as $sect) {
-      $i = mb_strpos($sect, "{");
+        $i = mb_strpos($sect, "{");
 
-      $selectors = explode(",", mb_substr($sect, 0, $i));
-      if (DEBUGCSS) print '[section';
-      $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
+        $selectors = explode(",", mb_substr($sect, 0, $i));
+        if (DEBUGCSS) print '[section';
+        $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
       
-      // Assign it to the selected elements
-      foreach ($selectors as $selector) {
+        // Assign it to the selected elements
+        foreach ($selectors as $selector) {
         $selector = trim($selector);
 
         if ($selector == "") {
-          if (DEBUGCSS) print '#empty#';
-          continue;
+            if (DEBUGCSS) print '#empty#';
+            continue;
         }
         if (DEBUGCSS) print '#'.$selector.'#';
         //if (DEBUGCSS) { if (strpos($selector,'p') !== false) print '!!!p!!!#'; }
 
         $this->add_style($selector, $style);
-      }
-      if (DEBUGCSS) print 'section]';
+        }
+        if (DEBUGCSS) print 'section]';
     }
     if (DEBUGCSS) print '_parse_sections]';
-  }
-
-  /**
-   * dumps the entire stylesheet as a string
-   *
-   * Generates a string of each selector and associated style in the
-   * Stylesheet.  Useful for debugging.
-   *
-   * @return string
-   */
-  function __toString() {
+    }
+
+    /**
+     * dumps the entire stylesheet as a string
+     *
+     * Generates a string of each selector and associated style in the
+     * Stylesheet.  Useful for debugging.
+     *
+     * @return string
+     */
+    function __toString() {
     $str = "";
     foreach ($this->_styles as $selector => $style)
-      $str .= "$selector => " . $style->__toString() . "\n";
+        $str .= "$selector => " . $style->__toString() . "\n";
 
     return $str;
-  }
+    }
 }

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

Indentation +323 added lines, -324 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cellmap.cls.php,v $
- * Created on: 2004-07-28
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cellmap.cls.php,v $
+     * Created on: 2004-07-28
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: cellmap.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -50,12 +49,12 @@ 
  */
 class Cellmap {
 
-  /**
-   * Border style weight lookup for collapsed border resolution.
-   *
-   * @var array
-   */
-  static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
+    /**
+     * Border style weight lookup for collapsed border resolution.
+     *
+     * @var array
+     */
+    static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
                                                 "groove" => 2,
                                                 "outset" => 3,
                                                 "ridge"  => 4,
@@ -65,87 +64,87 @@ 
                                                 "double" => 8,
                                                 "none"   => 0);
 
-  /**
-   * The table object this cellmap is attached to.
-   *
-   * @var Table_Frame_Decorator
-   */
-  protected $_table;
-
-  /**
-   * The total number of rows in the table
-   *
-   * @var int
-   */
-  protected $_num_rows;
-
-  /**
-   * The total number of columns in the table
-   *
-   * @var int
-   */
-  protected $_num_cols;
-
-  /**
-   * 2D array mapping <row,column> to frames
-   *
-   * @var array
-   */
-  protected $_cells;
-
-  /**
-   * 1D array of column dimensions
-   *
-   * @var array
-   */
-  protected $_columns;
-
-  /**
-   * 1D array of row dimensions
-   *
-   * @var array
-   */
-  protected $_rows;
-
-  /**
-   * 2D array of border specs
-   *
-   * @var array
-   */
-  protected $_borders;
-
-  /**
-   * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
-   * frame_id.
-   *
-   * @var array
-   */
-  protected $_frames;
-
-  /**
-   * Current column when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__col;
-
-  /**
-   * Current row when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__row;
-
-  //........................................................................
-
-  function __construct(Table_Frame_Decorator $table) {
+    /**
+     * The table object this cellmap is attached to.
+     *
+     * @var Table_Frame_Decorator
+     */
+    protected $_table;
+
+    /**
+     * The total number of rows in the table
+     *
+     * @var int
+     */
+    protected $_num_rows;
+
+    /**
+     * The total number of columns in the table
+     *
+     * @var int
+     */
+    protected $_num_cols;
+
+    /**
+     * 2D array mapping <row,column> to frames
+     *
+     * @var array
+     */
+    protected $_cells;
+
+    /**
+     * 1D array of column dimensions
+     *
+     * @var array
+     */
+    protected $_columns;
+
+    /**
+     * 1D array of row dimensions
+     *
+     * @var array
+     */
+    protected $_rows;
+
+    /**
+     * 2D array of border specs
+     *
+     * @var array
+     */
+    protected $_borders;
+
+    /**
+     * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
+     * frame_id.
+     *
+     * @var array
+     */
+    protected $_frames;
+
+    /**
+     * Current column when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__col;
+
+    /**
+     * Current row when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__row;
+
+    //........................................................................
+
+    function __construct(Table_Frame_Decorator $table) {
     $this->_table = $table;
     $this->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     $this->_num_rows = 0;
     $this->_num_cols = 0;
 
@@ -158,54 +157,54 @@ 
     $this->_borders = array();
 
     $this->__col = $this->__row = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_num_rows() { return $this->_num_rows; }
-  function get_num_cols() { return $this->_num_cols; }
+    function get_num_rows() { return $this->_num_rows; }
+    function get_num_cols() { return $this->_num_cols; }
 
-  function &get_columns() {
+    function &get_columns() {
     return $this->_columns;
-  }
+    }
 
-  function &get_column($i) {
+    function &get_column($i) {
     if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
-                                  "min-width" => 0,
-                                  "max-width" => 0,
-                                  "used-width" => null,
-                                  "absolute" => 0,
-                                  "percent" => 0,
-                                  "auto" => true);
+        $this->_columns[$i] = array("x" => 0,
+                                    "min-width" => 0,
+                                    "max-width" => 0,
+                                    "used-width" => null,
+                                    "absolute" => 0,
+                                    "percent" => 0,
+                                    "auto" => true);
 
     return $this->_columns[$i];
-  }
+    }
 
-  function &get_rows() {
+    function &get_rows() {
     return $this->_rows;
-  }
+    }
 
-  function &get_row($j) {
+    function &get_row($j) {
     if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
-                               "first-column" => 0,
-                               "height" => null);
+        $this->_rows[$j] = array("y" => 0,
+                                "first-column" => 0,
+                                "height" => null);
     return $this->_rows[$j];
-  }
+    }
 
-  function get_border($i, $j, $h_v, $prop = null) {
+    function get_border($i, $j, $h_v, $prop = null) {
     if ( !isset($this->_borders[$i][$j][$h_v]) )
-      $this->_borders[$i][$j][$h_v] = array("width" => 0,
-                                           "style" => "solid",
-                                           "color" => "black");
+        $this->_borders[$i][$j][$h_v] = array("width" => 0,
+                                            "style" => "solid",
+                                            "color" => "black");
     if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+        return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
-  }
+    }
 
-  function get_border_properties($i, $j) {
+    function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
     $right = $this->get_border($i, $j+1, "vertical");
@@ -213,119 +212,119 @@ 
     $bottom = $this->get_border($i+1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_spanned_cells($frame) {
+    function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     return $this->_frames[$key];
 
-  }
+    }
 
-  function frame_exists_in_cellmap($frame) {
+    function frame_exists_in_cellmap($frame) {
     $key = $frame->get_id();
     return isset($this->_frames[$key]);
-  }
+    }
   
-  function get_frame_position($frame) {
+    function get_frame_position($frame) {
     global $_dompdf_warnings;
 
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
     if ( !isset($this->_columns[$col])) {
-      $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
-      $x = 0;
+        $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
+        $x = 0;
     } else
-      $x = $this->_columns[$col]["x"];
+        $x = $this->_columns[$col]["x"];
 
     if ( !isset($this->_rows[$row])) {
-      $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
-      $y = 0;
+        $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
+        $y = 0;
     } else
-      $y = $this->_rows[$row]["y"];
+        $y = $this->_rows[$row]["y"];
 
     return array($x, $y, "x" => $x, "y" => $y);
-  }
+    }
 
-  function get_frame_width($frame) {
+    function get_frame_width($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
     foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+        $w += $this->_columns[$i]["used-width"];
 
     return $w;
 
-  }
+    }
 
-  function get_frame_height($frame) {
+    function get_frame_height($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+        if ( !isset($this->_rows[$i]) )  {
         throw new Exception("foo");
-      }
-      $h += $this->_rows[$i]["height"];
+        }
+        $h += $this->_rows[$i]["height"];
     }
     return $h;
 
-  }
+    }
 
 
-  //........................................................................
+    //........................................................................
 
-  function set_column_width($j, $width) {
+    function set_column_width($j, $width) {
     $col =& $this->get_column($j);
     $col["used-width"] = $width;
     $next_col =& $this->get_column($j+1);
     $next_col["x"] = $next_col["x"] + $width;
-  }
+    }
 
-  function set_row_height($i, $height) {
+    function set_row_height($i, $height) {
     $row =& $this->get_row($i);
     if ( $height <= $row["height"] )
-      return;
+        return;
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
     $next_row["y"] = $row["y"] + $height;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
 
-  protected function _resolve_border($i, $j, $h_v, $border_spec) {
+    protected function _resolve_border($i, $j, $h_v, $border_spec) {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
     if ( !isset($this->_borders[$i][$j][$h_v]) ) {
-      $this->_borders[$i][$j][$h_v] = $border_spec;
-      return $this->_borders[$i][$j][$h_v]["width"];
+        $this->_borders[$i][$j][$h_v] = $border_spec;
+        return $this->_borders[$i][$j][$h_v]["width"];
     }
 
     $o_width = $this->_borders[$i][$j][$h_v]["width"];
@@ -341,14 +340,14 @@ 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
           self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
-      $this->_borders[$i][$j][$h_v] = $border_spec;
+        $this->_borders[$i][$j][$h_v] = $border_spec;
 
     return $this->_borders[$i][$j][$h_v]["width"];
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_frame(Frame $frame) {
+    function add_frame(Frame $frame) {
     
     $style = $frame->get_style();
     $display = $style->display;
@@ -361,39 +360,39 @@ 
          $display == "inline-table" ||
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
+        $start_row = $this->__row;
+        foreach ( $frame->get_children() as $child )
         $this->add_frame( $child );
 
-      if ( $display == "table-row" )
+        if ( $display == "table-row" )
         $this->add_row();
 
-      $num_rows = $this->__row - $start_row - 1;
-      $key = $frame->get_id();
+        $num_rows = $this->__row - $start_row - 1;
+        $key = $frame->get_id();
 
-      // Row groups always span across the entire table
-      $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
-      $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
-      $this->_frames[ $key ]["frame"] = $frame;
+        // Row groups always span across the entire table
+        $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
+        $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
+        $this->_frames[ $key ]["frame"] = $frame;
 
-      if ( $display != "table-row" && $collapse ) {
+        if ( $display != "table-row" && $collapse ) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
         for ( $i = 0; $i < $num_rows+1; $i++) {
-          $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
-          $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
+            $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
+            $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
         for ( $j = 0; $j < $this->_num_cols; $j++) {
-          $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
-          $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+            $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
+            $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+        }
         }
-      }
 
 
-      return;
+        return;
     }
 
     // Determine where this cell is going
@@ -401,13 +400,13 @@ 
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
     if ( !$colspan ) {
-      $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+        $colspan = 1;
+        $frame->get_node()->setAttribute("colspan",1);
     }
 
     if ( !$rowspan ) {
-      $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+        $rowspan = 1;
+        $frame->get_node()->setAttribute("rowspan",1);
     }
     $key = $frame->get_id();
 
@@ -420,60 +419,60 @@ 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
     while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+        $ac++;
     $this->__col = $ac;
 
     // Rows:
     for ( $i = 0; $i < $rowspan; $i++ ) {
-      $row = $this->__row + $i;
+        $row = $this->__row + $i;
 
-      $this->_frames[ $key ]["rows"][] = $row;
+        $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
+        for ( $j = 0; $j < $colspan; $j++)
         $this->_cells[$row][$this->__col + $j] = $frame;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
-      }
+        }
     }
 
     $max_top = $max_bottom = 0;
 
     // Columns:
     for ( $j = 0; $j < $colspan; $j++ ) {
-      $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+        $col = $this->__col + $j;
+        $this->_frames[ $key ]["columns"][] = $col;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
-      }
+        }
     }
 
     $this->_frames[ $key ]["frame"] = $frame;
 
     // Handle seperated border model
     if ( !$collapse ) {
-      list($h, $v) = $this->_table->get_style()->border_spacing;
+        list($h, $v) = $this->_table->get_style()->border_spacing;
 
-      // Border spacing is effectively a margin between cells
-      $v = $style->length_in_pt($v) / 2;
-      $h = $style->length_in_pt($h) / 2;
-      $style->margin = "$v $h";
+        // Border spacing is effectively a margin between cells
+        $v = $style->length_in_pt($v) / 2;
+        $h = $style->length_in_pt($h) / 2;
+        $style->margin = "$v $h";
 
-      // The additional 1/2 width gets added to the table proper
+        // The additional 1/2 width gets added to the table proper
 
     } else {
 
-      // Drop the frame's actual border
-      $style->border_left_width = $max_left / 2;
-      $style->border_right_width = $max_right / 2;
-      $style->border_top_width = $max_top / 2;
-      $style->border_bottom_width = $max_bottom / 2;
-      $style->margin = "none";
+        // Drop the frame's actual border
+        $style->border_left_width = $max_left / 2;
+        $style->border_right_width = $max_right / 2;
+        $style->border_top_width = $max_top / 2;
+        $style->border_bottom_width = $max_bottom / 2;
+        $style->margin = "none";
     }
 
     // Resolve the frame's width
@@ -482,60 +481,60 @@ 
     $width = $style->width;
 
     if ( is_percent($width) ) {
-      $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+        $var = "percent";
+        $val = (float)rtrim($width, "% ") / $colspan;
 
     } else if ( $width !== "auto" ) {
-      $var = "absolute";
-      $val = $style->length_in_pt($frame_min) / $colspan;
+        $var = "absolute";
+        $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
     for ( $cs = 0; $cs < $colspan; $cs++ ) {
 
-      // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+        // Resolve the frame's width(s) with other cells
+        $col =& $this->get_column( $this->__col + $cs );
 
-      // Note: $var is either 'percent' or 'absolute'.  We compare the
-      // requested percentage or absolute values with the existing widths
-      // and adjust accordingly.
-      if ( isset($var) && $val > $col[$var] ) {
+        // Note: $var is either 'percent' or 'absolute'.  We compare the
+        // requested percentage or absolute values with the existing widths
+        // and adjust accordingly.
+        if ( isset($var) && $val > $col[$var] ) {
         $col[$var] = $val;
         $col["auto"] = false;
-      }
+        }
 
-      $min += $col["min-width"];
-      $max += $col["max-width"];
+        $min += $col["min-width"];
+        $max += $col["max-width"];
     }
 
 
     if ( $frame_min > $min ) {
-      // The frame needs more space.  Expand each sub-column
-      $inc = ($frame_min - $min) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        // The frame needs more space.  Expand each sub-column
+        $inc = ($frame_min - $min) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
-      }
+        }
     }
 
     if ( $frame_max > $max ) {
-      $inc = ($frame_max - $max) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        $inc = ($frame_max - $max) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
-      }
+        }
     }
 
     $this->__col += $colspan;
     if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+        $this->_num_cols = $this->__col;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_row() {
+    function add_row() {
 
     $this->__row++;
     $this->_num_rows++;
@@ -543,24 +542,24 @@ 
     // Find the next available column
     $i = 0;
     while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+        $i++;
 
     $this->__col = $i;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Remove a row from the cellmap.
-   *
-   * @param Frame
-   */
-  function remove_row(Frame $row) {
+    /**
+     * Remove a row from the cellmap.
+     *
+     * @param Frame
+     */
+    function remove_row(Frame $row) {
 
     $key = $row->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -569,47 +568,47 @@ 
 
     // Remove all frames from this row
     foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
+        foreach ( $columns as $c ) {
         if ( isset($this->_cells[$r][$c]) ) {
-          $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
-          unset($this->_cells[$r][$c]);
+            $frame = $this->_cells[$r][$c];
+            unset($this->_frames[ $frame->get_id() ]);
+            unset($this->_cells[$r][$c]);
+        }
         }
-      }
-      unset($this->_rows[$r]);
+        unset($this->_rows[$r]);
     }
 
     unset($this->_frames[$key]);
 
-  }
+    }
 
-  /**
-   * Remove a row group from the cellmap.
-   *
-   * @param Frame $group  The group to remove
-   */
-  function remove_row_group(Frame $group) {
+    /**
+     * Remove a row group from the cellmap.
+     *
+     * @param Frame $group  The group to remove
+     */
+    function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
-      $this->remove_row($iter);
-      $iter = $iter->get_next_sibling();
+        $this->remove_row($iter);
+        $iter = $iter->get_next_sibling();
     }
 
     unset($this->_frames[$key]);
-  }
+    }
 
-  /**
-   * Update a row group after rows have been removed
-   *
-   * @param Frame $group    The group to update
-   * @param Frame $last_row The last row in the row group
-   */
-  function update_row_group(Frame $group, Frame $last_row) {
+    /**
+     * Update a row group after rows have been removed
+     *
+     * @param Frame $group    The group to update
+     * @param Frame $last_row The last row in the row group
+     */
+    function update_row_group(Frame $group, Frame $last_row) {
 
     $g_key = $group->get_id();
     $r_key = $last_row->get_id();
@@ -617,80 +616,80 @@ 
     $r_rows = $this->_frames[$r_key]["rows"];
     $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function assign_x_positions() {
+    function assign_x_positions() {
     // Pre-condition: widths must be resolved and assigned to columns and
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
     foreach ( array_keys($this->_columns) as $j ) {
-      $this->_columns[$j]["x"] = $x;
-      $x += $this->_columns[$j]["used-width"];
+        $this->_columns[$j]["x"] = $x;
+        $x += $this->_columns[$j]["used-width"];
 
     }
 
-  }
+    }
 
-  function assign_frame_heights() {
+    function assign_frame_heights() {
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach( $arr["rows"] as $row ) {
+        $h = 0;
+        foreach( $arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          // The row has been removed because of a page split, so skip it.
-          continue;
+            // The row has been removed because of a page split, so skip it.
+            continue;
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($h);
-      else
+        else
         $frame->get_style()->height = $h;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Re-adjust frame height if the table height is larger than its content
-   */
-  function set_frame_heights($table_height, $content_height) {
+    /**
+     * Re-adjust frame height if the table height is larger than its content
+     */
+    function set_frame_heights($table_height, $content_height) {
 
 
     // Distribute the increased height proportionally amongst each row
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach ($arr["rows"] as $row ) {
+        $h = 0;
+        foreach ($arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          continue;
+            continue;
 
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      $new_height = ($h / $content_height) * $table_height;
+        $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($new_height);
-      else
+        else
         $frame->get_style()->height = $new_height;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Used for debugging:
-  function __toString() {
+    // Used for debugging:
+    function __toString() {
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
@@ -700,14 +699,14 @@ 
     $str .=  "Frames:<br/>";
     $arr = array();
     foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+        $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
 
     $str .= pre_r($arr, true);
 
     if ( php_sapi_name() == "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+        $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
     return $str;
-  }
+    }
 }

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

Indentation +8 added lines, -9 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: dompdf_internal_exception.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,14 +45,14 @@ 
  */
 class DOMPDF_Internal_Exception extends Exception {
 
-  /**
-   * Class constructor
-   *
-   * @param string $message Error message
-   * @param int $code Error code
-   */
-  function __construct($message = NULL, $code = 0) {
+    /**
+     * Class constructor
+     *
+     * @param string $message Error message
+     * @param int $code Error code
+     */
+    function __construct($message = NULL, $code = 0) {
     parent::__construct($message, $code);
-  }
+    }
 
 }

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

Indentation +379 added lines, -380 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: dompdf.cls.php,v $
- * Created on: 2004-06-09
- *
- * 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: dompdf.cls.php,v $
+     * Created on: 2004-06-09
+     *
+     * 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: dompdf.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -89,90 +88,90 @@ 
 class DOMPDF {
 
 
-  /**
-   * DomDocument representing the HTML document
-   *
-   * @var DomDocument
-   */
-  protected $_xml;
-
-  /**
-   * Frame_Tree derived from the DOM tree
-   *
-   * @var Frame_Tree
-   */
-  protected $_tree;
-
-  /**
-   * Stylesheet for the document
-   *
-   * @var Stylesheet
-   */
-  protected $_css;
-
-  /**
-   * Actual PDF renderer
-   *
-   * @var Canvas
-   */
-  protected $_pdf;
-
-  /**
-   * Desired paper size ('letter', 'legal', 'A4', etc.)
-   *
-   * @var string
-   */
-  protected $_paper_size;
-
-  /**
-   * Paper orientation ('portrait' or 'landscape')
-   *
-   * @var string
-   */
-  protected $_paper_orientation;
-
-  /**
-   * Callbacks on new page and new element
-   *
-   * @var array
-   */
-  protected $_callbacks;
-
-  /**
-   * Experimental caching capability
-   *
-   * @var string
-   */
-  private $_cache_id;
-
-  /**
-   * Base hostname
-   *
-   * Used for relative paths/urls
-   * @var string
-   */
-  protected $_base_host;
-
-  /**
-   * Absolute base path
-   *
-   * Used for relative paths/urls
-   * @var string
-   */
-  protected $_base_path;
-
-  /**
-   * Protcol used to request file (file://, http://, etc)
-   *
-   * @var string
-   */
-  protected $_protocol;
-
-
-  /**
-   * Class constructor
-   */
-  function __construct() {
+    /**
+     * DomDocument representing the HTML document
+     *
+     * @var DomDocument
+     */
+    protected $_xml;
+
+    /**
+     * Frame_Tree derived from the DOM tree
+     *
+     * @var Frame_Tree
+     */
+    protected $_tree;
+
+    /**
+     * Stylesheet for the document
+     *
+     * @var Stylesheet
+     */
+    protected $_css;
+
+    /**
+     * Actual PDF renderer
+     *
+     * @var Canvas
+     */
+    protected $_pdf;
+
+    /**
+     * Desired paper size ('letter', 'legal', 'A4', etc.)
+     *
+     * @var string
+     */
+    protected $_paper_size;
+
+    /**
+     * Paper orientation ('portrait' or 'landscape')
+     *
+     * @var string
+     */
+    protected $_paper_orientation;
+
+    /**
+     * Callbacks on new page and new element
+     *
+     * @var array
+     */
+    protected $_callbacks;
+
+    /**
+     * Experimental caching capability
+     *
+     * @var string
+     */
+    private $_cache_id;
+
+    /**
+     * Base hostname
+     *
+     * Used for relative paths/urls
+     * @var string
+     */
+    protected $_base_host;
+
+    /**
+     * Absolute base path
+     *
+     * Used for relative paths/urls
+     * @var string
+     */
+    protected $_base_path;
+
+    /**
+     * Protcol used to request file (file://, http://, etc)
+     *
+     * @var string
+     */
+    protected $_protocol;
+
+
+    /**
+     * Class constructor
+     */
+    function __construct() {
     $this->_messages = array();
     $this->_xml = new DOMDocument();
     $this->_xml->preserveWhiteSpace = true;
@@ -186,203 +185,203 @@ 
     $this->_base_path = "";
     $this->_callbacks = array();
     $this->_cache_id = null;
-  }
-
-  /**
-   * Returns the underlying {@link Frame_Tree} object
-   *
-   * @return Frame_Tree
-   */
-  function get_tree() { return $this->_tree; }
-
-  //........................................................................
-
-  /**
-   * Sets the protocol to use
-   *
-   * @param string $proto
-   */
-  // FIXME: validate these
-  function set_protocol($proto) { $this->_protocol = $proto; }
-
-  /**
-   * Sets the base hostname
-   *
-   * @param string $host
-   */
-  function set_host($host) { $this->_base_host = $host; }
-
-  /**
-   * Sets the base path
-   *
-   * @param string $path
-   */
-  function set_base_path($path) { $this->_base_path = $path; }
-
-  /**
-   * Returns the protocol in use
-   *
-   * @return string
-   */
-  function get_protocol() { return $this->_protocol; }
-
-  /**
-   * Returns the base hostname
-   *
-   * @return string
-   */
-  function get_host() { return $this->_base_host; }
-
-  /**
-   * Returns the base path
-   *
-   * @return string
-   */
-  function get_base_path() { return $this->_base_path; }
-
-  /**
-   * Return the underlying Canvas instance (e.g. CPDF_Adapter, GD_Adapter)
-   *
-   * @return Canvas
-   */
-  function get_canvas() { return $this->_pdf; }
-
-  /**
-   * Returns the callbacks array
-   *
-   * @return array
-   */
-  function get_callbacks() { return $this->_callbacks; }
+    }
+
+    /**
+     * Returns the underlying {@link Frame_Tree} object
+     *
+     * @return Frame_Tree
+     */
+    function get_tree() { return $this->_tree; }
+
+    //........................................................................
+
+    /**
+     * Sets the protocol to use
+     *
+     * @param string $proto
+     */
+    // FIXME: validate these
+    function set_protocol($proto) { $this->_protocol = $proto; }
+
+    /**
+     * Sets the base hostname
+     *
+     * @param string $host
+     */
+    function set_host($host) { $this->_base_host = $host; }
+
+    /**
+     * Sets the base path
+     *
+     * @param string $path
+     */
+    function set_base_path($path) { $this->_base_path = $path; }
+
+    /**
+     * Returns the protocol in use
+     *
+     * @return string
+     */
+    function get_protocol() { return $this->_protocol; }
+
+    /**
+     * Returns the base hostname
+     *
+     * @return string
+     */
+    function get_host() { return $this->_base_host; }
+
+    /**
+     * Returns the base path
+     *
+     * @return string
+     */
+    function get_base_path() { return $this->_base_path; }
+
+    /**
+     * Return the underlying Canvas instance (e.g. CPDF_Adapter, GD_Adapter)
+     *
+     * @return Canvas
+     */
+    function get_canvas() { return $this->_pdf; }
+
+    /**
+     * Returns the callbacks array
+     *
+     * @return array
+     */
+    function get_callbacks() { return $this->_callbacks; }
   
-  //........................................................................
-
-  /**
-   * Loads an HTML file
-   *
-   * Parse errors are stored in the global array _dompdf_warnings.
-   *
-   * @param string $file a filename or url to load
-   */
-  function load_html_file($file) {
+    //........................................................................
+
+    /**
+     * Loads an HTML file
+     *
+     * Parse errors are stored in the global array _dompdf_warnings.
+     *
+     * @param string $file a filename or url to load
+     */
+    function load_html_file($file) {
     // Store parsing warnings as messages (this is to prevent output to the
     // browser if the html is ugly and the dom extension complains,
     // preventing the pdf from being streamed.)
     if ( !$this->_protocol && !$this->_base_host && !$this->_base_path )
-      list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($file);
+        list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($file);
 
     if ( !DOMPDF_ENABLE_REMOTE &&
          ($this->_protocol != "" && $this->_protocol !== "file://" ) )
-      throw new DOMPDF_Exception("Remote file requested, but DOMPDF_ENABLE_REMOTE is false.");
+        throw new DOMPDF_Exception("Remote file requested, but DOMPDF_ENABLE_REMOTE is false.");
 
     if ($this->_protocol == "" || $this->_protocol === "file://") {
 
-      $realfile = realpath($file);
-      if ( !$file )
+        $realfile = realpath($file);
+        if ( !$file )
         throw new DOMPDF_Exception("File '$file' not found.");
 
-      if ( strpos($realfile, DOMPDF_CHROOT) !== 0 )
+        if ( strpos($realfile, DOMPDF_CHROOT) !== 0 )
         throw new DOMPDF_Exception("Permission denied on $file.");
 
-      // Exclude dot files (e.g. .htaccess)
-      if ( substr(basename($realfile),0,1) === "." )
+        // Exclude dot files (e.g. .htaccess)
+        if ( substr(basename($realfile),0,1) === "." )
         throw new DOMPDF_Exception("Permission denied on $file.");
 
-      $file = $realfile;
+        $file = $realfile;
     }
 
     $this->load_html(file_get_contents($file));
-  }
-
-  /**
-   * Loads an HTML string
-   *
-   * Parse errors are stored in the global array _dompdf_warnings.
-   *
-   * @param string $str HTML text to load
-   */
-  function load_html($str) {
+    }
+
+    /**
+     * Loads an HTML string
+     *
+     * Parse errors are stored in the global array _dompdf_warnings.
+     *
+     * @param string $str HTML text to load
+     */
+    function load_html($str) {
     // FIXME: Determine character encoding, switch to UTF8, update meta tag. Need better http/file stream encoding detection, currently relies on text or meta tag.
     mb_detect_order('auto');
     if (mb_detect_encoding($str) != 'UTF-8') {
-      if (mb_detect_encoding($str) == '') {
+        if (mb_detect_encoding($str) == '') {
         if (preg_match('@<meta\s+http-equiv="Content-Type"\s+content="([\w/]+)(;\s*?charset=([^\s"]+))?@i',$str,$matches)) {
-          $encoding = strtoupper($matches[3]);
+            $encoding = strtoupper($matches[3]);
         } else {
-          $encoding = 'UTF-8';
+            $encoding = 'UTF-8';
         }
-      } else {
+        } else {
         if (preg_match('@<meta\s+http-equiv="Content-Type"\s+content="([\w/]+)(;\s*?charset=([^\s"]+))?@i',$str,$matches)) {
-          $encoding = strtoupper($matches[3]);
+            $encoding = strtoupper($matches[3]);
         } else {
-          $encoding = 'auto';
+            $encoding = 'auto';
+        }
         }
-      }
-      if ($encoding != 'UTF-8') { $str = mb_convert_encoding($str, 'UTF-8', $encoding); }
-      if (preg_match('@<meta\s+http-equiv="Content-Type"\s+content="([\w/]+)(;\s+charset=([^\s"]+))?@i',$str,$matches)) {
+        if ($encoding != 'UTF-8') { $str = mb_convert_encoding($str, 'UTF-8', $encoding); }
+        if (preg_match('@<meta\s+http-equiv="Content-Type"\s+content="([\w/]+)(;\s+charset=([^\s"]+))?@i',$str,$matches)) {
         $str = preg_replace('/charset=([^\s"]+)/i','charset=UTF-8',$str);
-      } else {
+        } else {
         $str = str_replace('<head>', '<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">', $str);
-      }
+        }
     }
 
     // Parse embedded php, first-pass
     if ( DOMPDF_ENABLE_PHP ) {
-      ob_start();
-      eval("?" . ">$str");
-      $str = ob_get_contents();
-      ob_end_clean();
+        ob_start();
+        eval("?" . ">$str");
+        $str = ob_get_contents();
+        ob_end_clean();
     }
 
     // Store parsing warnings as messages
     set_error_handler("record_warnings");
     $this->_xml->loadHTML($str);
     restore_error_handler();
-  }
+    }
 
-  /**
-   * Builds the {@link Frame_Tree}, loads any CSS and applies the styles to
-   * the {@link Frame_Tree}
-   */
-  protected function _process_html() {
+    /**
+     * Builds the {@link Frame_Tree}, loads any CSS and applies the styles to
+     * the {@link Frame_Tree}
+     */
+    protected function _process_html() {
     $this->_tree->build_tree();
 
     $this->_css->load_css_file(Stylesheet::DEFAULT_STYLESHEET);
 
     $acceptedmedia = Stylesheet::$ACCEPTED_GENERIC_MEDIA_TYPES;
     if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
-      $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
+        $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
     } else {
-      $acceptedmedia[] = Stylesheet::$ACCEPTED_DEFAULT_MEDIA_TYPE;
+        $acceptedmedia[] = Stylesheet::$ACCEPTED_DEFAULT_MEDIA_TYPE;
     }
           
     // load <link rel="STYLESHEET" ... /> tags
     $links = $this->_xml->getElementsByTagName("link");
     foreach ($links as $link) {
-      if ( mb_strtolower($link->getAttribute("rel")) === "stylesheet" ||
+        if ( mb_strtolower($link->getAttribute("rel")) === "stylesheet" ||
            mb_strtolower($link->getAttribute("type")) === "text/css" ) {
         //Check if the css file is for an accepted media type
         //media not given then always valid
         $formedialist = preg_split("/[\s\n,]/", $link->getAttribute("media"),-1, PREG_SPLIT_NO_EMPTY);
         if ( count($formedialist) > 0 ) {
-          $accept = false;
-          foreach ( $formedialist as $type ) {
+            $accept = false;
+            foreach ( $formedialist as $type ) {
             if ( in_array(mb_strtolower(trim($type)), $acceptedmedia) ) {
-              $accept = true;
-              break;
+                $accept = true;
+                break;
+            }
             }
-          }
-          if (!$accept) {
+            if (!$accept) {
             //found at least one mediatype, but none of the accepted ones
             //Skip this css file.
             continue;
-          }
+            }
         }
            
         $url = $link->getAttribute("href");
         $url = build_url($this->_protocol, $this->_base_host, $this->_base_path, $url);
 
         $this->_css->load_css_file($url);
-      }
+        }
 
     }
 
@@ -390,94 +389,94 @@ 
     $styles = $this->_xml->getElementsByTagName("style");
     foreach ($styles as $style) {
 
-      // Accept all <style> tags by default (note this is contrary to W3C
-      // HTML 4.0 spec:
-      // http://www.w3.org/TR/REC-html40/present/styles.html#adef-media
-      // which states that the default media type is 'screen'
-      if ( $style->hasAttributes() &&
+        // Accept all <style> tags by default (note this is contrary to W3C
+        // HTML 4.0 spec:
+        // http://www.w3.org/TR/REC-html40/present/styles.html#adef-media
+        // which states that the default media type is 'screen'
+        if ( $style->hasAttributes() &&
            ($media = $style->getAttribute("media")) &&
            !in_array($media, $acceptedmedia) )
         continue;
 
-      $css = "";
-      if ( $style->hasChildNodes() ) {
+        $css = "";
+        if ( $style->hasChildNodes() ) {
 
         $child = $style->firstChild;
         while ( $child ) {
-          $css .= $child->nodeValue; // Handle <style><!-- blah --></style>
-          $child = $child->nextSibling;
+            $css .= $child->nodeValue; // Handle <style><!-- blah --></style>
+            $child = $child->nextSibling;
         }
 
-      } else
+        } else
         $css = $style->nodeValue;
       
-      // Set the base path of the Stylesheet to that of the file being processed
-      $this->_css->set_protocol($this->_protocol);
-      $this->_css->set_host($this->_base_host);
-      $this->_css->set_base_path($this->_base_path);
+        // Set the base path of the Stylesheet to that of the file being processed
+        $this->_css->set_protocol($this->_protocol);
+        $this->_css->set_host($this->_base_host);
+        $this->_css->set_base_path($this->_base_path);
 
-      $this->_css->load_css($css);
+        $this->_css->load_css($css);
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Sets the paper size & orientation
-   *
-   * @param string $size 'letter', 'legal', 'A4', etc. {@link CPDF_Adapter::$PAPER_SIZES}
-   * @param string $orientation 'portrait' or 'landscape'
-   */
-  function set_paper($size, $orientation = "portrait") {
+    /**
+     * Sets the paper size & orientation
+     *
+     * @param string $size 'letter', 'legal', 'A4', etc. {@link CPDF_Adapter::$PAPER_SIZES}
+     * @param string $orientation 'portrait' or 'landscape'
+     */
+    function set_paper($size, $orientation = "portrait") {
     $this->_paper_size = $size;
     $this->_paper_orientation = $orientation;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Enable experimental caching capability
-   * @access private
-   */
-  function enable_caching($cache_id) {
+    /**
+     * Enable experimental caching capability
+     * @access private
+     */
+    function enable_caching($cache_id) {
     $this->_cache_id = $cache_id;
-  }
-
-  //........................................................................
-
-  /**
-   * Sets callbacks for events like rendering of pages and elements.
-   * The callbacks array contains arrays with 'event' set to 'begin_page',
-   * 'end_page', 'begin_frame', or 'end_frame' and 'f' set to a function or
-   * object plus method to be called.
-   *
-   * The function 'f' must take an array as argument, which contains info
-   * about the event.
-   *
-   * @param array $callbacks the set of callbacks to set
-   */
-  function set_callbacks($callbacks) {
+    }
+
+    //........................................................................
+
+    /**
+     * Sets callbacks for events like rendering of pages and elements.
+     * The callbacks array contains arrays with 'event' set to 'begin_page',
+     * 'end_page', 'begin_frame', or 'end_frame' and 'f' set to a function or
+     * object plus method to be called.
+     *
+     * The function 'f' must take an array as argument, which contains info
+     * about the event.
+     *
+     * @param array $callbacks the set of callbacks to set
+     */
+    function set_callbacks($callbacks) {
     if (is_array($callbacks)) {
-      $this->_callbacks = array();
-      foreach ($callbacks as $c) {
+        $this->_callbacks = array();
+        foreach ($callbacks as $c) {
         if (is_array($c) && isset($c['event']) && isset($c['f'])) {
-          $event = $c['event'];
-          $f = $c['f'];
-          if (is_callable($f) && is_string($event)) {
+            $event = $c['event'];
+            $f = $c['f'];
+            if (is_callable($f) && is_string($event)) {
             $this->_callbacks[$event][] = $f;
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Renders the HTML to PDF
-   */
-  function render() {
+    /**
+     * Renders the HTML to PDF
+     */
+    function render() {
 
     //enable_mem_profile();
 
@@ -488,19 +487,19 @@ 
     $root = null;
 
     foreach ($this->_tree->get_frames() as $frame) {
-      // Set up the root frame
+        // Set up the root frame
 
-      if ( is_null($root) ) {
+        if ( is_null($root) ) {
         $root = Frame_Factory::decorate_root( $this->_tree->get_root(), $this );
         continue;
-      }
+        }
 
-      // Create the appropriate decorators, reflowers & positioners.
-      $deco = Frame_Factory::decorate_frame($frame, $this);
-      $deco->set_root($root);
+        // Create the appropriate decorators, reflowers & positioners.
+        $deco = Frame_Factory::decorate_frame($frame, $this);
+        $deco->set_root($root);
 
-      // FIXME: handle generated content
-      if ( $frame->get_style()->display === "list-item" ) {
+        // FIXME: handle generated content
+        if ( $frame->get_style()->display === "list-item" ) {
 
         // Insert a list-bullet frame
         $node = $this->_xml->createElement("bullet"); // arbitrary choice
@@ -512,7 +511,7 @@ 
         $b_f->set_style($style);
 
         $deco->prepend_child( Frame_Factory::decorate_frame($b_f, $this) );
-      }
+        }
 
     }
 
@@ -529,83 +528,83 @@ 
     
     global $_dompdf_warnings, $_dompdf_show_warnings;
     if ( $_dompdf_show_warnings ) {
-      echo '<b>DOMPDF Warnings</b><br><pre>';
-      foreach ($_dompdf_warnings as $msg)
+        echo '<b>DOMPDF Warnings</b><br><pre>';
+        foreach ($_dompdf_warnings as $msg)
         echo $msg . "\n";
-      echo $this->get_canvas()->get_cpdf()->messages;
-      echo '</pre>';
-      flush();
+        echo $this->get_canvas()->get_cpdf()->messages;
+        echo '</pre>';
+        flush();
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add meta information to the PDF after rendering
-   */
-  function add_info($label, $value) {
+    /**
+     * Add meta information to the PDF after rendering
+     */
+    function add_info($label, $value) {
     if (!is_null($this->_pdf))
-      $this->_pdf->add_info($label, $value);
-  }
+        $this->_pdf->add_info($label, $value);
+    }
   
-  //........................................................................
-
-  /**
-   * Streams the PDF to the client
-   *
-   * The file will open a download dialog by default.  The options
-   * parameter controls the output.  Accepted options are:
-   *
-   * 'Accept-Ranges' => 1 or 0 - if this is not set to 1, then this
-   *    header is not included, off by default this header seems to
-   *    have caused some problems despite the fact that it is supposed
-   *    to solve them, so I am leaving it off by default.
-   *
-   * 'compress' = > 1 or 0 - apply content stream compression, this is
-   *    on (1) by default
-   *
-   * 'Attachment' => 1 or 0 - if 1, force the browser to open a
-   *    download dialog, on (1) by default
-   *
-   * @param string $filename the name of the streamed file
-   * @param array  $options header options (see above)
-   */
-  function stream($filename, $options = null) {
+    //........................................................................
+
+    /**
+     * Streams the PDF to the client
+     *
+     * The file will open a download dialog by default.  The options
+     * parameter controls the output.  Accepted options are:
+     *
+     * 'Accept-Ranges' => 1 or 0 - if this is not set to 1, then this
+     *    header is not included, off by default this header seems to
+     *    have caused some problems despite the fact that it is supposed
+     *    to solve them, so I am leaving it off by default.
+     *
+     * 'compress' = > 1 or 0 - apply content stream compression, this is
+     *    on (1) by default
+     *
+     * 'Attachment' => 1 or 0 - if 1, force the browser to open a
+     *    download dialog, on (1) by default
+     *
+     * @param string $filename the name of the streamed file
+     * @param array  $options header options (see above)
+     */
+    function stream($filename, $options = null) {
     if (!is_null($this->_pdf))
-      $this->_pdf->stream($filename, $options);
-  }
-
-  /**
-   * Returns the PDF as a string
-   *
-   * The file will open a download dialog by default.  The options
-   * parameter controls the output.  Accepted options are:
-   *
-   *
-   * 'compress' = > 1 or 0 - apply content stream compression, this is
-   *    on (1) by default
-   *
-   *
-   * @param array  $options options (see above)
-   * @return string
-   */
-  function output($options = null) {
+        $this->_pdf->stream($filename, $options);
+    }
+
+    /**
+     * Returns the PDF as a string
+     *
+     * The file will open a download dialog by default.  The options
+     * parameter controls the output.  Accepted options are:
+     *
+     *
+     * 'compress' = > 1 or 0 - apply content stream compression, this is
+     *    on (1) by default
+     *
+     *
+     * @param array  $options options (see above)
+     * @return string
+     */
+    function output($options = null) {
 
     if ( is_null($this->_pdf) )
-      return null;
+        return null;
 
     return $this->_pdf->output( $options );
-  }
+    }
 
 
-  /**
-   * Returns the underlying HTML document as a string
-   *
-   * @return string
-   */
-  function output_html() {
+    /**
+     * Returns the underlying HTML document as a string
+     *
+     * @return string
+     */
+    function output_html() {
     return $this->_xml->saveHTML();
-  }
-  //........................................................................
+    }
+    //........................................................................
 
 }

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

Indentation +13 added lines, -14 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,35 +46,35 @@ 
  */
 class Table_Row_Frame_Decorator extends Frame_Decorator {
 
-  // protected members
+    // protected members
   
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
-  }
+    }
   
-  //........................................................................ 
+    //........................................................................ 
 
-  /**
-   * Remove all non table-cell frames from this row and move them after
-   * the table.
-   */
-  function normalise() {
+    /**
+     * Remove all non table-cell frames from this row and move them after
+     * the table.
+     */
+    function normalise() {
 
     // Find our table parent
     $p = Table_Frame_Decorator::find_parent_table($this);
     
     $erroneous_frames = array();
     foreach ($this->get_children() as $child) {      
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $display !== "table-cell" )
+        if ( $display !== "table-cell" )
         $erroneous_frames[] = $child;
     }
     
     //  dump the extra nodes after the table.
     foreach ($erroneous_frames as $frame) 
-      $p->move_after($frame);
-  }
+        $p->move_after($frame);
+    }
   
   
 }

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

Indentation +172 added lines, -173 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,17 +45,17 @@ 
  * @package dompdf
  */
 class Block_Frame_Reflower extends Frame_Reflower {
-  const MIN_JUSTIFY_WIDTH = 0.80;  // (Minimum line width to justify, as
-                                   // fraction of available width)
+    const MIN_JUSTIFY_WIDTH = 0.80;  // (Minimum line width to justify, as
+                                    // fraction of available width)
 
-  function __construct(Block_Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Block_Frame_Decorator $frame) { parent::__construct($frame); }
 
-  //........................................................................
+    //........................................................................
 
-  // Calculate the ideal used value for the width property as per:
-  // http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
+    // Calculate the ideal used value for the width property as per:
+    // http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
 
-  protected function _calculate_width($width) {
+    protected function _calculate_width($width) {
     $style = $this->_frame->get_style();
     $w = $this->_frame->get_containing_block("w");
 
@@ -68,20 +67,20 @@ 
     
     // Handle 'auto' values
     $dims = array($style->border_left_width,
-                  $style->border_right_width,
-                  $style->padding_left,
-                  $style->padding_right,
-                  $width !== "auto" ? $width : 0,
-                  $rm !== "auto" ? $rm : 0,
-                  $lm !== "auto" ? $lm : 0);
+                    $style->border_right_width,
+                    $style->padding_left,
+                    $style->padding_right,
+                    $width !== "auto" ? $width : 0,
+                    $rm !== "auto" ? $rm : 0,
+                    $lm !== "auto" ? $lm : 0);
 
     // absolutely positioned boxes take the 'left' and 'right' properties into account
     if ( $style->position === "absolute" || $style->position === "fixed" ) {
-      $absolute = true;
-      $dims[] = $left !== "auto" ? $left : 0;
-      $dims[] = $right !== "auto" ? $right : 0;
+        $absolute = true;
+        $dims[] = $left !== "auto" ? $left : 0;
+        $dims[] = $right !== "auto" ? $right : 0;
     } else {
-      $absolute = false;
+        $absolute = false;
     }
 
     $sum = $style->length_in_pt($dims, $w);
@@ -91,99 +90,99 @@ 
 
     if ( $diff > 0 ) {
 
-      if ( $absolute ) {
+        if ( $absolute ) {
 
         // resolve auto properties: see
         // http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width
 
         if ( $width === "auto" && $left === "auto" && $right === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
 
-          // Technically, the width should be "shrink-to-fit" i.e. based on the
-          // preferred width of the content...  a little too costly here as a
-          // special case.  Just get the width to take up the slack:
-          $left = 0;
-          $right = 0;
-          $width = $diff;
+            // Technically, the width should be "shrink-to-fit" i.e. based on the
+            // preferred width of the content...  a little too costly here as a
+            // special case.  Just get the width to take up the slack:
+            $left = 0;
+            $right = 0;
+            $width = $diff;
 
         } else if ( $width === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
-          if ( $left === "auto" )
+            if ( $left === "auto" )
             $left = 0;
-          if ( $right === "auto" )
+            if ( $right === "auto" )
             $right = 0;
 
-          $width = $diff;
+            $width = $diff;
 
         } else if ( $left === "auto" ) {
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
-          if ( $right === "auto" )
+            if ( $right === "auto" )
             $right = 0;
 
-          $left = $diff;
+            $left = $diff;
 
         } else if ( $right === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
 
-          $right = $diff;
+            $right = $diff;
         }
 
-      } else {
+        } else {
 
         // Find auto properties and get them to take up the slack
         if ( $width === "auto" )
-          $width = $diff;
+            $width = $diff;
 
         else if ( $lm === "auto" && $rm === "auto" )
-          $lm = $rm = round($diff / 2);
+            $lm = $rm = round($diff / 2);
 
         else if ( $lm === "auto" )
-          $lm = $diff;
+            $lm = $diff;
 
         else if ( $rm === "auto" )
-          $rm = $diff;
-      }
+            $rm = $diff;
+        }
 
     } else if ($diff < 0) {
 
-      // We are over constrained--set margin-right to the difference
-      $rm = $diff;
+        // We are over constrained--set margin-right to the difference
+        $rm = $diff;
 
     }
 
     $ret = array("width"=> $width, "margin_left" => $lm, "margin_right" => $rm, "left" => $left, "right" => $right);
 
     return $ret;
-  }
+    }
 
-  // Call the above function, but resolve max/min widths
-  protected function _calculate_restricted_width() {
+    // Call the above function, but resolve max/min widths
+    protected function _calculate_restricted_width() {
     $style = $this->_frame->get_style();
     $cb = $this->_frame->get_containing_block();
 
     if ( !isset($cb["w"]) )
-      throw new DOMPDF_Exception("Box property calculation requires containing block width");
+        throw new DOMPDF_Exception("Box property calculation requires containing block width");
 
     // Treat width 100% as auto
     if ( $style->width === "100%" )
-      $width = "auto";
+        $width = "auto";
     else
-      $width = $style->length_in_pt($style->width, $cb["w"]);
+        $width = $style->length_in_pt($style->width, $cb["w"]);
 
     extract($this->_calculate_width($width));
 
@@ -192,37 +191,37 @@ 
     $max_width = $style->length_in_pt($style->max_width, $cb["w"]);
 
     if ( $max_width !== "none" && $min_width > $max_width)
-      // Swap 'em
-      list($max_width, $min_width) = array($min_width, $max_width);
+        // Swap 'em
+        list($max_width, $min_width) = array($min_width, $max_width);
 
     if ( $max_width !== "none" && $width > $max_width )
-      extract($this->_calculate_width($max_width));
+        extract($this->_calculate_width($max_width));
 
     if ( $width < $min_width )
-      extract($this->_calculate_width($min_width));
+        extract($this->_calculate_width($min_width));
 
     return array($width, $margin_left, $margin_right, $left, $right);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Determine the unrestricted height of content within the block
-  protected function _calculate_content_height() {
+    // Determine the unrestricted height of content within the block
+    protected function _calculate_content_height() {
 
     // Calculate the actual height
     $height = 0;
     
     // Add the height of all lines
     foreach ($this->_frame->get_lines() as $line)
-      $height += $line["h"];
+        $height += $line["h"];
 
     return $height;
 
-  }
+    }
 
-  // Determine the frame's restricted height
-  protected function _calculate_restricted_height() {
+    // Determine the frame's restricted height
+    protected function _calculate_restricted_height() {
     $style = $this->_frame->get_style();
     $content_height = $this->_calculate_content_height();
     $cb = $this->_frame->get_containing_block();
@@ -237,9 +236,9 @@ 
 
     if ( $style->position === "absolute" || $style->position === "fixed" ) {
 
-      // see http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
+        // see http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
 
-      $dims = array($top !== "auto" ? $top : 0,
+        $dims = array($top !== "auto" ? $top : 0,
                     $style->margin_top !== "auto" ? $style->margin_top : 0,
                     $style->padding_top,
                     $style->border_top_width,
@@ -249,153 +248,153 @@ 
                     $style->margin_bottom !== "auto" ? $style->margin_bottom : 0,
                     $bottom !== "auto" ? $bottom : 0);
 
-      $sum = $style->length_in_pt($dims, $cb["h"]);
+        $sum = $style->length_in_pt($dims, $cb["h"]);
 
-      $diff = $cb["h"] - $sum; 
+        $diff = $cb["h"] - $sum; 
 
-      if ( $diff > 0 ) {
+        if ( $diff > 0 ) {
 
         if ( $height === "auto" && $top === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $diff;
+            $height = $diff;
 
         } else if ( $height === "auto" && $top === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $content_height;
-          $top = $diff - $content_height;
+            $height = $content_height;
+            $top = $diff - $content_height;
 
         } else if ( $height === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $content_height;
-          $bottom = $diff - $content_height;
+            $height = $content_height;
+            $bottom = $diff - $content_height;
 
         } else if ( $top === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $bottom = $diff;
+            $bottom = $diff;
 
         } else if ( $top === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $top = $diff;
+            $top = $diff;
 
         } else if ( $height === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $diff;
+            $height = $diff;
 
         } else if ( $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $bottom = $diff;
+            $bottom = $diff;
 
         } else {
 
-          if ( $style->overflow === "visible" ) {
+            if ( $style->overflow === "visible" ) {
 
             // set all autos to zero
             if ( $margin_top === "auto" ) 
-              $margin_top = 0;
+                $margin_top = 0;
             if ( $margin_bottom === "auto" )
-              $margin_bottom = 0;
+                $margin_bottom = 0;
             if ( $top === "auto" )
-              $top = 0;
+                $top = 0;
             if ( $bottom === "auto" )
-              $bottom = 0;
+                $bottom = 0;
             if ( $height === "auto" )
-              $height = $content_height;
+                $height = $content_height;
 
-          }
+            }
 
-          // FIXME: overflow hidden
+            // FIXME: overflow hidden
         }
 
-      }
+        }
 
     } else {
 
-      // Expand the height if overflow is visible
-      if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" )
+        // Expand the height if overflow is visible
+        if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" )
         $height = $content_height;
 
-      // FIXME: this should probably be moved to a seperate function as per
-      // _calculate_restricted_width
+        // FIXME: this should probably be moved to a seperate function as per
+        // _calculate_restricted_width
       
-      // Only handle min/max height if the height is independent of the frame's content
-      if ( !($style->overflow === "visible" ||
+        // Only handle min/max height if the height is independent of the frame's content
+        if ( !($style->overflow === "visible" ||
              ($style->overflow === "hidden" && $height === "auto")) ) {
 
         $min_height = $style->min_height;
         $max_height = $style->max_height;
 
         if ( isset($cb["h"]) ) {
-          $min_height = $style->length_in_pt($min_height, $cb["h"]);
-          $max_height = $style->length_in_pt($max_height, $cb["h"]);
+            $min_height = $style->length_in_pt($min_height, $cb["h"]);
+            $max_height = $style->length_in_pt($max_height, $cb["h"]);
 
         } else if ( isset($cb["w"]) ) {
 
-          if ( mb_strpos($min_height, "%") !== false )
+            if ( mb_strpos($min_height, "%") !== false )
             $min_height = 0;
-          else
+            else
             $min_height = $style->length_in_pt($min_height, $cb["w"]);
 
-          if ( mb_strpos($max_height, "%") !== false )
+            if ( mb_strpos($max_height, "%") !== false )
             $max_height = "none";
-          else
+            else
             $max_height = $style->length_in_pt($max_height, $cb["w"]);
         }
 
         if ( $max_height !== "none" && $min_height > $max_height )
-          // Swap 'em
-          list($max_height, $min_height) = array($min_height, $max_height);
+            // Swap 'em
+            list($max_height, $min_height) = array($min_height, $max_height);
 
         if ( $max_height !== "none" && $height > $max_height )
-          $height = $max_height;
+            $height = $max_height;
 
         if ( $height < $min_height )
-          $height = $min_height;
-      }
+            $height = $min_height;
+        }
 
     }
 
     return array($height, $margin_top, $margin_bottom, $top, $bottom);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  protected function _text_align() {
+    protected function _text_align() {
     $style = $this->_frame->get_style();
     $w = $this->_frame->get_containing_block("w");
     $width = $style->length_in_pt($style->width, $w);
@@ -414,10 +413,10 @@ 
         // Move each child over by $dx
         $dx = $width - $line["w"];
         foreach($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
+            $frame->set_position( $frame->get_position("x") + $dx );
 
-      }
-      break;
+        }
+        break;
 
 
     case "justify":
@@ -426,28 +425,28 @@ 
         // Only set the spacing if the line is long enough.  This is really
         // just an aesthetic choice ;)
         if ( $line["w"] > self::MIN_JUSTIFY_WIDTH * $width ) {
-          // Set the spacing for each child
-          if ( $line["wc"] > 1 )
+            // Set the spacing for each child
+            if ( $line["wc"] > 1 )
             $spacing = ($width - $line["w"]) / ($line["wc"] - 1);
-          else
+            else
             $spacing = 0;
 
-          $dx = 0;
-          foreach($line["frames"] as $frame) {
+            $dx = 0;
+            foreach($line["frames"] as $frame) {
             if ( !$frame instanceof Text_Frame_Decorator )
-              continue;
+                continue;
 
             $frame->set_position( $frame->get_position("x") + $dx );
             $frame->set_text_spacing($spacing);
             $dx += mb_substr_count($frame->get_text(), " ") * $spacing;
-          }
+            }
 
-          // The line (should) now occupy the entire width
-          $this->_frame->set_line($i, null, $width);
+            // The line (should) now occupy the entire width
+            $this->_frame->set_line($i, null, $width);
 
         }
-      }
-      break;
+        }
+        break;
 
     case "center":
     case "centre":
@@ -455,24 +454,24 @@ 
         // Centre each line by moving each frame in the line by:
         $dx = ($width - $line["w"]) / 2;
         foreach ($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
-      }
-      break;
+            $frame->set_position( $frame->get_position("x") + $dx );
+        }
+        break;
     }
 
-  }
-  /**
-   * Align inline children vertically
-   */
-  function vertical_align() {
+    }
+    /**
+     * Align inline children vertically
+     */
+    function vertical_align() {
     // Align each child vertically after each line is reflowed
     foreach ( $this->_frame->get_lines() as $i => $line ) {
 
-      foreach ( $line["frames"] as $frame ) {
+        foreach ( $line["frames"] as $frame ) {
         $style = $frame->get_style();
 
         if ( $style->display !== "inline" && $style->display !== "text" )
-          continue;
+            continue;
 
         $align = $style->vertical_align;
 
@@ -482,41 +481,41 @@ 
 
         case "baseline":
           $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            break;
 
         case "middle":
           $y = $line["y"] + ($line["h"] + $frame_h) / 2;
-          break;
+            break;
 
         case "sub":
           $y = $line["y"] + 0.9 * $line["h"];
-          break;
+            break;
 
         case "super":
           $y = $line["y"] + 0.1 * $line["h"];
-          break;
+            break;
 
         case  "text-top":
         case "top": // Not strictly accurate, but good enough for now
           $y = $line["y"];
-          break;
+            break;
 
         case "text-bottom":
         case "bottom":
           $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            break;
         }
 
         $x = $frame->get_position("x");
         $frame->set_position($x, $y);
 
-      }
+        }
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
 
     // Check if a page break is forced
     $page = $this->_frame->get_root();
@@ -524,7 +523,7 @@ 
 
     // Bail if the page is full
     if ( $page->is_full() )
-      return;
+        return;
 
     // Collapse margins if required
     $this->_collapse_margins();
@@ -553,12 +552,12 @@ 
 
     // Determine the content edge
     $top = $style->length_in_pt(array($style->margin_top,
-                                      $style->padding_top,
-                                      $style->border_top_width), $cb["h"]);
+                                        $style->padding_top,
+                                        $style->border_top_width), $cb["h"]);
 
     $bottom = $style->length_in_pt(array($style->border_bottom_width,
-                                         $style->margin_bottom,
-                                         $style->padding_bottom), $cb["h"]);
+                                            $style->margin_bottom,
+                                            $style->padding_bottom), $cb["h"]);
 
     $cb_x = $x + $left_margin +
       $style->length_in_pt($style->border_left_width, $cb["w"]) +
@@ -574,23 +573,23 @@ 
     // Set the containing blocks and reflow each child
     foreach ( $this->_frame->get_children() as $child ) {
 
-      // Bail out if the page is full
-      if ( $page->is_full() )
+        // Bail out if the page is full
+        if ( $page->is_full() )
         break;
       
-      $child->set_containing_block($cb_x, $cb_y, $w, $cb_h);
-      $child->reflow();
+        $child->set_containing_block($cb_x, $cb_y, $w, $cb_h);
+        $child->reflow();
 
-      // Don't add the child to the line if a page break has occurred
-      if ( $page->check_page_break($child) )
+        // Don't add the child to the line if a page break has occurred
+        if ( $page->check_page_break($child) )
         break;
 
-      // If the frame is not absolutely positioned, It's okay to add the frame
-      // to the line
-      if ( $child->get_style()->position !== "absolute" &&
+        // If the frame is not absolutely positioned, It's okay to add the frame
+        // to the line
+        if ( $child->get_style()->position !== "absolute" &&
            $child->get_style()->position !== "fixed" ) {
         $this->_frame->add_frame_to_line( $child );
-      }
+        }
     }
 
     // Determine our height
@@ -604,8 +603,8 @@ 
     $this->_text_align();
 
     $this->vertical_align();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
 }

main/inc/lib/phpdocx/pdf/include/list_bullet_frame_reflower.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: list_bullet_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,20 +46,20 @@ 
  */
 class List_Bullet_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
     
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
 
     $style->width = $this->_frame->get_width();
     $this->_frame->position();
 
     if ( $style->list_style_position === "inside" ) {
-      $p = $this->_frame->find_block_parent();
-      $p->add_frame_to_line($this->_frame);
+        $p = $this->_frame->find_block_parent();
+        $p->add_frame_to_line($this->_frame);
     }
 
-  }
+    }
 }