chamilo / chamilo-lms

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

Indentation +2 added lines, -3 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: null_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,8 +46,8 @@ 
  */
 class Null_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame $frame) { parent::__construct($frame); }
+    function __construct(Frame $frame) { parent::__construct($frame); }
 
-  function reflow() { return; }
+    function reflow() { return; }
   
 }

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

Indentation +61 added lines, -62 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: cached_pdf_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -53,90 +52,90 @@ 
  * @package dompdf
  */
 class Cached_PDF_Decorator extends CPDF_Adapter implements Canvas {
-  protected $_pdf;
-  protected $_cache_id;
-  protected $_current_page_id;
-  protected $_fonts;  // fonts used in this document
+    protected $_pdf;
+    protected $_cache_id;
+    protected $_current_page_id;
+    protected $_fonts;  // fonts used in this document
   
-  function __construct($cache_id, CPDF_Adapter $pdf) {
+    function __construct($cache_id, CPDF_Adapter $pdf) {
     $this->_pdf = $pdf;
     $this->_cache_id = $cache_id;
     $this->_fonts = array();
     
     $this->_current_page_id = $this->_pdf->open_object();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_cpdf() { return $this->_pdf->get_cpdf(); }
+    function get_cpdf() { return $this->_pdf->get_cpdf(); }
 
-  function open_object() { $this->_pdf->open_object(); }
-  function reopen_object() { return $this->_pdf->reopen_object(); }
+    function open_object() { $this->_pdf->open_object(); }
+    function reopen_object() { return $this->_pdf->reopen_object(); }
   
-  function close_object() { $this->_pdf->close_object(); }
+    function close_object() { $this->_pdf->close_object(); }
 
-  function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
+    function add_object($object, $where = 'all') { $this->_pdf->add_object($object, $where); }
 
-  function serialize_object($id) { $this->_pdf->serialize_object($id); }
+    function serialize_object($id) { $this->_pdf->serialize_object($id); }
 
-  function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
+    function reopen_serialized_object($obj) { $this->_pdf->reopen_serialized_object($obj); }
     
-  //........................................................................
+    //........................................................................
 
-  function get_width() { return $this->_pdf->get_width(); }
-  function get_height() {  return $this->_pdf->get_height(); }
-  function get_page_number() { return $this->_pdf->get_page_number(); }
-  function get_page_count() { return $this->_pdf->get_page_count(); }
+    function get_width() { return $this->_pdf->get_width(); }
+    function get_height() {  return $this->_pdf->get_height(); }
+    function get_page_number() { return $this->_pdf->get_page_number(); }
+    function get_page_count() { return $this->_pdf->get_page_count(); }
 
-  function set_page_number($num) { $this->_pdf->set_page_number($num); }
-  function set_page_count($count) { $this->_pdf->set_page_count($count); }
+    function set_page_number($num) { $this->_pdf->set_page_number($num); }
+    function set_page_count($count) { $this->_pdf->set_page_count($count); }
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array()) {
     $this->_pdf->line($x1, $y1, $x2, $y2, $color, $width, $style);
-  }
+    }
                               
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array()) {
     $this->_pdf->rectangle($x1, $y1, $w, $h, $color, $width, $style);
-  }
+    }
  
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_pdf->filled_rectangle($x1, $y1, $w, $h, $color);
-  }
+    }
     
-  function polygon($points, $color, $width = null, $style = array(), $fill = false) {
+    function polygon($points, $color, $width = null, $style = array(), $fill = false) {
     $this->_pdf->polygon($points, $color, $width, $style, $fill);
-  }
+    }
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null, $fill = false) {
     $this->_pdf->circle($x, $y, $r1, $color, $width, $style, $fill);
-  }
+    }
 
-  function image($img_url, $x, $y, $w = null, $h = null) {
+    function image($img_url, $x, $y, $w = null, $h = null) {
     $this->_pdf->image($img_url, $x, $y, $w, $h);
-  }
+    }
   
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     $this->_fonts[$font] = true;
     $this->_pdf->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-  }
+    }
 
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_text($x, $y, $text, $font, $size, $color, $adjust, $angle);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function page_script($script, $type = 'text/php') {
+    function page_script($script, $type = 'text/php') {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
     $this->_pdf->page_script($script, $type);
     $this->_pdf->reopen_object($this->_current_page_id);
-  }
+    }
   
-  function new_page() {
+    function new_page() {
     $this->_pdf->close_object();
 
     // Add the object to the current page
@@ -144,43 +143,43 @@ 
     $this->_pdf->new_page();    
 
     Page_Cache::store_page($this->_cache_id,
-                           $this->_pdf->get_page_number() - 1,
-                           $this->_pdf->serialize_object($this->_current_page_id));
+                            $this->_pdf->get_page_number() - 1,
+                            $this->_pdf->serialize_object($this->_current_page_id));
 
     $this->_current_page_id = $this->_pdf->open_object();
     return $this->_current_page_id;
-  }
+    }
   
-  function stream($filename) {
+    function stream($filename) {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        Page_Cache::store_fonts($this->_cache_id, $this->_fonts);
+        $this->_current_page_id = null;
     }
     
     $this->_pdf->stream($filename);
     
-  }
+    }
   
-  function &output() {
+    function &output() {
     // Store the last page in the page cache
     if ( !is_null($this->_current_page_id) ) {
-      $this->_pdf->close_object();
-      $this->_pdf->add_object($this->_current_page_id, "add");
-      Page_Cache::store_page($this->_cache_id,
-                             $this->_pdf->get_page_number(),
-                             $this->_pdf->serialize_object($this->_current_page_id));
-      $this->_current_page_id = null;
+        $this->_pdf->close_object();
+        $this->_pdf->add_object($this->_current_page_id, "add");
+        Page_Cache::store_page($this->_cache_id,
+                                $this->_pdf->get_page_number(),
+                                $this->_pdf->serialize_object($this->_current_page_id));
+        $this->_current_page_id = null;
     }
     
     return $this->_pdf->output();
-  }
+    }
   
-  function get_messages() { return $this->_pdf->get_messages(); }
+    function get_messages() { return $this->_pdf->get_messages(); }
   
 }

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

Indentation +12 added lines, -13 removed lines

@@ -35,7 +35,6 @@ 
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
  * @package dompdf
-
  *
  * Changes
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
@@ -53,17 +52,17 @@ 
  */
 class Inline_Frame_Decorator extends Frame_Decorator {
   
-  function __construct(Frame $frame, DOMPDF $dompdf) { parent::__construct($frame, $dompdf); }
+    function __construct(Frame $frame, DOMPDF $dompdf) { parent::__construct($frame, $dompdf); }
 
-  function split($frame = null) {
+    function split($frame = null) {
 
     if ( is_null($frame) ) {
-      $this->get_parent()->split($this);
-      return;
+        $this->get_parent()->split($this);
+        return;
     }
     
     if ( $frame->get_parent() !== $this )
-      throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+        throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
         
     $split = $this->copy( $this->_frame->get_node()->cloneNode() ); 
     $this->get_parent()->insert_child_after($split, $this);
@@ -86,18 +85,18 @@ 
     //See e.g. in testcase image_variants, long desriptions
     if ( ($url = $style->background_image) && $url !== "none"
          && ($repeat = $style->background_repeat) && $repeat !== "repeat" &&  $repeat !== "repeat-y"
-       ) {
-      $style->background_image = "none";
+        ) {
+        $style->background_image = "none";
     }           
 
     // Add $frame and all following siblings to the new split node
     $iter = $frame;
     while ($iter) {
-      $frame = $iter;      
-      $iter = $iter->get_next_sibling();
-      $frame->reset();
-      $split->append_child($frame);
+        $frame = $iter;      
+        $iter = $iter->get_next_sibling();
+        $frame->reset();
+        $split->append_child($frame);
+    }
     }
-  }
   
 } 

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

Indentation +22 added lines, -22 removed lines

@@ -48,26 +48,26 @@ 
  */
 class Table_Row_Group_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame   Frame to decorate
-   * @param DOMPDF $dompdf Current dompdf instance
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame   Frame to decorate
+     * @param DOMPDF $dompdf Current dompdf instance
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
-  }
+    }
 
