chamilo / chamilo-lms

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

Indentation +9 added lines, -10 removed lines

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

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

Indentation +12 added lines, -13 removed lines

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

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

Indentation +328 added lines, -329 removed lines

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

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

Indentation +378 added lines, -379 removed lines

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

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

Indentation +49 added lines, -50 removed lines

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

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

Indentation +267 added lines, -268 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: attribute_translator.cls.php 219 2010-03-11 23:18:31Z ryan.masten $ */
@@ -47,84 +46,84 @@ 
  */
 class Attribute_Translator {
   
-  // Munged data originally from
-  // http://www.w3.org/TR/REC-html40/index/attributes.html
-  //
-  // thank you var_export() :D
-  static private $__ATTRIBUTE_LOOKUP =
+    // Munged data originally from
+    // http://www.w3.org/TR/REC-html40/index/attributes.html
+    //
+    // thank you var_export() :D
+    static private $__ATTRIBUTE_LOOKUP =
     array (//'caption' => array ( 'align' => '', ),
-           'img_inner' =>  // img tags actually end up wrapping img_inner elements
-           array ('align' => array('bottom' => 'vertical-align: baseline;',
-                                   'middle' => 'vertical-align: middle;',
-                                   'top' => 'vertical-align: top;',
-                                   'left' => 'float: left;',
-                                   'right' => 'float: right;'),
-                  'border' => 'border-width: %0.2f px;',
-                  'height' => 'height: %s px;',
-                  'hspace' => 'padding-left: %1$0.2f px; padding-right: %1$0.2f px;',
-                  'vspace' => 'padding-top: %1$0.2f px; padding-bottom: %1$0.2f px;',
-                  'width' => 'width: %s px;',
-                  ),
-           'table' =>
-           array ("align" => array('left' => 'margin-left: 0; margin-right: auto;',
+            'img_inner' =>  // img tags actually end up wrapping img_inner elements
+            array ('align' => array('bottom' => 'vertical-align: baseline;',
+                                    'middle' => 'vertical-align: middle;',
+                                    'top' => 'vertical-align: top;',
+                                    'left' => 'float: left;',
+                                    'right' => 'float: right;'),
+                    'border' => 'border-width: %0.2f px;',
+                    'height' => 'height: %s px;',
+                    'hspace' => 'padding-left: %1$0.2f px; padding-right: %1$0.2f px;',
+                    'vspace' => 'padding-top: %1$0.2f px; padding-bottom: %1$0.2f px;',
+                    'width' => 'width: %s px;',
+                    ),
+            'table' =>
+            array ("align" => array('left' => 'margin-left: 0; margin-right: auto;',
                         'center' => 'margin-left: auto; margin-right: auto;',
                         'right' => 'margin-left: auto; margin-right: 0;'
                         ),
-                  'bgcolor' => 'background-color: %s;',
-                  'border' => '!set_table_border',
-                  'cellpadding' => '!set_table_cellpadding',
-                  'cellspacing' => 'border-spacing: %0.2f; border-collapse: separate;',
-                  'frame' => array('void' => 'border-style: none;',
-                                   'above' => 'border-top-style: solid;',
-                                   'below' => 'border-bottom-style: solid;',
-                                   'hsides' => 'border-left-style: solid; border-right-style: solid;',
-                                   'vsides' => 'border-top-style: solid; border-bottom-style: solid;',
-                                   'lhs' => 'border-left-style: solid;',
-                                   'rhs' => 'border-right-style: solid;',
-                                   'box' => 'border-style: solid;',
-                                   'border' => 'border-style: solid;'),
-                  'rules' => '!set_table_rules',
-                  'width' => 'width: %s;',
-                  ),
-           'hr' =>
-           array (
-                  'align' => '!set_hr_align', // Need to grab width to set 'left' & 'right' correctly
-                  'noshade' => 'border-style: solid;',
-                  'size' => 'border-width: %0.2f px;',
-                  'width' => 'width: %s;',
-                  ),
-           'div' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h1' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h2' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h3' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h4' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h5' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h6' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'p' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
+                    'bgcolor' => 'background-color: %s;',
+                    'border' => '!set_table_border',
+                    'cellpadding' => '!set_table_cellpadding',
+                    'cellspacing' => 'border-spacing: %0.2f; border-collapse: separate;',
+                    'frame' => array('void' => 'border-style: none;',
+                                    'above' => 'border-top-style: solid;',
+                                    'below' => 'border-bottom-style: solid;',
+                                    'hsides' => 'border-left-style: solid; border-right-style: solid;',
+                                    'vsides' => 'border-top-style: solid; border-bottom-style: solid;',
+                                    'lhs' => 'border-left-style: solid;',
+                                    'rhs' => 'border-right-style: solid;',
+                                    'box' => 'border-style: solid;',
+                                    'border' => 'border-style: solid;'),
+                    'rules' => '!set_table_rules',
+                    'width' => 'width: %s;',
+                    ),
+            'hr' =>
+            array (
+                    'align' => '!set_hr_align', // Need to grab width to set 'left' & 'right' correctly
+                    'noshade' => 'border-style: solid;',
+                    'size' => 'border-width: %0.2f px;',
+                    'width' => 'width: %s;',
+                    ),
+            'div' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h1' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h2' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h3' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h4' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h5' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h6' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'p' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
 //            'col' =>
 //            array (
 //                   'align' => '',
@@ -135,219 +134,219 @@ 
 //                   'align' => '',
 //                   'valign' => '',
 //                   ),
-           'tbody' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'td' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  'bgcolor' => 'background-color: %s;',
-                  'height' => 'height: %s;',
-                  'nowrap' => 'white-space: nowrap;',
-                  'valign' => 'vertical-align: %s;',
-                  'width' => 'width: %s;',
-                  ),
-           'tfoot' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'th' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  'bgcolor' => 'background-color: %s;',
-                  'height' => 'height: %s;',
-                  'nowrap' => 'white-space: nowrap;',
-                  'valign' => 'vertical-align: %s;',
-                  'width' => 'width: %s;',
-                  ),
-           'thead' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'tr' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'bgcolor' => '!set_table_row_bgcolor',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'body' =>
-           array (
-                  'background' => 'background-image: url(%s);',
-                  'bgcolor' => 'background-color: %s;',
-                  'link' => '!set_body_link',
-                  'text' => 'color: %s;',
-                  ),
-           'br' =>
-           array (
-                  'clear' => 'clear: %s;',
-                  ),
-           'basefont' =>
-           array (
-                  'color' => 'color: %s;',
-                  'face' => 'font-family: %s;',
-                  'size' => '!set_basefont_size',
-                  ),
-           'font' =>
-           array (
-                  'color' => 'color: %s;',
-                  'face' => 'font-family: %s;',
-                  'size' => '!set_font_size',
-                  ),
-           'dir' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'dl' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'menu' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'ol' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  'start' => 'counter-reset: -dompdf-default-counter %d;',
-                  'type' => 'list-style-type: %s;',
-                  ),
-           'ul' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  'type' => 'list-style-type: %s;',
-                  ),
-           'li' =>
-           array (
-                  'type' => 'list-style-type: %s;',
-                  'value' => 'counter-reset: -dompdf-default-counter %d;',
-                  ),
-           'pre' =>
-           array (
-                  'width' => 'width: %s;',
-                  ),
-           );
+            'tbody' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'td' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    'bgcolor' => 'background-color: %s;',
+                    'height' => 'height: %s;',
+                    'nowrap' => 'white-space: nowrap;',
+                    'valign' => 'vertical-align: %s;',
+                    'width' => 'width: %s;',
+                    ),
+            'tfoot' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'th' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    'bgcolor' => 'background-color: %s;',
+                    'height' => 'height: %s;',
+                    'nowrap' => 'white-space: nowrap;',
+                    'valign' => 'vertical-align: %s;',
+                    'width' => 'width: %s;',
+                    ),
+            'thead' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'tr' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'bgcolor' => '!set_table_row_bgcolor',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'body' =>
+            array (
+                    'background' => 'background-image: url(%s);',
+                    'bgcolor' => 'background-color: %s;',
+                    'link' => '!set_body_link',
+                    'text' => 'color: %s;',
+                    ),
+            'br' =>
+            array (
+                    'clear' => 'clear: %s;',
+                    ),
+            'basefont' =>
+            array (
+                    'color' => 'color: %s;',
+                    'face' => 'font-family: %s;',
+                    'size' => '!set_basefont_size',
+                    ),
+            'font' =>
+            array (
+                    'color' => 'color: %s;',
+                    'face' => 'font-family: %s;',
+                    'size' => '!set_font_size',
+                    ),
+            'dir' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'dl' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'menu' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'ol' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    'start' => 'counter-reset: -dompdf-default-counter %d;',
+                    'type' => 'list-style-type: %s;',
+                    ),
+            'ul' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    'type' => 'list-style-type: %s;',
+                    ),
+            'li' =>
+            array (
+                    'type' => 'list-style-type: %s;',
+                    'value' => 'counter-reset: -dompdf-default-counter %d;',
+                    ),
+            'pre' =>
+            array (
+                    'width' => 'width: %s;',
+                    ),
+            );
 
   
-  static protected $_last_basefont_size = 3;
-  static protected $_font_size_lookup = array(1=>"xx-small",
-                                              2=>"x-small",
-                                              3=>"medium",
-                                              4=>"large",
-                                              5=>"x-large",
-                                              6=>"xx-large",
-                                              7=>"300%");
+    static protected $_last_basefont_size = 3;
+    static protected $_font_size_lookup = array(1=>"xx-small",
+                                                2=>"x-small",
+                                                3=>"medium",
+                                                4=>"large",
+                                                5=>"x-large",
+                                                6=>"xx-large",
+                                                7=>"300%");
   
   
-  static function translate_attributes($frame) {
+    static function translate_attributes($frame) {
     $node = $frame->get_node();
     $tag = $node->tagName;
 
     if ( !isset(self::$__ATTRIBUTE_LOOKUP[$tag]) )
-      return;
+        return;
 
     $valid_attrs = self::$__ATTRIBUTE_LOOKUP[$tag];
     $attrs = $node->attributes;
     $style = rtrim($node->getAttribute("style"), "; ");
     if ( $style != "" )
-      $style .= ";";
+        $style .= ";";
 
     foreach ($attrs as $attr => $attr_node ) {
-      if ( !isset($valid_attrs[$attr]) )
+        if ( !isset($valid_attrs[$attr]) )
         continue;
 
-      $value = $attr_node->value;
+        $value = $attr_node->value;
 
-      $target = $valid_attrs[$attr];
+        $target = $valid_attrs[$attr];
       
-      // Look up $value in $target, if $target is an array:
-      if ( is_array($target) ) {
+        // Look up $value in $target, if $target is an array:
+        if ( is_array($target) ) {
 
         if ( isset($target[$value]) )
-          $style .= " " . self::_resolve_target($node, $target[$value], $value);
+            $style .= " " . self::_resolve_target($node, $target[$value], $value);
 
-      } else {
+        } else {
         // otherwise use target directly
         $style .= " " . self::_resolve_target($node, $target, $value);
-      }
+        }
     }
     if ( !is_null($style) ) {
-      $style = ltrim($style);
-      $node->setAttribute("style", $style);
+        $style = ltrim($style);
+        $node->setAttribute("style", $style);
     }
     
-  }
+    }
 