-  /**
-   * Override split() to remove all child rows and this element from the cellmap
-   *
-   * @param Frame $child
-   */
-  function split($child = null) {
+    /**
+     * Override split() to remove all child rows and this element from the cellmap
+     *
+     * @param Frame $child
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
 
@@ -76,21 +76,21 @@ 
     $iter = $child;
 
     while ( $iter ) {
-      $cellmap->remove_row($iter);
-      $iter = $iter->get_next_sibling();
+        $cellmap->remove_row($iter);
+        $iter = $iter->get_next_sibling();
     }
 
     // If we are splitting at the first child remove the
     // table-row-group from the cellmap as well
     if ( $child === $this->get_first_child() ) {
-      $cellmap->remove_row_group($this);
-      parent::split();
-      return;
+        $cellmap->remove_row_group($this);
+        parent::split();
+        return;
     }
     
     $cellmap->update_row_group($this, $child->get_prev_sibling());
     parent::split($child);
     
-  }
+    }
 }
  

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

Indentation +8 added lines, -9 removed lines

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

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

Indentation +1073 added lines, -1073 removed lines

@@ -85,114 +85,114 @@ 
  */
 class Style {
 
-  /**
-   * Default font size, in points.
-   *
-   * @var float
-   */
-  static $default_font_size = 12;
-
-  /**
-   * Default line height, as a fraction of the font size.
-   *
-   * @var float
-   */
-  static $default_line_height = 1.2;
-
-  /**
-   * List of all inline types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $INLINE_TYPES = array("inline");
-
-  /**
-   * List of all block types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
-
-  /**
-   * List of all table types.  Should really be a constant.
-   *
-   * @var array;
-   */
-  static $TABLE_TYPES = array("table", "inline-table");
-
-  /**
-   * List of valid border styles.  Should also really be a constant.
-   *
-   * @var array
-   */
-  static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
+    /**
+     * Default font size, in points.
+     *
+     * @var float
+     */
+    static $default_font_size = 12;
+
+    /**
+     * Default line height, as a fraction of the font size.
+     *
+     * @var float
+     */
+    static $default_line_height = 1.2;
+
+    /**
+     * List of all inline types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $INLINE_TYPES = array("inline");
+
+    /**
+     * List of all block types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
+
+    /**
+     * List of all table types.  Should really be a constant.
+     *
+     * @var array;
+     */
+    static $TABLE_TYPES = array("table", "inline-table");
+
+    /**
+     * List of valid border styles.  Should also really be a constant.
+     *
+     * @var array
+     */
+    static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
                                 "double", "groove", "ridge", "inset", "outset");
 
-  /**
-   * Default style values.
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_defaults = null;
-
-  /**
-   * List of inherited properties
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_inherited = null;
-
-  /**
-   * The stylesheet this style belongs to
-   *
-   * @see Stylesheet
-   * @var Stylesheet
-   */
-  protected $_stylesheet; // stylesheet this style is attached to
-
-  /**
-   * Main array of all CSS properties & values
-   *
-   * @var array
-   */
-  protected $_props;
-
-  /* var instead of protected would allow access outside of class */
-  protected $_important_props;
-
-  /**
-   * Cached property values
-   *
-   * @var array
-   */
-  protected $_prop_cache;
+    /**
+     * Default style values.
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_defaults = null;
+
+    /**
+     * List of inherited properties
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_inherited = null;
+
+    /**
+     * The stylesheet this style belongs to
+     *
+     * @see Stylesheet
+     * @var Stylesheet
+     */
+    protected $_stylesheet; // stylesheet this style is attached to
+
+    /**
+     * Main array of all CSS properties & values
+     *
+     * @var array
+     */
+    protected $_props;
+
+    /* var instead of protected would allow access outside of class */
+    protected $_important_props;
+
+    /**
+     * Cached property values
+     *
+     * @var array
+     */
+    protected $_prop_cache;
   
-  /**
-   * Font size of parent element in document tree.  Used for relative font
-   * size resolution.
-   *
-   * @var float
-   */
-  protected $_parent_font_size; // Font size of parent element
+    /**
+     * Font size of parent element in document tree.  Used for relative font
+     * size resolution.
+     *
+     * @var float
+     */
+    protected $_parent_font_size; // Font size of parent element
   
-  // private members
-  /**
-   * True once the font size is resolved absolutely
-   *
-   * @var bool
-   */
-  private $__font_size_calculated; // Cache flag
+    // private members
+    /**
+     * True once the font size is resolved absolutely
+     *
+     * @var bool
+     */
+    private $__font_size_calculated; // Cache flag
   
-  /**
-   * Class constructor
-   *
-   * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
-   */
-  function __construct(Stylesheet $stylesheet) {
+    /**
+     * Class constructor
+     *
+     * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
+     */
+    function __construct(Stylesheet $stylesheet) {
     $this->_props = array();
     $this->_important_props = array();
     $this->_stylesheet = $stylesheet;
@@ -201,330 +201,330 @@ 
     
     if ( !isset(self::$_defaults) ) {
     
-      // Shorthand
-      $d =& self::$_defaults;
+        // Shorthand
+        $d =& self::$_defaults;
     
-      // All CSS 2.1 properties, and their default values
-      $d["azimuth"] = "center";
-      $d["background_attachment"] = "scroll";
-      $d["background_color"] = "transparent";
-      $d["background_image"] = "none";
-      $d["background_position"] = "0% 0%";
-      $d["background_repeat"] = "repeat";
-      $d["background"] = "";
-      $d["border_collapse"] = "separate";
-      $d["border_color"] = "";
-      $d["border_spacing"] = "0";
-      $d["border_style"] = "";
-      $d["border_top"] = "";
-      $d["border_right"] = "";
-      $d["border_bottom"] = "";
-      $d["border_left"] = "";
-      $d["border_top_color"] = "";
-      $d["border_right_color"] = "";
-      $d["border_bottom_color"] = "";
-      $d["border_left_color"] = "";
-      $d["border_top_style"] = "none";
-      $d["border_right_style"] = "none";
-      $d["border_bottom_style"] = "none";
-      $d["border_left_style"] = "none";
-      $d["border_top_width"] = "medium";
-      $d["border_right_width"] = "medium";
-      $d["border_bottom_width"] = "medium";
-      $d["border_left_width"] = "medium";
-      $d["border_width"] = "medium";
-      $d["border"] = "";
-      $d["bottom"] = "auto";
-      $d["caption_side"] = "top";
-      $d["clear"] = "none";
-      $d["clip"] = "auto";
-      $d["color"] = "#000000";
-      $d["content"] = "normal";
-      $d["counter_increment"] = "none";
-      $d["counter_reset"] = "none";
-      $d["cue_after"] = "none";
-      $d["cue_before"] = "none";
-      $d["cue"] = "";
-      $d["cursor"] = "auto";
-      $d["direction"] = "ltr";
-      $d["display"] = "inline";
-      $d["elevation"] = "level";
-      $d["empty_cells"] = "show";
-      $d["float"] = "none";
-      $d["font_family"] = "serif";
-      $d["font_size"] = "medium";
-      $d["font_style"] = "normal";
-      $d["font_variant"] = "normal";
-      $d["font_weight"] = "normal";
-      $d["font"] = "";
-      $d["height"] = "auto";
-      $d["left"] = "auto";
-      $d["letter_spacing"] = "normal";
-      $d["line_height"] = "normal";
-      $d["list_style_image"] = "none";
-      $d["list_style_position"] = "outside";
-      $d["list_style_type"] = "disc";
-      $d["list_style"] = "";
-      $d["margin_right"] = "0";
-      $d["margin_left"] = "0";
-      $d["margin_top"] = "0";
-      $d["margin_bottom"] = "0";
-      $d["margin"] = "";
-      $d["max_height"] = "none";
-      $d["max_width"] = "none";
-      $d["min_height"] = "0";
-      $d["min_width"] = "0";
-      $d["orphans"] = "2";
-      $d["outline_color"] = "invert";
-      $d["outline_style"] = "none";
-      $d["outline_width"] = "medium";
-      $d["outline"] = "";
-      $d["overflow"] = "visible";
-      $d["padding_top"] = "0";
-      $d["padding_right"] = "0";
-      $d["padding_bottom"] = "0";
-      $d["padding_left"] = "0";
-      $d["padding"] = "";
-      $d["page_break_after"] = "auto";
-      $d["page_break_before"] = "auto";
-      $d["page_break_inside"] = "auto";
-      $d["pause_after"] = "0";
-      $d["pause_before"] = "0";
-      $d["pause"] = "";
-      $d["pitch_range"] = "50";
-      $d["pitch"] = "medium";
-      $d["play_during"] = "auto";
-      $d["position"] = "static";
-      $d["quotes"] = "";
-      $d["richness"] = "50";
-      $d["right"] = "auto";
-      $d["speak_header"] = "once";
-      $d["speak_numeral"] = "continuous";
-      $d["speak_punctuation"] = "none";
-      $d["speak"] = "normal";
-      $d["speech_rate"] = "medium";
-      $d["stress"] = "50";
-      $d["table_layout"] = "auto";
-      $d["text_align"] = "left";
-      $d["text_decoration"] = "none";
-      $d["text_indent"] = "0";
-      $d["text_transform"] = "none";
-      $d["top"] = "auto";
-      $d["unicode_bidi"] = "normal";
-      $d["vertical_align"] = "baseline";
-      $d["visibility"] = "visible";
-      $d["voice_family"] = "";
-      $d["volume"] = "medium";
-      $d["white_space"] = "normal";
-      $d["widows"] = "2";
-      $d["width"] = "auto";
-      $d["word_spacing"] = "normal";
-      $d["z_index"] = "auto";
-
-      // Properties that inherit by default
-      self::$_inherited = array("azimuth",
-                                 "border_collapse",
-                                 "border_spacing",
-                                 "caption_side",
-                                 "color",
-                                 "cursor",
-                                 "direction",
-                                 "elevation",
-                                 "empty_cells",
-                                 "font_family",
-                                 "font_size",
-                                 "font_style",
-                                 "font_variant",
-                                 "font_weight",
-                                 "font",
-                                 "letter_spacing",
-                                 "line_height",
-                                 "list_style_image",
-                                 "list_style_position",
-                                 "list_style_type",
-                                 "list_style",
-                                 "orphans",
-                                 "page_break_inside",
-                                 "pitch_range",
-                                 "pitch",
-                                 "quotes",
-                                 "richness",
-                                 "speak_header",
-                                 "speak_numeral",
-                                 "speak_punctuation",
-                                 "speak",
-                                 "speech_rate",
-                                 "stress",
-                                 "text_align",
-                                 "text_indent",
-                                 "text_transform",
-                                 "visibility",
-                                 "voice_family",
-                                 "volume",
-                                 "white_space",
-                                 "widows",
-                                 "word_spacing");
-    }
-
-  }
-
-  /**
-   * "Destructor": forcibly free all references held by this object
-   */
-  function dispose() {
+        // All CSS 2.1 properties, and their default values
+        $d["azimuth"] = "center";
+        $d["background_attachment"] = "scroll";
+        $d["background_color"] = "transparent";
+        $d["background_image"] = "none";
+        $d["background_position"] = "0% 0%";
+        $d["background_repeat"] = "repeat";
+        $d["background"] = "";
+        $d["border_collapse"] = "separate";
+        $d["border_color"] = "";
+        $d["border_spacing"] = "0";
+        $d["border_style"] = "";
+        $d["border_top"] = "";
+        $d["border_right"] = "";
+        $d["border_bottom"] = "";
+        $d["border_left"] = "";
+        $d["border_top_color"] = "";
+        $d["border_right_color"] = "";
+        $d["border_bottom_color"] = "";
+        $d["border_left_color"] = "";
+        $d["border_top_style"] = "none";
+        $d["border_right_style"] = "none";
+        $d["border_bottom_style"] = "none";
+        $d["border_left_style"] = "none";
+        $d["border_top_width"] = "medium";
+        $d["border_right_width"] = "medium";
+        $d["border_bottom_width"] = "medium";
+        $d["border_left_width"] = "medium";
+        $d["border_width"] = "medium";
+        $d["border"] = "";
+        $d["bottom"] = "auto";
+        $d["caption_side"] = "top";
+        $d["clear"] = "none";
+        $d["clip"] = "auto";
+        $d["color"] = "#000000";
+        $d["content"] = "normal";
+        $d["counter_increment"] = "none";
+        $d["counter_reset"] = "none";
+        $d["cue_after"] = "none";
+        $d["cue_before"] = "none";
+        $d["cue"] = "";
+        $d["cursor"] = "auto";
+        $d["direction"] = "ltr";
+        $d["display"] = "inline";
+        $d["elevation"] = "level";
+        $d["empty_cells"] = "show";
+        $d["float"] = "none";
+        $d["font_family"] = "serif";
+        $d["font_size"] = "medium";
+        $d["font_style"] = "normal";
+        $d["font_variant"] = "normal";
+        $d["font_weight"] = "normal";
+        $d["font"] = "";
+        $d["height"] = "auto";
+        $d["left"] = "auto";
+        $d["letter_spacing"] = "normal";
+        $d["line_height"] = "normal";
+        $d["list_style_image"] = "none";
+        $d["list_style_position"] = "outside";
+        $d["list_style_type"] = "disc";
+        $d["list_style"] = "";
+        $d["margin_right"] = "0";
+        $d["margin_left"] = "0";
+        $d["margin_top"] = "0";
+        $d["margin_bottom"] = "0";
+        $d["margin"] = "";
+        $d["max_height"] = "none";
+        $d["max_width"] = "none";
+        $d["min_height"] = "0";
+        $d["min_width"] = "0";
+        $d["orphans"] = "2";
+        $d["outline_color"] = "invert";
+        $d["outline_style"] = "none";
+        $d["outline_width"] = "medium";
+        $d["outline"] = "";
+        $d["overflow"] = "visible";
+        $d["padding_top"] = "0";
+        $d["padding_right"] = "0";
+        $d["padding_bottom"] = "0";
+        $d["padding_left"] = "0";
+        $d["padding"] = "";
+        $d["page_break_after"] = "auto";
+        $d["page_break_before"] = "auto";
+        $d["page_break_inside"] = "auto";
+        $d["pause_after"] = "0";
+        $d["pause_before"] = "0";
+        $d["pause"] = "";
+        $d["pitch_range"] = "50";
+        $d["pitch"] = "medium";
+        $d["play_during"] = "auto";
+        $d["position"] = "static";
+        $d["quotes"] = "";
+        $d["richness"] = "50";
+        $d["right"] = "auto";
+        $d["speak_header"] = "once";
+        $d["speak_numeral"] = "continuous";
+        $d["speak_punctuation"] = "none";
+        $d["speak"] = "normal";
+        $d["speech_rate"] = "medium";
+        $d["stress"] = "50";
+        $d["table_layout"] = "auto";
+        $d["text_align"] = "left";
+        $d["text_decoration"] = "none";
+        $d["text_indent"] = "0";
+        $d["text_transform"] = "none";
+        $d["top"] = "auto";
+        $d["unicode_bidi"] = "normal";
+        $d["vertical_align"] = "baseline";
+        $d["visibility"] = "visible";
+        $d["voice_family"] = "";
+        $d["volume"] = "medium";
+        $d["white_space"] = "normal";
+        $d["widows"] = "2";
+        $d["width"] = "auto";
+        $d["word_spacing"] = "normal";
+        $d["z_index"] = "auto";
+
+        // Properties that inherit by default
+        self::$_inherited = array("azimuth",
+                                    "border_collapse",
+                                    "border_spacing",
+                                    "caption_side",
+                                    "color",
+                                    "cursor",
+                                    "direction",
+                                    "elevation",
+                                    "empty_cells",
+                                    "font_family",
+                                    "font_size",
+                                    "font_style",
+                                    "font_variant",
+                                    "font_weight",
+                                    "font",
+                                    "letter_spacing",
+                                    "line_height",
+                                    "list_style_image",
+                                    "list_style_position",
+                                    "list_style_type",
+                                    "list_style",
+                                    "orphans",
+                                    "page_break_inside",
+                                    "pitch_range",
+                                    "pitch",
+                                    "quotes",
+                                    "richness",
+                                    "speak_header",
+                                    "speak_numeral",
+                                    "speak_punctuation",
+                                    "speak",
+                                    "speech_rate",
+                                    "stress",
+                                    "text_align",
+                                    "text_indent",
+                                    "text_transform",
+                                    "visibility",
+                                    "voice_family",
+                                    "volume",
+                                    "white_space",
+                                    "widows",
+                                    "word_spacing");
+    }
+
+    }
+
+    /**
+     * "Destructor": forcibly free all references held by this object
+     */
+    function dispose() {
     unset($this->_stylesheet);
-  }
+    }
   
-  /**
-   * returns the {@link Stylesheet} this Style is associated with.
-   *
-   * @return Stylesheet
-   */
-  function get_stylesheet() { return $this->_stylesheet; }
+    /**
+     * returns the {@link Stylesheet} this Style is associated with.
+     *
+     * @return Stylesheet
+     */
+    function get_stylesheet() { return $this->_stylesheet; }
   
-  /**
-   * Converts any CSS length value into an absolute length in points.
-   *
-   * length_in_pt() takes a single length (e.g. '1em') or an array of
-   * lengths and returns an absolute length.  If an array is passed, then
-   * the return value is the sum of all elements.
-   *
-   * If a reference size is not provided, the default font size is used
-   * ({@link Style::$default_font_size}).
-   *
-   * @param float|array $length   the length or array of lengths to resolve
-   * @param float       $ref_size  an absolute reference size to resolve percentage lengths
-   * @return float
-   */
-  function length_in_pt($length, $ref_size = null) {
+    /**
+     * Converts any CSS length value into an absolute length in points.
+     *
+     * length_in_pt() takes a single length (e.g. '1em') or an array of
+     * lengths and returns an absolute length.  If an array is passed, then
+     * the return value is the sum of all elements.
+     *
+     * If a reference size is not provided, the default font size is used
+     * ({@link Style::$default_font_size}).
+     *
+     * @param float|array $length   the length or array of lengths to resolve
+     * @param float       $ref_size  an absolute reference size to resolve percentage lengths
+     * @return float
+     */
+    function length_in_pt($length, $ref_size = null) {
 
     if ( !is_array($length) )
-      $length = array($length);
+        $length = array($length);
 
     if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+        $ref_size = self::$default_font_size;
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
+        if ( $l === "auto" )
         return "auto";
       
-      if ( $l === "none" )
+        if ( $l === "none" )
         return "none";
 
-      // Assume numeric values are already in points
-      if ( is_numeric($l) ) {
+        // Assume numeric values are already in points
+        if ( is_numeric($l) ) {
         $ret += $l;
         continue;
-      }
+        }
         
-      if ( $l === "normal" ) {
+        if ( $l === "normal" ) {
         $ret += $ref_size;
         continue;
-      }
+        }
 
-      // Border lengths
-      if ( $l === "thin" ) {
+        // Border lengths
+        if ( $l === "thin" ) {
         $ret += 0.5;
         continue;
-      }
+        }
       
-      if ( $l === "medium" ) {
+        if ( $l === "medium" ) {
         $ret += 1.5;
         continue;
-      }
+        }
     
-      if ( $l === "thick" ) {
+        if ( $l === "thick" ) {
         $ret += 2.5;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "pt"))  !== false ) {
+        if ( ($i = mb_strpos($l, "pt"))  !== false ) {
         $ret += mb_substr($l, 0, $i);
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "px"))  !== false ) {
+        if ( ($i = mb_strpos($l, "px"))  !== false ) {
         $ret += ( mb_substr($l, 0, $i)  * 72 ) / DOMPDF_DPI;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "em"))  !== false ) {
+        if ( ($i = mb_strpos($l, "em"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      // FIXME: em:ex ratio?
-      if ( ($i = mb_strpos($l, "ex"))  !== false ) {
+        // FIXME: em:ex ratio?
+        if ( ($i = mb_strpos($l, "ex"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "%"))  !== false ) {
+        if ( ($i = mb_strpos($l, "%"))  !== false ) {
         $ret += mb_substr($l, 0, $i)/100 * $ref_size;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "in")) !== false ) {
+        if ( ($i = mb_strpos($l, "in")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "cm")) !== false ) {
+        if ( ($i = mb_strpos($l, "cm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 2.54;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "mm")) !== false ) {
+        if ( ($i = mb_strpos($l, "mm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 25.4;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "pc")) !== false ) {
+        if ( ($i = mb_strpos($l, "pc")) !== false ) {
         $ret += mb_substr($l, 0, $i) / 12;
         continue;
-      }
+        }
           
-      // Bogus value
-      $ret += $ref_size;
+        // Bogus value
+        $ret += $ref_size;
     }
 
     return $ret;
-  }
+    }
 
   
-  /**
-   * Set inherited properties in this style using values in $parent
-   *
-   * @param Style $parent
-   */
-  function inherit(Style $parent) {
+    /**
+     * Set inherited properties in this style using values in $parent
+     *
+     * @param Style $parent
+     */
+    function inherit(Style $parent) {
 
     // Set parent font size
     $this->_parent_font_size = $parent->get_font_size();
     
     foreach (self::$_inherited as $prop) {
-      //inherit the !important property also.
-      //if local property is also !important, don't inherit.
-      if ( isset($parent->_props[$prop]) &&
+        //inherit the !important property also.
+        //if local property is also !important, don't inherit.
+        if ( isset($parent->_props[$prop]) &&
            ( !isset($this->_props[$prop]) ||
              ( isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]) )
-           )
-         ) {
+            )
+            ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
-		$this->_props[$prop] = $parent->_props[$prop];
-      }
+        $this->_prop_cache[$prop] = null;
+        $this->_props[$prop] = $parent->_props[$prop];
+        }
     }
       
     foreach (array_keys($this->_props) as $prop) {
-      if ( $this->_props[$prop] === "inherit" ) {
+        if ( $this->_props[$prop] === "inherit" ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //do not assign direct, but
         //implicite assignment through __set, redirect to specialized, get value with __get
@@ -532,58 +532,58 @@ 
         //Therefore do not directly assign the value without __set
         //set _important_props before that to be able to propagate.
         //see __set and __get, on all assignments clear cache!
-		//$this->_prop_cache[$prop] = null;
-		//$this->_props[$prop] = $parent->_props[$prop];
+        //$this->_prop_cache[$prop] = null;
+        //$this->_props[$prop] = $parent->_props[$prop];
         //props_set for more obvious explicite assignment not implemented, because
         //too many implicite uses.
         // $this->props_set($prop, $parent->$prop);
         $this->$prop = $parent->$prop;
-      }
+        }
     }
           
     return $this;
-  }
+    }
 
   
-  /**
-   * Override properties in this style with those in $style
-   *
-   * @param Style $style
-   */
-  function merge(Style $style) {
+    /**
+     * Override properties in this style with those in $style
+     *
+     * @param Style $style
+     */
+    function merge(Style $style) {
     //treat the !important attribute
     //if old rule has !important attribute, override with new rule only if
     //the new rule is also !important
     foreach($style->_props as $prop => $val ) {
-      if (isset($style->_important_props[$prop])) {
- 	    $this->_important_props[$prop] = true;
+        if (isset($style->_important_props[$prop])) {
+            $this->_important_props[$prop] = true;
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  } else if ( !isset($this->_important_props[$prop]) ) {
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        } else if ( !isset($this->_important_props[$prop]) ) {
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  }
- 	}
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        }
+        }
 
     if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
-  }
+        $this->__font_size_calculated = false;
+    }
 
   
-  /**
-   * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
-   * based on the provided CSS colour value.
-   *
-   * @param string $colour
-   * @return array
-   */
-  function munge_colour($colour) {
+    /**
+     * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
+     * based on the provided CSS colour value.
+     *
+     * @param string $colour
+     * @return array
+     */
+    function munge_colour($colour) {
     if ( is_array($colour) )
-      // Assume the array has the right format...
-      // FIXME: should/could verify this.
-      return $colour;
+        // Assume the array has the right format...
+        // FIXME: should/could verify this.
+        return $colour;
     
     $r = 0;
     $g = 0;
@@ -594,78 +594,78 @@ 
 
     case "maroon":
       $r = 0x80;
-      break;
+        break;
 
     case "red":
       $r = 0xff;
-      break;
+        break;
 
     case "orange":
       $r = 0xff;
-      $g = 0xa5;
-      break;
+        $g = 0xa5;
+        break;
 
     case "yellow":
       $r = 0xff;
-      $g = 0xff;
-      break;
+        $g = 0xff;
+        break;
 
     case "olive":
       $r = 0x80;
-      $g = 0x80;
-      break;
+        $g = 0x80;
+        break;
 
     case "purple":
       $r = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "fuchsia":
       $r = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "white":
       $r = $g = $b = 0xff;
-      break;
+        break;
 
     case "lime":
       $g = 0xff;
-      break;
+        break;
 
     case "green":
       $g = 0x80;
-      break;
+        break;
 
     case "navy":
       $b = 0x80;
-      break;
+        break;
 
     case "blue":
       $b = 0xff;
-      break;
+        break;
 
     case "aqua":
       $g = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "teal":
       $g = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "black":
       break;
 
     case "sliver":
       $r = $g = $b = 0xc0;
-      break;
+        break;
 
     case "gray":
     case "grey":
       $r = $g = $b = 0x80;
-      break;
+        break;
 
     case "transparent":
       return "transparent";
@@ -677,177 +677,177 @@ 
         $g = hexdec($colour[2] . $colour[2]);
         $b = hexdec($colour[3] . $colour[3]);
 
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+        } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
         // #rrggbb format
         $r = hexdec(mb_substr($colour, 1, 2));
         $g = hexdec(mb_substr($colour, 3, 2));
         $b = hexdec(mb_substr($colour, 5, 2));
 
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
+        } else if ( mb_strpos($colour, "rgb") !== false ) {
         // rgb( r,g,b ) format
         $i = mb_strpos($colour, "(");
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
         if ($i === false || $j === false)
-          return null;
+            return null;
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
         if (count($triplet) != 3)
-          return null;
+            return null;
         
         foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+            if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
             $triplet[$c] = round($triplet[$c] * 0.255);
         }
 
         list($r, $g, $b) = $triplet;
 
-      } else {
+        } else {
         // Who knows?
         return null;
-      }
+        }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+        // Clip to 0 - 1
+        $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+        $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+        $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+        break;
       
     }
     
     // Form array
     $arr = array(0 => $r / 0xff, 1 => $g / 0xff, 2 => $b / 0xff,
-                 "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
-                 "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
+                    "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
+                    "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
     return $arr;
       
-  }
+    }
 
   
-  /**
-   * Alias for {@link Style::munge_colour()}
-   *
-   * @param string $color
-   * @return array
-   */
-  function munge_color($color) { return CSS_Color::parse($color); }
-
-  /* direct access to _important_props array from outside would work only when declared as
+    /**
+     * Alias for {@link Style::munge_colour()}
+     *
+     * @param string $color
+     * @return array
+     */
+    function munge_color($color) { return CSS_Color::parse($color); }
+
+    /* direct access to _important_props array from outside would work only when declared as
    * 'var $_important_props;' instead of 'protected $_important_props;'
    * Don't call _set/__get on missing attribute. Therefore need a special access.
    * Assume that __set will be also called when this is called, so do not check validity again.
    * Only created, if !important exists -> always set true.
    */