-  static protected function _resolve_target($node, $target, $value) {
+    static protected function _resolve_target($node, $target, $value) {
     if ( $target[0] === "!" ) {
-      // Function call
-      $func = "_" . mb_substr($target, 1);
-      return self::$func($node, $value);
+        // Function call
+        $func = "_" . mb_substr($target, 1);
+        return self::$func($node, $value);
     }
     
     return $value ? sprintf($target, $value) : "";
-  }
+    }
 
-  //.....................................................................
+    //.....................................................................
 
-  static protected function _set_table_cellpadding($node, $value) {
+    static protected function _set_table_cellpadding($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; padding: $value" . "px;";
-      $style = ltrim($style, ";");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; padding: $value" . "px;";
+        $style = ltrim($style, ";");
+        $td->setAttribute("style", $style);
     }
     return null;
-  }
+    }
 
-  static protected function _set_table_border($node, $value) {
+    static protected function _set_table_border($node, $value) {
     $td_list = $node->getElementsByTagName("td");
     foreach ($td_list as $td) {
-      $style = $td->getAttribute("style");
-      if ( strpos($style, "border") !== false )
+        $style = $td->getAttribute("style");
+        if ( strpos($style, "border") !== false )
         continue;
-      $style = rtrim($style, ";");
-      $style .= "; border-width: $value" . "px; border-style: ridge;";
-      $style = ltrim($style, ";");
-      $td->setAttribute("style", $style);
+        $style = rtrim($style, ";");
+        $style .= "; border-width: $value" . "px; border-style: ridge;";
+        $style = ltrim($style, ";");
+        $td->setAttribute("style", $style);
     }
     $th_list = $node->getElementsByTagName("th");
     foreach ($th_list as $th) {
-      $style = $th->getAttribute("style");
-      if ( strpos($style, "border") !== false )
+        $style = $th->getAttribute("style");
+        if ( strpos($style, "border") !== false )
         continue;
-      $style = rtrim($style, ";");
-      $style .= "; border-width: $value" . "px; border-style: ridge;";
-      $style = ltrim($style, ";");
-      $th->setAttribute("style", $style);
+        $style = rtrim($style, ";");
+        $style .= "; border-width: $value" . "px; border-style: ridge;";
+        $style = ltrim($style, ";");
+        $th->setAttribute("style", $style);
     }
     
     return null;
-  }
+    }
 