-  function important_set($prop) {
-      $prop = str_replace("-", "_", $prop);
-      $this->_important_props[$prop] = true;
-  }
+    function important_set($prop) {
+        $prop = str_replace("-", "_", $prop);
+        $this->_important_props[$prop] = true;
+    }
 
-  function important_get($prop) {
-      isset($this->_important_props[$prop]);
-  }
+    function important_get($prop) {
+        isset($this->_important_props[$prop]);
+    }
 
-  /**
-   * PHP5 overloaded setter
-   *
-   * This function along with {@link Style::__get()} permit a user of the
-   * Style class to access any (CSS) property using the following syntax:
-   * <code>
-   *  Style->margin_top = "1em";
-   *  echo (Style->margin_top);
-   * </code>
-   *
-   * __set() automatically calls the provided set function, if one exists,
-   * otherwise it sets the property directly.  Typically, __set() is not
-   * called directly from outside of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   * For easier finding all assignments, attempted to allowing only explicite assignment:
-   * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
-   * function __set($prop, $val) {
-   *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
-   * }
-   * function props_set($prop, $val) { ... }
-   *
-   * @param string $prop  the property to set
-   * @param mixed  $val   the value of the property
-   *
-   */
-  function __set($prop, $val) {
+    /**
+     * PHP5 overloaded setter
+     *
+     * This function along with {@link Style::__get()} permit a user of the
+     * Style class to access any (CSS) property using the following syntax:
+     * <code>
+     *  Style->margin_top = "1em";
+     *  echo (Style->margin_top);
+     * </code>
+     *
+     * __set() automatically calls the provided set function, if one exists,
+     * otherwise it sets the property directly.  Typically, __set() is not
+     * called directly from outside of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     * For easier finding all assignments, attempted to allowing only explicite assignment:
+     * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
+     * function __set($prop, $val) {
+     *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
+     * }
+     * function props_set($prop, $val) { ... }
+     *
+     * @param string $prop  the property to set
+     * @param mixed  $val   the value of the property
+     *
+     */
+    function __set($prop, $val) {
     global $_dompdf_warnings;
 
     $prop = str_replace("-", "_", $prop);
     $this->_prop_cache[$prop] = null;
     
     if ( !isset(self::$_defaults[$prop]) ) {
-      $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
-      return;
+        $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
+        return;
     }
     
     if ( $prop !== "content" && is_string($val) && mb_strpos($val, "url") === false ) {
-      $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
-      $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
+        $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
+        $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
     }
     
     $method = "set_$prop";
 
     if ( method_exists($this, $method) )
-      $this->$method($val);
+        $this->$method($val);
     else
-      $this->_props[$prop] = $val;
+        $this->_props[$prop] = $val;
     
-  }
+    }
 
-  /**
-   * PHP5 overloaded getter
-   *
-   * Along with {@link Style::__set()} __get() provides access to all CSS
-   * properties directly.  Typically __get() is not called directly outside
-   * of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   *
-   * @param string $prop
-   * @return mixed
-   */
-  function __get($prop) {
+    /**
+     * PHP5 overloaded getter
+     *
+     * Along with {@link Style::__set()} __get() provides access to all CSS
+     * properties directly.  Typically __get() is not called directly outside
+     * of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     *
+     * @param string $prop
+     * @return mixed
+     */
+    function __get($prop) {
     
     if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+        throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
 
     if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+        return $this->_prop_cache[$prop];
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
     if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+        $this->_props[$prop] = self::$_defaults[$prop];
 
     if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+        return $this->_prop_cache[$prop] = $this->$method();
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
-  }
+    }
 
 
-  /**
-   * Getter for the 'font-family' CSS property.
-   *
-   * Uses the {@link Font_Metrics} class to resolve the font family into an
-   * actual font file.
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
-   * @return string
-   */
-  function get_font_family() {
+    /**
+     * Getter for the 'font-family' CSS property.
+     *
+     * Uses the {@link Font_Metrics} class to resolve the font family into an
+     * actual font file.
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
+     * @return string
+     */
+    function get_font_family() {
   
     $DEBUGCSS=DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
 	
@@ -859,16 +859,16 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
+        if ( $weight < 600 )
         $weight = "normal";
-      else
+        else
         $weight = "bold";
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
-      $weight = "bold";
+        $weight = "bold";
 
     } else {
-      $weight = "normal";
+        $weight = "normal";
 
     }
 
@@ -876,18 +876,18 @@ 
     $font_style = $this->__get("font_style");
 
     if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
+        $subtype = "bold_italic";
     else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
+        $subtype = "bold";
     else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
+        $subtype = "italic";
     else
-      $subtype = "normal";
+        $subtype = "normal";
     
     // Resolve the font family
     if ($DEBUGCSS) {
-      print "<pre>[get_font_family:";
-      print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
+        print "<pre>[get_font_family:";
+        print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
     }
     $families = explode(",", $this->_props["font_family"]);
     $families = array_map('trim',$families);
@@ -895,17 +895,17 @@ 
 
     $font = null;
     while ( current($families) ) {
-      list(,$family) = each($families);
-      //remove leading and trailing string delimiters, e.g. on font names with spaces;
-      //remove leading and trailing whitespace
-      $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
-      $font = Font_Metrics::get_font($family, $subtype);
-
-      if ( $font ) {
+        list(,$family) = each($families);
+        //remove leading and trailing string delimiters, e.g. on font names with spaces;
+        //remove leading and trailing whitespace
+        $family=trim($family," \t\n\r\x0B\"'");
+        if ($DEBUGCSS) print '('.$family.')';
+        $font = Font_Metrics::get_font($family, $subtype);
+
+        if ( $font ) {
         if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
         return $font;
-      }
+        }
     }
 
     $family = null;
@@ -913,63 +913,63 @@ 
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
-      return $font;
+        if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+        return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
     
-  }
+    }
 
-  /**
-   * Returns the resolved font size, in points
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @return float
-   */
-  function get_font_size() {
+    /**
+     * Returns the resolved font size, in points
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @return float
+     */
+    function get_font_size() {
 
     if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+        return $this->_props["font_size"];
     
     if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
+        $fs = self::$_defaults["font_size"];
     else
-      $fs = $this->_props["font_size"];
+        $fs = $this->_props["font_size"];
     
     if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+        $this->_parent_font_size = self::$default_font_size;
     
     switch ($fs) {
       
     case "xx-small":
       $fs = 3/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-small":
       $fs = 3/4 * $this->_parent_font_size;
-      break;
+        break;
 
     case "smaller":
     case "small":
       $fs = 8/9 * $this->_parent_font_size;
-      break;
+        break;
 
     case "medium":
       $fs = $this->_parent_font_size;
-      break;
+        break;
 
     case "larger":
     case "large":
       $fs = 6/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-large":
       $fs = 3/2 * $this->_parent_font_size;
-      break;
+        break;
 
     case "xx-large":
       $fs = 2/1 * $this->_parent_font_size;
-      break;
+        break;
 
     default:
       break;
@@ -977,82 +977,82 @@ 
 
     // Ensure relative sizes resolve to something
     if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else
-      $fs = $this->length_in_pt($fs);
+        $fs = $this->length_in_pt($fs);
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $fs;
     $this->__font_size_calculated = true;
     return $this->_props["font_size"];
 
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
-   * @return float
-   */
-  function get_word_spacing() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
+     * @return float
+     */
+    function get_word_spacing() {
     if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+        return 0;
 
     return $this->_props["word_spacing"];
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
-   * @return float
-   */
-  function get_line_height() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
+     * @return float
+     */
+    function get_line_height() {
     if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+        return self::$default_line_height * $this->get_font_size();
 
     if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+        return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
-  }
+    }
 
-  /**
-   * Returns the colour as an array
-   *
-   * The array has the following format:
-   * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @return array
-   */
-  function get_color() {
+    /**
+     * Returns the colour as an array
+     *
+     * The array has the following format:
+     * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @return array
+     */
+    function get_color() {
     return $this->munge_color( $this->_props["color"] );
-  }
+    }
 
-  /**
-   * Returns the background colour as an array
-   *
-   * The returned array has the same format as {@link Style::get_color()}
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @return array
-   */
-  function get_background_color() {
+    /**
+     * Returns the background colour as an array
+     *
+     * The returned array has the same format as {@link Style::get_color()}
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @return array
+     */
+    function get_background_color() {
     return $this->munge_color( $this->_props["background_color"] );
-  }
+    }
   
-  /**
-   * Returns the background position as an array
-   *
-   * The returned array has the following format:
-   * <code>array(x,y, "x" => x, "y" => y)</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @return array
-   */
-  function get_background_position() {
+    /**
+     * Returns the background position as an array
+     *
+     * The returned array has the following format:
+     * <code>array(x,y, "x" => x, "y" => y)</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @return array
+     */
+    function get_background_position() {
     
     $tmp = explode(" ", $this->_props["background_position"]);
 
@@ -1060,119 +1060,119 @@ 
 
     case "left":
       $x = "0%";
-      break;
+        break;
 
     case "right":
       $x = "100%";
-      break;
+        break;
 
     case "top":
       $y = "0%";
-      break;
+        break;
 
     case "bottom":
       $y = "100%";
-      break;
+        break;
 
     case "center":
       $x = "50%";
-      $y = "50%";
-      break;
+        $y = "50%";
+        break;
 
     default:
       $x = $tmp[0];
-      break;
+        break;
     }
 
     if ( isset($tmp[1]) ) {
 
-      switch ($tmp[1]) {
-      case "left":
+        switch ($tmp[1]) {
+        case "left":
         $x = "0%";
         break;
         
-      case "right":
+        case "right":
         $x = "100%";
         break;
         
-      case "top":
+        case "top":
         $y = "0%";
         break;
         
-      case "bottom":
+        case "bottom":
         $y = "100%";
         break;
         
-      case "center":
+        case "center":
         if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
+            $y = "50%";
         else
-          $x = "50%";
+            $x = "50%";
         break;
         
-      default:
+        default:
         $y = $tmp[1];
         break;
-      }
+        }
 
     } else {
-      $y = "50%";
+        $y = "50%";
     }
 
     if ( !isset($x) )
-      $x = "0%";
+        $x = "0%";
 
     if ( !isset($y) )
-      $y = "0%";
+        $y = "0%";
 
     return array( 0 => $x, "x" => $x,
-                  1 => $y, "y" => $y );
-  }
+                    1 => $y, "y" => $y );
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @return string
-   */
-  function get_background_attachment() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @return string
+     */
+    function get_background_attachment() {
     return $this->_props["background_attachment"];
-  }
+    }
 
 
-  /**
-   * Returns the background_repeat as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @return string
-   */
-  function get_background_repeat() {
+    /**
+     * Returns the background_repeat as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @return string
+     */
+    function get_background_repeat() {
     return $this->_props["background_repeat"];
-  }
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing, but the individual get_background_xxx)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @return string
-   */
-  function get_background() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing, but the individual get_background_xxx)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @return string
+     */
+    function get_background() {
     return $this->_props["background"];
-  }
+    }
 
 
-  /**#@+
+    /**#@+
    * Returns the border colour as an array
    *
    * See {@link Style::get_color()}
@@ -1180,112 +1180,112 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-color-properties
    * @return array
    */
-  function get_border_top_color() {
+    function get_border_top_color() {
     if ( $this->_props["border_top_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_top_color"] = null;
-      $this->_props["border_top_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_top_color"] = null;
+        $this->_props["border_top_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_top_color"]);
-  }
+    }
 
-  function get_border_right_color() {
+    function get_border_right_color() {
     if ( $this->_props["border_right_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_right_color"] = null;
-      $this->_props["border_right_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_right_color"] = null;
+        $this->_props["border_right_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_right_color"]);
-  }
+    }
 
-  function get_border_bottom_color() {
+    function get_border_bottom_color() {
     if ( $this->_props["border_bottom_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_bottom_color"] = null;
-      $this->_props["border_bottom_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_bottom_color"] = null;
+        $this->_props["border_bottom_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_bottom_color"]);;
-  }
+    }
 
-  function get_border_left_color() {
+    function get_border_left_color() {
     if ( $this->_props["border_left_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_left_color"] = null;
-      $this->_props["border_left_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_left_color"] = null;
+        $this->_props["border_left_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_left_color"]);
-  }
+    }
   
-  /**#@-*/
+    /**#@-*/
 
- /**#@+
+    /**#@+
    * Returns the border width, as it is currently stored
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-width-properties
    * @return float|string
    */
-  function get_border_top_width() {
+    function get_border_top_width() {
     $style = $this->__get("border_top_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_top_width"]) : 0;
-  }
+    }
   
-  function get_border_right_width() {
+    function get_border_right_width() {
     $style = $this->__get("border_right_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_right_width"]) : 0;
-  }
+    }
 
-  function get_border_bottom_width() {
+    function get_border_bottom_width() {
     $style = $this->__get("border_bottom_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_bottom_width"]) : 0;
-  }
+    }
 
-  function get_border_left_width() {
+    function get_border_left_width() {
     $style = $this->__get("border_left_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_left_width"]) : 0;
-  }
-  /**#@-*/
-
-  /**
-   * Return an array of all border properties.
-   *
-   * The returned array has the following structure:
-   * <code>
-   * array("top" => array("width" => [border-width],
-   *                      "style" => [border-style],
-   *                      "color" => [border-color (array)]),
-   *       "bottom" ... )
-   * </code>
-   *
-   * @return array
-   */
-  function get_border_properties() {
+    }
+    /**#@-*/
+
+    /**
+     * Return an array of all border properties.
+     *
+     * The returned array has the following structure:
+     * <code>
+     * array("top" => array("width" => [border-width],
+     *                      "style" => [border-style],
+     *                      "color" => [border-color (array)]),
+     *       "bottom" ... )
+     * </code>
+     *
+     * @return array
+     */
+    function get_border_properties() {
     return array("top" => array("width" => $this->__get("border_top_width"),
                                 "style" => $this->__get("border_top_style"),
                                 "color" => $this->__get("border_top_color")),
-                 "bottom" => array("width" => $this->__get("border_bottom_width"),
-                                   "style" => $this->__get("border_bottom_style"),
-                                   "color" => $this->__get("border_bottom_color")),
-                 "right" => array("width" => $this->__get("border_right_width"),
-                                  "style" => $this->__get("border_right_style"),
-                                  "color" => $this->__get("border_right_color")),
-                 "left" => array("width" => $this->__get("border_left_width"),
-                                 "style" => $this->__get("border_left_style"),
-                                 "color" => $this->__get("border_left_color")));
-  }
-
-  /**
-   * Return a single border property
-   *
-   * @return mixed
-   */
-  protected function _get_border($side) {
+                    "bottom" => array("width" => $this->__get("border_bottom_width"),
+                                    "style" => $this->__get("border_bottom_style"),
+                                    "color" => $this->__get("border_bottom_color")),
+                    "right" => array("width" => $this->__get("border_right_width"),
+                                    "style" => $this->__get("border_right_style"),
+                                    "color" => $this->__get("border_right_color")),
+                    "left" => array("width" => $this->__get("border_left_width"),
+                                    "style" => $this->__get("border_left_style"),
+                                    "color" => $this->__get("border_left_color")));
+    }
+
+    /**
+     * Return a single border property
+     *
+     * @return mixed
+     */
+    protected function _get_border($side) {
     $color = $this->__get("border_" . $side . "_color");
     
     return $this->__get("border_" . $side . "_width") . " " .
-      $this->__get("border_" . $side . "_style") . " " . $color["hex"];
-  }
+        $this->__get("border_" . $side . "_style") . " " . $color["hex"];
+    }
 
-  /**#@+
+    /**#@+
    * Return full border properties as a string
    *
    * Border properties are returned just as specified in CSS:
@@ -1295,28 +1295,28 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-shorthand-properties
    * @return string
    */