-  static protected function _set_table_cellspacing($node, $value) {
+    static protected function _set_table_cellspacing($node, $value) {
     $style = rtrim($td->getAttribute($style), ";");
 
     if ( $value == 0 )
-      $style .= "; border-collapse: collapse;";
+        $style .= "; border-collapse: collapse;";
       
     else
-      $style = "; border-collapse: separate;";
+        $style = "; border-collapse: separate;";
       
     return ltrim($style, ";");
-  }
+    }
   
-  static protected function _set_table_rules($node, $value) {
+    static protected function _set_table_rules($node, $value) {
     $new_style = "; border-collapse: collapse;";
     switch ($value) {
     case "none":
       $new_style .= "border-style: none;";
-      break;
+        break;
 
     case "groups":
       // FIXME: unsupported
@@ -355,15 +354,15 @@ 
 
     case "rows":
       $new_style .= "border-style: solid none solid none; border-width: 1px; ";
-      break;
+        break;
 
     case "cols":
       $new_style .= "border-style: none solid none solid; border-width: 1px; ";
-      break;
+        break;
 
     case "all":
       $new_style .= "border-style: solid; border-width: 1px; ";
-      break;
+        break;
       
     default:
       // Invalid value
@@ -373,118 +372,118 @@ 
     $td_list = $node->getElementsByTagName("td");
     
     foreach ($td_list as $td) {
-      $style = $td->getAttribute("style");
-      $style .= $new_style;
-      $td->setAttribute("style", $style);
+        $style = $td->getAttribute("style");
+        $style .= $new_style;
+        $td->setAttribute("style", $style);
     }
     return null;
-  }
+    }
 
-  static protected function _set_hr_align($node, $value) {
+    static protected function _set_hr_align($node, $value) {
 
     $style = rtrim($node->getAttribute("style"),";");
     $width = $node->getAttribute("width");
     if ( $width == "" )
-      $width = "100%";
+        $width = "100%";
 
     $remainder = 100 - (double)rtrim($width, "% ");
     
     switch ($value) {
     case "left":
       $style .= "; margin-right: $remainder %;";
-      break;
+        break;
 
     case "right":
       $style .= "; margin-left: $remainder %;";
-      break;
+        break;
 
     case "center":
       $style .= "; margin-left: auto; margin-right: auto;";
-      break;
+        break;
 
     default:
       return null;
     }
     return ltrim($style, "; ");
     
-  }
+    }
 
-  static protected function _set_table_row_align($node, $value) {
+    static protected function _set_table_row_align($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; text-align: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; text-align: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_table_row_valign($node, $value) {
+    static protected function _set_table_row_valign($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; vertical-align: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; vertical-align: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_table_row_bgcolor($node, $value) {
+    static protected function _set_table_row_bgcolor($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; background-color: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; background-color: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_body_link($node, $value) {
+    static protected function _set_body_link($node, $value) {
 
     $a_list = $node->getElementsByTagName("a");
 
     foreach ($a_list as $a) {
-      $style = rtrim($a->getAttribute("style"), ";");
-      $style .= "; color: $value;";
-      $style = ltrim($style, "; ");
-      $a->setAttribute("style", $style);
+        $style = rtrim($a->getAttribute("style"), ";");
+        $style .= "; color: $value;";
+        $style = ltrim($style, "; ");
+        $a->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_basefont_size($node, $value) {
+    static protected function _set_basefont_size($node, $value) {
     // FIXME: ? we don't actually set the font size of anything here, just
     // the base size for later modification by <font> tags.
     self::$_last_basefont_size = $value;
     return null;
-  }
+    }
   
-  static protected function _set_font_size($node, $value) {
+    static protected function _set_font_size($node, $value) {
     $style = $node->getAttribute("style");
 
     if ( $value[0] === "-" || $value[0] === "+" )
-      $value = self::$_last_basefont_size + (int)$value;
+        $value = self::$_last_basefont_size + (int)$value;
 
     if ( isset(self::$_font_size_lookup[$value]) )
-      $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
+        $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
     else
-      $style .= "; font-size: $value;";
+        $style .= "; font-size: $value;";
 
     return ltrim($style, "; ");
     
-  }
+    }
 
 }

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

Indentation +4 added lines, -5 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_cell_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,15 +46,15 @@ 
  */
 class Table_Cell_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
 
     $table = Table_Frame_Decorator::find_parent_table($this->_frame);
     $cellmap = $table->get_cellmap();
     $this->_frame->set_position($cellmap->get_frame_position($this->_frame));
 
-  }
+    }
 }

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