-  function get_border_top() { return $this->_get_border("top"); }
-  function get_border_right() { return $this->_get_border("right"); }
-  function get_border_bottom() { return $this->_get_border("bottom"); }
-  function get_border_left() { return $this->_get_border("left"); }
-  /**#@-*/
-
-
-  /**
-   * Returns border spacing as an array
-   *
-   * The array has the format (h_space,v_space)
-   *
-   * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
-   * @return array
-   */
-  function get_border_spacing() {
+    function get_border_top() { return $this->_get_border("top"); }
+    function get_border_right() { return $this->_get_border("right"); }
+    function get_border_bottom() { return $this->_get_border("bottom"); }
+    function get_border_left() { return $this->_get_border("left"); }
+    /**#@-*/
+
+
+    /**
+     * Returns border spacing as an array
+     *
+     * The array has the format (h_space,v_space)
+     *
+     * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
+     * @return array
+     */
+    function get_border_spacing() {
     return explode(" ", $this->_props["border_spacing"]);
-  }
+    }
 
 /*==============================*/
 
-  /*
+    /*
    !important attribute
    For basic functionality of the !important attribute with overloading
    of several styles of an element, changes in inherit(), merge() and _parse_properties()
@@ -1358,419 +1358,419 @@ 
    Related functionality for background, padding, margin, font, list_style
   */
 
-  /* Generalized set function for individual attribute of combined style.
+    /* Generalized set function for individual attribute of combined style.
    * With check for !important
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
-  protected function _set_style_side_type($style,$side,$type,$val,$important) {
+    protected function _set_style_side_type($style,$side,$type,$val,$important) {
     if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache[$style.'_'.$side.$type] = null;
-      if ($important) {
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style.'_'.$side.$type] = null;
+        if ($important) {
         $this->_important_props[$style.'_'.$side.$type] = true;
-      }
-      $this->_props[$style.'_'.$side.$type] = $val;
+        }
+        $this->_props[$style.'_'.$side.$type] = $val;
+    }
     }
-  }
 
-  protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
-      $this->_set_style_side_type($style,'top',$type,$top,$important);
-      $this->_set_style_side_type($style,'right',$type,$right,$important);
-      $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
-      $this->_set_style_side_type($style,'left',$type,$left,$important);
-  }
+    protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
+        $this->_set_style_side_type($style,'top',$type,$top,$important);
+        $this->_set_style_side_type($style,'right',$type,$right,$important);
+        $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
+        $this->_set_style_side_type($style,'left',$type,$left,$important);
+    }
 
-  protected function _set_style_type($style,$type,$val,$important) {
+    protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
     case 1:
       $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
+        break;
     case 2:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
+        break;
     case 3:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
+        break;
     case 4:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
+        break;
     default:
       break;
     }
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache[$style.$type] = null;
+    $this->_prop_cache[$style.$type] = null;
     $this->_props[$style.$type] = $val;
-  }
+    }
 
-  protected function _set_style_type_important($style,$type,$val) {
+    protected function _set_style_type_important($style,$type,$val) {
     $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
-  }
+    }
 
-  /* Anyway only called if _important matches and is assigned
+    /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
-  protected function _set_style_side_width_important($style,$side,$val) {
+    protected function _set_style_side_width_important($style,$side,$val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
-  }
+    }
 
-  protected function _set_style($style,$val,$important) {
+    protected function _set_style($style,$val,$important) {
     if ( !isset($this->_important_props[$style]) || $important) {
-      if ($important) {
+        if ($important) {
         $this->_important_props[$style] = true;
-      }
-      //see __set and __get, on all assignments clear cache!
-	  $this->_prop_cache[$style] = null;
-      $this->_props[$style] = $val;
+        }
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style] = null;
+        $this->_props[$style] = $val;
+    }
     }
-  }
 
-  protected function _image($val) {
+    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->_stylesheet->get_protocol() == "" ) {
+        // Resolve the url now in the context of the current stylesheet
+        $parsed_url = explode_url($val);
+        if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
         if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
-          $path = $_SERVER["DOCUMENT_ROOT"].'/';
+            $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
-          $path = $this->_stylesheet->get_base_path();
+            $path = $this->_stylesheet->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->_stylesheet->get_protocol(),
-                          $this->_stylesheet->get_host(),
-                          $this->_stylesheet->get_base_path(),
-                          $val);
-      }
+                            $this->_stylesheet->get_host(),
+                            $this->_stylesheet->get_base_path(),
+                            $val);
+        }
     }
     if ($DEBUGCSS) {
-      print "<pre>[_image\n";
-      print_r($parsed_url);
-      print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+        print "<pre>[_image\n";
+        print_r($parsed_url);
+        print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
+        print "_image]</pre>";;
     }
     return $path;
-  }
+    }
 
 /*======================*/
 
-  /**
-   * Sets colour
-   *
-   * The colour parameter can be any valid CSS colour value
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @param string $colour
-   */
-  function set_color($colour) {
+    /**
+     * Sets colour
+     *
+     * The colour parameter can be any valid CSS colour value
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @param string $colour
+     */
+    function set_color($colour) {
     $col = $this->munge_colour($colour);
 
     if ( is_null($col) )
-      $col = self::$_defaults["color"];
+        $col = self::$_defaults["color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["color"] = null;
+    $this->_prop_cache["color"] = null;
     $this->_props["color"] = $col["hex"];
-  }
+    }
 
-  /**
-   * Sets the background colour
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @param string $colour
-   */
-  function set_background_color($colour) {
+    /**
+     * Sets the background colour
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @param string $colour
+     */
+    function set_background_color($colour) {
     $col = $this->munge_colour($colour);
     if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+        $col = self::$_defaults["background_color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_color"] = null;
+    $this->_prop_cache["background_color"] = null;
     $this->_props["background_color"] = is_array($col) ? $col["hex"] : $col;
-  }
+    }
 
-  /**
-   * Set the background image url
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
-   * @param string $url
-   */
-  function set_background_image($val) {
+    /**
+     * Set the background image url
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
+     * @param string $url
+     */
+    function set_background_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_image"] = null;
+    $this->_prop_cache["background_image"] = null;
     $this->_props["background_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the background repeat
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @param string $val
-   */
-  function set_background_repeat($val) {
+    /**
+     * Sets the background repeat
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @param string $val
+     */
+    function set_background_repeat($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+        $val = self::$_defaults["background_repeat"];
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background attachment
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @param string $val
-   */
-  function set_background_attachment($val) {
+    /**
+     * Sets the background attachment
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @param string $val
+     */
+    function set_background_attachment($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+        $val = self::$_defaults["background_attachment"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_attachment"] = null;
+    $this->_prop_cache["background_attachment"] = null;
     $this->_props["background_attachment"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background position
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @param string $val
-   */
-  function set_background_position($val) {
+    /**
+     * Sets the background position
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @param string $val
+     */
+    function set_background_position($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+        $val = self::$_defaults["background_position"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_position"] = null;
+    $this->_prop_cache["background_position"] = null;
     $this->_props["background_position"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background - combined options
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @param string $val
-   */
-  function set_background($val) {
+    /**
+     * Sets the background - combined options
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @param string $val
+     */
+    function set_background($val) {
     $col = null;
     $pos = array();
     $tmp = explode(" ", $val);
     $important = isset($this->_important_props["background"]);
     foreach($tmp as $attr) {
-	  if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
-   	    $this->_set_style("background_image", $this->_image($attr), $important);
-  	  } else if ($attr === "fixed" || $attr === "scroll") {
-   	    $this->_set_style("background_attachment", $attr, $important);
-  	  } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
-   	    $this->_set_style("background_repeat", $attr, $important);
-      } else if (($col = $this->munge_color($attr)) != null ) {
-   	    $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
-      } else {
- 		$pos[] = $attr;
- 	  }
- 	}
- 	if (count($pos)) {
- 	  $this->_set_style("background_position",implode(' ',$pos), $important);
- 	}
+        if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
+            $this->_set_style("background_image", $this->_image($attr), $important);
+        } else if ($attr === "fixed" || $attr === "scroll") {
+            $this->_set_style("background_attachment", $attr, $important);
+        } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
+            $this->_set_style("background_repeat", $attr, $important);
+        } else if (($col = $this->munge_color($attr)) != null ) {
+            $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
+        } else {
+            $pos[] = $attr;
+        }
+        }
+        if (count($pos)) {
+        $this->_set_style("background_position",implode(' ',$pos), $important);
+        }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background"] = null;
- 	$this->_props["background"] = $val;
-  }
+    $this->_prop_cache["background"] = null;
+        $this->_props["background"] = $val;
+    }
 
-  /**
-   * Sets the font size
-   *
-   * $size can be any acceptable CSS size
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @param string|float $size
-   */
-  function set_font_size($size) {
+    /**
+     * Sets the font size
+     *
+     * $size can be any acceptable CSS size
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @param string|float $size
+     */
+    function set_font_size($size) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $size;
-  }
+    }
 
-  /**
-   * Sets the font style
-   *
-   * combined attributes
-   * set individual attributes also, respecting !important mark
-   * exactly this order, separate by space. Multiple fonts separated by comma:
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * Other than with border and list, existing partial attributes should
-   * reset when starting here, even when not mentioned.
-   * If individual attribute is !important and explicite or implicite replacement is not,
-   * keep individual attribute
-   *
-   * require whitespace as delimiters for single value attributes
-   * On delimiter "/" treat first as font height, second as line height
-   * treat all remaining at the end of line as font
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * missing font-size and font-family might be not allowed, but accept it here and
-   * use default (medium size, enpty font name)
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_font($val) {
+    /**
+     * Sets the font style
+     *
+     * combined attributes
+     * set individual attributes also, respecting !important mark
+     * exactly this order, separate by space. Multiple fonts separated by comma:
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * Other than with border and list, existing partial attributes should
+     * reset when starting here, even when not mentioned.
+     * If individual attribute is !important and explicite or implicite replacement is not,
+     * keep individual attribute
+     *
+     * require whitespace as delimiters for single value attributes
+     * On delimiter "/" treat first as font height, second as line height
+     * treat all remaining at the end of line as font
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * missing font-size and font-family might be not allowed, but accept it here and
+     * use default (medium size, enpty font name)
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_font($val) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font"] = null;
- 	$this->_props["font"] = $val;
+    $this->_prop_cache["font"] = null;
+        $this->_props["font"] = $val;
 
     $important = isset($this->_important_props["font"]);
 
-	if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_style", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_style", self::$_defaults["font_style"], $important);
-	}
+    if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_style", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_style", self::$_defaults["font_style"], $important);
+    }
 
-	if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_variant", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
-	}
+    if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_variant", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
+    }
 
     //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip!
-	if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
+    if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
          !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/",$match[2])
-	   ) {
-		$this->_set_style("font_weight", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
-	}
-
-	if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_size", $match[1], $important);
-		$val = $match[2];
+        ) {
+        $this->_set_style("font_weight", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
+    }
+
+    if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_size", $match[1], $important);
+        $val = $match[2];
         if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-			$this->_set_style("line_height", $match[1], $important);
-			$val = $match[2];
+            $this->_set_style("line_height", $match[1], $important);
+            $val = $match[2];
         } else {
-			$this->_set_style("line_height", self::$_defaults["line_height"], $important);
+            $this->_set_style("line_height", self::$_defaults["line_height"], $important);
         }
-	} else {
- 		$this->_set_style("font_size", self::$_defaults["font_size"], $important);
-		$this->_set_style("line_height", self::$_defaults["line_height"], $important);
-	}
-
-	if(strlen($val) != 0) {
-	  $this->_set_style("font_family", $val, $important);
-	} else {
-	  $this->_set_style("font_family", self::$_defaults["font_family"], $important);
-	}
-  }
-
-  /**#@+
+    } else {
+            $this->_set_style("font_size", self::$_defaults["font_size"], $important);
+        $this->_set_style("line_height", self::$_defaults["line_height"], $important);
+    }
+
+    if(strlen($val) != 0) {
+        $this->_set_style("font_family", $val, $important);
+    } else {
+        $this->_set_style("font_family", self::$_defaults["font_family"], $important);
+    }
+    }
+
+    /**#@+
    * Sets page break properties
    *
    * @link http://www.w3.org/TR/CSS21/page.html#page-breaks
    * @param string $break
    */
-  function set_page_break_before($break) {
+    function set_page_break_before($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_before"] = null;
+    $this->_prop_cache["page_break_before"] = null;
     $this->_props["page_break_before"] = $break;
-  }
+    }
 
-  function set_page_break_after($break) {
+    function set_page_break_after($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_after"] = null;
+    $this->_prop_cache["page_break_after"] = null;
     $this->_props["page_break_after"] = $break;
-  }
-  /**#@-*/
+    }
+    /**#@-*/
     
-  //........................................................................
+    //........................................................................
 
-  /**#@+
+    /**#@+
    * Sets the margin size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#margin-properties
    * @param $val
    */
-  function set_margin_top($val) {
+    function set_margin_top($val) {
     $this->_set_style_side_width_important('margin','top',$val);
-  }
+    }
 
-  function set_margin_right($val) {
+    function set_margin_right($val) {
     $this->_set_style_side_width_important('margin','right',$val);
-  }
+    }
 
-  function set_margin_bottom($val) {
+    function set_margin_bottom($val) {
     $this->_set_style_side_width_important('margin','bottom',$val);
-  }
+    }
 
-  function set_margin_left($val) {
+    function set_margin_left($val) {
     $this->_set_style_side_width_important('margin','left',$val);
-  }
+    }
   
-  function set_margin($val) {
+    function set_margin($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('margin','',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
-  /**#@+
+    /**#@+
    * Sets the padding size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#padding-properties
    * @param $val
    */
-  function set_padding_top($val) {
+    function set_padding_top($val) {
     $this->_set_style_side_width_important('padding','top',$val);
-  }
+    }
 
-  function set_padding_right($val) {
+    function set_padding_right($val) {
     $this->_set_style_side_width_important('padding','right',$val);
-  }
+    }
 
-  function set_padding_bottom($val) {
+    function set_padding_bottom($val) {
     $this->_set_style_side_width_important('padding','bottom',$val);
-  }
+    }
 
-  function set_padding_left($val) {
+    function set_padding_left($val) {
     $this->_set_style_side_width_important('padding','left',$val);
-  }
+    }
 
-  function set_padding($val) {
+    function set_padding($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('padding','',$val);
-  }
-  /**#@-*/
-
-  /**
-   * Sets a single border
-   *
-   * @param string $side
-   * @param string $border_spec  ([width] [style] [color])
-   */
-  protected function _set_border($side, $border_spec, $important) {
+    }
+    /**#@-*/
+
+    /**
+     * Sets a single border
+     *
+     * @param string $side
+     * @param string $border_spec  ([width] [style] [color])
+     */
+    protected function _set_border($side, $border_spec, $important) {
     $border_spec = str_replace(",", " ", $border_spec);
     $arr = explode(" ", $border_spec);
 
@@ -1783,155 +1783,155 @@ 
     $this->_set_style_side_type('border',$side,'_color',self::$_defaults['border_'.$side.'_color'],$important);
 
     foreach ($arr as $value) {
-      $value = trim($value);
-      if ( in_array($value, self::$BORDER_STYLES) ) {
+        $value = trim($value);
+        if ( in_array($value, self::$BORDER_STYLES) ) {
         $this->_set_style_side_type('border',$side,'_style',$value,$important);
 
-      } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
+        } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
         $this->_set_style_side_type('border',$side,'_width',$value,$important);
 
-      } else {
+        } else {
         // must be colour
         $this->_set_style_side_type('border',$side,'_color',$value,$important);
-      }
+        }
     }
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache['border_'.$side] = null;
+    $this->_prop_cache['border_'.$side] = null;
     $this->_props['border_'.$side] = $border_spec;
-  }
+    }
 
-  /**#@+
+    /**#@+
    * Sets the border styles
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-properties
    * @param string $val
    */
-  function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
-  function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
-  function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
-  function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
+    function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
+    function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
+    function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
+    function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
 
-  function set_border($val) {
+    function set_border($val) {
     $important = isset($this->_important_props["border"]);
     $this->_set_border("top", $val, $important);
     $this->_set_border("right", $val, $important);
     $this->_set_border("bottom", $val, $important);
     $this->_set_border("left", $val, $important);
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border"] = null;
+    $this->_prop_cache["border"] = null;
     $this->_props["border"] = $val;
-  }
+    }
 
-  function set_border_width($val) {
+    function set_border_width($val) {
     $this->_set_style_type_important('border','_width',$val);
-  }
+    }
 
-  function set_border_color($val) {
+    function set_border_color($val) {
     $this->_set_style_type_important('border','_color',$val);
-  }
+    }
 
-  function set_border_style($val) {
+    function set_border_style($val) {
     $this->_set_style_type_important('border','_style',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
 
-  /**
-   * Sets the border spacing
-   *
-   * @link http://www.w3.org/TR/CSS21/box.html#border-properties
-   * @param float $val
-   */
-  function set_border_spacing($val) {
+    /**
+     * Sets the border spacing
+     *
+     * @link http://www.w3.org/TR/CSS21/box.html#border-properties
+     * @param float $val
+     */
+    function set_border_spacing($val) {
 
     $arr = explode(" ", $val);
 
     if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+        $arr[1] = $arr[0];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border_spacing"] = null;
+    $this->_prop_cache["border_spacing"] = null;
     $this->_props["border_spacing"] = $arr[0] . " " . $arr[1];
-  }
+    }
 
-  /**
-   * Sets the list style image
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
-   * @param $val
-   */
-  function set_list_style_image($val) {
+    /**
+     * Sets the list style image
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
+     * @param $val
+     */
+    function set_list_style_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style_image"] = null;
+    $this->_prop_cache["list_style_image"] = null;
     $this->_props["list_style_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the list style
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_list_style($val) {
+    /**
+     * Sets the list style
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_list_style($val) {
     $important = isset($this->_important_props["list_style"]);
     $arr = explode(" ", str_replace(",", " ", $val));
 
     static $types = array("disc", "circle", "square", "decimal",
-                   "decimal-leading-zero", "lower-roman",
-                   "upper-roman", "lower-greek", "lower-latin",
-                   "upper-latin", "armenian", "georgian",
-                   "lower-alpha", "upper-alpha", "hebrew",
-                   "cjk-ideographic", "hiragana", "katakana",
-                   "hiragana-iroha", "katakana-iroha", "none");
+                    "decimal-leading-zero", "lower-roman",
+                    "upper-roman", "lower-greek", "lower-latin",
+                    "upper-latin", "armenian", "georgian",
+                    "lower-alpha", "upper-alpha", "hebrew",
+                    "cjk-ideographic", "hiragana", "katakana",
+                    "hiragana-iroha", "katakana-iroha", "none");
 
     static $positions = array("inside", "outside");
 
     foreach ($arr as $value) {
-      /* http://www.w3.org/TR/CSS21/generate.html#list-style
+        /* http://www.w3.org/TR/CSS21/generate.html#list-style
        * A value of 'none' for the 'list-style' property sets both 'list-style-type' and 'list-style-image' to 'none'
        */
-      if ($value === "none") {
-   	    $this->_set_style("list_style_type", $value, $important);
-   	    $this->_set_style("list_style_image", $value, $important);
+        if ($value === "none") {
+            $this->_set_style("list_style_type", $value, $important);
+            $this->_set_style("list_style_image", $value, $important);
         continue;
-      }
+        }
 
-      //On setting or merging or inheriting list_style_image as well as list_style_type,
-      //and url exists, then url has precedence, otherwise fall back to list_style_type
-      //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
-      //Internet Explorer 7/8 and dompdf is right.
+        //On setting or merging or inheriting list_style_image as well as list_style_type,
+        //and url exists, then url has precedence, otherwise fall back to list_style_type
+        //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
+        //Internet Explorer 7/8 and dompdf is right.
        
-	  if (mb_substr($value, 0, 3) === "url") {
-   	    $this->_set_style("list_style_image", $this->_image($value), $important);
+        if (mb_substr($value, 0, 3) === "url") {
+            $this->_set_style("list_style_image", $this->_image($value), $important);
         continue;
-      }
+        }
 
-      if ( in_array($value, $types) ) {
-   	    $this->_set_style("list_style_type", $value, $important);
-      } else if ( in_array($value, $positions) ) {
-   	    $this->_set_style("list_style_position", $value, $important);
-      }
+        if ( in_array($value, $types) ) {
+            $this->_set_style("list_style_type", $value, $important);
+        } else if ( in_array($value, $positions) ) {
+            $this->_set_style("list_style_position", $value, $important);
+        }
     }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style"] = null;
- 	$this->_props["list_style"] = $val;
-  }
+    $this->_prop_cache["list_style"] = null;
+        $this->_props["list_style"] = $val;
+    }
 
-  /**
-   * Generate a string representation of the Style
-   *
-   * This dumps the entire property array into a string via print_r.  Useful
-   * for debugging.
-   *
-   * @return string
-   */
- /*DEBUGCSS print: see below additional debugging util*/
-  function __toString() {
+    /**
+     * Generate a string representation of the Style
+     *
+     * This dumps the entire property array into a string via print_r.  Useful
+     * for debugging.
+     *
+     * @return string
+     */
+    /*DEBUGCSS print: see below additional debugging util*/
+    function __toString() {
     return print_r(array_merge(array("parent_font_size" => $this->_parent_font_size),
-                               $this->_props), true);
-  }
+                                $this->_props), true);
+    }
 
 /*DEBUGCSS*/  function debug_print()
 /*DEBUGCSS*/  {

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

Indentation +37 added lines, -38 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_cell_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,54 +46,54 @@ 
  */
 class Table_Cell_Frame_Decorator extends Block_Frame_Decorator {
   
-  protected $_resolved_borders;
-  protected $_content_height;
+    protected $_resolved_borders;
+    protected $_content_height;
   
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_resolved_borders = array();
     $this->_content_height = 0;    
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_resolved_borders = array();
     $this->_content_height = 0;
     $this->_frame->reset();    
-  }
+    }
   
-  function get_content_height() {
+    function get_content_height() {
     return $this->_content_height;
-  }
+    }
 
-  function set_content_height($height) {
+    function set_content_height($height) {
     $this->_content_height = $height;
-  }
+    }
   
-  function set_cell_height($height) {
+    function set_cell_height($height) {
     $style = $this->get_style();
     $v_space = $style->length_in_pt(array($style->margin_top,
-                                          $style->padding_top,
-                                          $style->border_top_width,
-                                          $style->border_bottom_width,
-                                          $style->padding_bottom,
-                                          $style->margin_bottom),
+                                            $style->padding_top,
+                                            $style->border_top_width,
+                                            $style->border_bottom_width,
+                                            $style->padding_bottom,
+                                            $style->margin_bottom),
                                     $style->width);
 
     $new_height = $height - $v_space;    
     $style->height = $new_height;
 
     if ( $new_height > $this->_content_height ) {
-      // Adjust our vertical alignment
-      $valign = $style->vertical_align;
+        // Adjust our vertical alignment
+        $valign = $style->vertical_align;
 
-      switch ($valign) {
+        switch ($valign) {
 
-      default:
+        default:
       case "baseline":
         // FIXME: this isn't right
         
@@ -102,34 +101,34 @@ 
         // Don't need to do anything
         return;
 
-      case "middle":
+        case "middle":
         $delta = ($new_height - $this->_content_height) / 2;
         break;
 
-      case "bottom":
+        case "bottom":
         $delta = $new_height - $this->_content_height;
         break;
 
-      }
+        }
    
-      // Move our children
-      foreach ( $this->get_lines() as $i => $line ) {
+        // Move our children
+        foreach ( $this->get_lines() as $i => $line ) {
         foreach ( $line["frames"] as $frame )
-          $frame->set_position( null, $frame->get_position("y") + $delta );
-      }
-   }
+            $frame->set_position( null, $frame->get_position("y") + $delta );
+        }
+    }
         
-  }
+    }
 
-  function set_resolved_border($side, $border_spec) {    
+    function set_resolved_border($side, $border_spec) {    
     $this->_resolved_borders[$side] = $border_spec;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_resolved_border($side) {
+    function get_resolved_border($side) {
     return $this->_resolved_borders[$side];
-  }
+    }
 
-  function get_resolved_borders() { return $this->_resolved_borders; }
+    function get_resolved_borders() { return $this->_resolved_borders; }
 }

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

Indentation +80 added lines, -81 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: renderer.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -50,38 +49,38 @@ 
  */
 class Renderer extends Abstract_Renderer {
 
-  /**
-   * Array of renderers for specific frame types
-   *
-   * @var array
-   */
-  protected $_renderers;
+    /**
+     * Array of renderers for specific frame types
+     *
+     * @var array
+     */
+    protected $_renderers;
     
-  /**
-   * Cache of the callbacks array
-   * 
-   * @var array
-   */
-  private $_callbacks;
+    /**
+     * Cache of the callbacks array
+     * 
+     * @var array
+     */
+    private $_callbacks;
     
-  /**
-   * Advance the canvas to the next page
-   */  
-  function new_page() {
+    /**
+     * Advance the canvas to the next page
+     */  
+    function new_page() {
     $this->_canvas->new_page();
-  }
-
-  /**
-   * Render frames recursively
-   *
-   * @param Frame $frame the frame to render
-   */
-  function render(Frame $frame) {    
+    }
+
+    /**
+     * Render frames recursively
+     *
+     * @param Frame $frame the frame to render
+     */
+    function render(Frame $frame) {    
     global $_dompdf_debug;
 
     if ( $_dompdf_debug ) {
-      echo $frame;
-      flush();
+        echo $frame;
+        flush();
     }
 
     $display = $frame->get_style()->display;
@@ -97,46 +96,46 @@ 
     case "table-footer-group":
     case "inline-table":
       $this->_render_frame("block", $frame);
-      break;
+        break;
 
     case "inline":
       if ( $frame->get_node()->nodeName === "#text" )
         $this->_render_frame("text", $frame);
-      else
+        else
         $this->_render_frame("inline", $frame);
-      break;
+        break;
 
     case "table-cell":
       $this->_render_frame("table-cell", $frame);
-      break;
+        break;
 
     case "-dompdf-list-bullet":
       $this->_render_frame("list-bullet", $frame);
-      break;
+        break;
 
     case "-dompdf-image":
       $this->_render_frame("image", $frame);
-      break;
+        break;
       
     case "none":
       $node = $frame->get_node();
           
-      if ( $node->nodeName === "script" ) {
+        if ( $node->nodeName === "script" ) {
         if ( $node->getAttribute("type") === "text/php" ||
              $node->getAttribute("language") === "php" ) {
-          // Evaluate embedded php scripts
-          $this->_render_frame("php", $frame);
+            // Evaluate embedded php scripts
+            $this->_render_frame("php", $frame);
         }
         
         elseif ( $node->getAttribute("type") === "text/javascript" ||
              $node->getAttribute("language") === "javascript" ) {
-          // Insert JavaScript
-          $this->_render_frame("javascript", $frame);
+            // Insert JavaScript
+            $this->_render_frame("javascript", $frame);
+        }
         }
-      }
 
-      // Don't render children, so skip to next iter
-      return;
+        // Don't render children, so skip to next iter
+        return;
       
     default:
       break;
@@ -147,90 +146,90 @@ 
     $this->_check_callbacks("begin_frame", $frame);
     
     foreach ($frame->get_children() as $child)
-      $this->render($child);
+        $this->render($child);
 
     // Check for end frame callback
     $this->_check_callbacks("end_frame", $frame);
     
-  }
+    }
   
-  /**
-   * Check for callbacks that need to be performed when a given event
-   * gets triggered on a frame
-   *
-   * @param string $event the type of event
-   * @param Frame $frame the frame that event is triggered on
-   */
-  protected function _check_callbacks($event, $frame) {
+    /**
+     * Check for callbacks that need to be performed when a given event
+     * gets triggered on a frame
+     *
+     * @param string $event the type of event
+     * @param Frame $frame the frame that event is triggered on
+     */
+    protected function _check_callbacks($event, $frame) {
     if (!isset($this->_callbacks)) {
-      $this->_callbacks = $this->_dompdf->get_callbacks();
+        $this->_callbacks = $this->_dompdf->get_callbacks();
     }
     
     if (is_array($this->_callbacks) && isset($this->_callbacks[$event])) {
-      $info = array(0 => $this->_canvas, "canvas" => $this->_canvas,
+        $info = array(0 => $this->_canvas, "canvas" => $this->_canvas,
                     1 => $frame, "frame" => $frame);
-      $fs = $this->_callbacks[$event];
-      foreach ($fs as $f) {
+        $fs = $this->_callbacks[$event];
+        foreach ($fs as $f) {
         if (is_callable($f)) {
-          if (is_array($f)) {
+            if (is_array($f)) {
             $f[0]->$f[1]($info);
-          } else {
+            } else {
             $f($info);
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
-
-  /**
-   * Render a single frame
-   *
-   * Creates Renderer objects on demand
-   *
-   * @param string $type type of renderer to use
-   * @param Frame $frame the frame to render
-   */
-  protected function _render_frame($type, $frame) {
+
+    /**
+     * Render a single frame
+     *
+     * Creates Renderer objects on demand
+     *
+     * @param string $type type of renderer to use
+     * @param Frame $frame the frame to render
+     */
+    protected function _render_frame($type, $frame) {
 
     if ( !isset($this->_renderers[$type]) ) {
       
-      switch ($type) {
-      case "block":
+        switch ($type) {
+        case "block":
         $this->_renderers["block"] = new Block_Renderer($this->_dompdf);
         break;
 
-      case "inline":
+        case "inline":
         $this->_renderers["inline"] = new Inline_Renderer($this->_dompdf);
         break;
 
-      case "text":
+        case "text":
         $this->_renderers["text"] = new Text_Renderer($this->_dompdf);
         break;
 
-      case "image":
+        case "image":
         $this->_renderers["image"] = new Image_Renderer($this->_dompdf);
         break;
       
-      case "table-cell":
+        case "table-cell":
         $this->_renderers["table-cell"] = new Table_Cell_Renderer($this->_dompdf);
         break;
 
-      case "list-bullet":
+        case "list-bullet":
         $this->_renderers["list-bullet"] = new List_Bullet_Renderer($this->_dompdf);
         break;
 
-      case "php":
+        case "php":
         $this->_renderers["php"] = new PHP_Evaluator($this->_canvas);
         break;
 
-      case "javascript":
+        case "javascript":
         $this->_renderers["javascript"] = new Javascript_Embedder($this->_dompdf);
         break;
         
-      }
+        }
     }
     
     $this->_renderers[$type]->render($frame);
 
-  }
+    }
 }

main/inc/lib/pdf.lib.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries