chamilo / chamilo-lms

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

Indentation +486 added lines, -486 removed lines

@@ -61,170 +61,170 @@ 
  */
 class PDFLib_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
-  /**
-   * Fudge factor to adjust reported font heights
-   *
-   * CPDF reports larger font heights than PDFLib.  This factor
-   * adjusts the height reported by get_font_height().
-   *
-   * @var float
-   */
-  const FONT_HEIGHT_SCALE = 1.2;
-
-  /**
-   * Whether to create PDFs in memory or on disk
-   *
-   * @var bool
-   */
-  static $IN_MEMORY = true;
-
-  /**
-   * Instance of PDFLib class
-   *
-   * @var PDFlib
-   */
-  private $_pdf;
-
-  /**
-   * Name of temporary file used for PDFs created on disk
-   *
-   * @var string
-   */
-  private $_file;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var height
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Cache of image handles
-   *
-   * @var array
-   */
-  private $_imgs;
-
-  /**
-   * Cache of font handles
-   *
-   * @var array
-   */
-  private $_fonts;
-
-  /**
-   * List of objects (templates) to add to multiple pages
-   *
-   * @var array
-   */
-  private $_objs;
-
-  /**
-   * Current page number
-   *
-   * @var int
-   */
-  private $_page_number;
-
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accesing after rendering is initially complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Fudge factor to adjust reported font heights
+     *
+     * CPDF reports larger font heights than PDFLib.  This factor
+     * adjusts the height reported by get_font_height().
+     *
+     * @var float
+     */
+    const FONT_HEIGHT_SCALE = 1.2;
+
+    /**
+     * Whether to create PDFs in memory or on disk
+     *
+     * @var bool
+     */
+    static $IN_MEMORY = true;
+
+    /**
+     * Instance of PDFLib class
+     *
+     * @var PDFlib
+     */
+    private $_pdf;
+
+    /**
+     * Name of temporary file used for PDFs created on disk
+     *
+     * @var string
+     */
+    private $_file;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var height
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Cache of image handles
+     *
+     * @var array
+     */
+    private $_imgs;
+
+    /**
+     * Cache of font handles
+     *
+     * @var array
+     */
+    private $_fonts;
+
+    /**
+     * List of objects (templates) to add to multiple pages
+     *
+     * @var array
+     */
+    private $_objs;
+
+    /**
+     * Current page number
+     *
+     * @var int
+     */
+    private $_page_number;
+
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accesing after rendering is initially complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+        $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
-      $size = self::$PAPER_SIZES["letter"];
+        $size = self::$PAPER_SIZES["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
     $this->_width = $size[2] - $size[0];
     $this->_height= $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+    if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
 
-	$this->_pdf->set_parameter("textformat", "utf8");
+    $this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
     if ( function_exists("date_default_timezone_get") ) {
-      $tz = @date_default_timezone_get();
-      date_default_timezone_set("UTC");
-      $this->_pdf->set_info("Date", date("Y-m-d"));
-      date_default_timezone_set($tz);
+        $tz = @date_default_timezone_get();
+        date_default_timezone_set("UTC");
+        $this->_pdf->set_info("Date", date("Y-m-d"));
+        date_default_timezone_set($tz);
     } else {
-      $this->_pdf->set_info("Date", date("Y-m-d"));
+        $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
     if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+        $this->_pdf->begin_document("","");
     else {
-      $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+        $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
+        $this->_pdf->begin_document($this->_file,"");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -239,155 +239,155 @@ 
     // Set up font paths
     $families = Font_Metrics::get_font_families();
     foreach ($families as $family => $files) {
-      foreach ($files as $style => $file) {
+        foreach ($files as $style => $file) {
         $face = basename($file);
 
         // Prefer ttfs to afms
         if ( file_exists($file.".ttf") ) {
-          $outline = "$file.ttf";
-          $afm = null;
+            $outline = "$file.ttf";
+            $afm = null;
 
         } else if ( file_exists($file .".TTF") ) {
-          $outline = "$file.TTF";
-          $afm = null;
+            $outline = "$file.TTF";
+            $afm = null;
 
         } else if ( file_exists($file . ".pfb") ) {
-          $outline = "$file.pfb";
+            $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+            if ( file_exists($file . ".afm") )
             $afm = "$file.afm";
 
         } else if ( file_exists($file . ".PFB") ) {
-          $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+            $outline = "$file.PFB";
+            if ( file_exists($file . ".AFM") )
             $afm = "$file.AFM";
         } else
-          continue;
+            continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
         if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
-      }
+            $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
+    }
     }
-  }
 
-  /**
-   * Close the pdf
-   */
-  protected function _close() {
+    /**
+     * Close the pdf
+     */
+    protected function _close() {
     $this->_place_objects();
 
     // Close all pages
     $this->_pdf->suspend_page("");
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
-      $this->_pdf->end_page_ext("");
+        $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->end_page_ext("");
     }
 
     $this->_pdf->end_document("");
-  }
-
-
-  /**
-   * Returns the PDFLib instance
-   *
-   * @return PDFLib
-   */
-  function get_pdflib() { return $this->_pdf; }
-
-  /**
-   * Add meta information to the PDF
-   *
-   * @param string $label  label of the value (Creator, Producter, etc.)
-   * @param string $value  the text to set
-   */
-  function add_info($label, $value) {
+    }
+
+
+    /**
+     * Returns the PDFLib instance
+     *
+     * @return PDFLib
+     */
+    function get_pdflib() { return $this->_pdf; }
+
+    /**
+     * Add meta information to the PDF
+     *
+     * @param string $label  label of the value (Creator, Producter, etc.)
+     * @param string $value  the text to set
+     */
+    function add_info($label, $value) {
     $this->_pdf->set_info($label, $value);
-  }
+    }
   
-  /**
-   * Opens a new 'object' (template in PDFLib-speak)
-   *
-   * While an object is open, all drawing actions are recorded to the
-   * object instead of being drawn on the current page.  Objects can
-   * be added later to a specific page or to several pages.
-   *
-   * The return value is an integer ID for the new object.
-   *
-   * @see PDFLib_Adapter::close_object()
-   * @see PDFLib_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    /**
+     * Opens a new 'object' (template in PDFLib-speak)
+     *
+     * While an object is open, all drawing actions are recorded to the
+     * object instead of being drawn on the current page.  Objects can
+     * be added later to a specific page or to several pages.
+     *
+     * The return value is an integer ID for the new object.
+     *
+     * @see PDFLib_Adapter::close_object()
+     * @see PDFLib_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $this->_pdf->suspend_page("");
     $ret = $this->_pdf->begin_template($this->_width, $this->_height);
     $this->_pdf->save();
     $this->_objs[$ret] = array("start_page" => $this->_page_number);
     return $ret;
-  }
-
-  /**
-   * Reopen an existing object (NOT IMPLEMENTED)
-   *
-   * PDFLib does not seem to support reopening templates.
-   *
-   * @param int $object the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopen an existing object (NOT IMPLEMENTED)
+     *
+     * PDFLib does not seem to support reopening templates.
+     *
+     * @param int $object the ID of a previously opened object
+     */
+    function reopen_object($object) {
     throw new DOMPDF_Exception("PDFLib does not support reopening objects.");
-  }
-
-  /**
-   * Close the current template
-   *
-   * @see PDFLib_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Close the current template
+     *
+     * @see PDFLib_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restore();
     $this->_pdf->end_template();
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
-
-  /**
-   * Adds the specified object to the document
-   *
-   * $where can be one of:
-   * - 'add' add to current page only
-   * - 'all' add to every page from the current one onwards
-   * - 'odd' add to all odd numbered pages from now on
-   * - 'even' add to all even numbered pages from now on
-   * - 'next' add the object to the next page only
-   * - 'nextodd' add to all odd numbered pages from the next one
-   * - 'nexteven' add to all even numbered pages from the next one
-   *
-   * @param int $object the object handle returned by open_object()
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds the specified object to the document
+     *
+     * $where can be one of:
+     * - 'add' add to current page only
+     * - 'all' add to every page from the current one onwards
+     * - 'odd' add to all odd numbered pages from now on
+     * - 'even' add to all even numbered pages from now on
+     * - 'next' add the object to the next page only
+     * - 'nextodd' add to all odd numbered pages from the next one
+     * - 'nexteven' add to all even numbered pages from the next one
+     *
+     * @param int $object the object handle returned by open_object()
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
 
     if ( mb_strpos($where, "next") !== false ) {
-      $this->_objs[$object]["start_page"]++;
-      $where = str_replace("next", "", $where);
-      if ( $where == "" )
+        $this->_objs[$object]["start_page"]++;
+        $where = str_replace("next", "", $where);
+        if ( $where == "" )
         $where = "add";
     }
 
     $this->_objs[$object]["where"] = $where;
-  }
-
-  /**
-   * Stops the specified template from appearing in the document.
-   *
-   * The object will stop being displayed on the page following the
-   * current one.
-   *
-   * @param int $object
-   */
-  function stop_object($object) {
+    }
+
+    /**
+     * Stops the specified template from appearing in the document.
+     *
+     * The object will stop being displayed on the page following the
+     * current one.
+     *
+     * @param int $object
+     */
+    function stop_object($object) {
 
     if ( !isset($this->_objs[$object]) )
-      return;
+        return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -397,74 +397,74 @@ 
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
           ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+        $this->_pdf->fit_image($object,0,0,"");
 
     unset($this->_objs[$object]);
-  }
+    }
 
-  /**
-   * Add all active objects to the current page
-   */
-  protected function _place_objects() {
+    /**
+     * Add all active objects to the current page
+     */
+    protected function _place_objects() {
 
     foreach ( $this->_objs as $obj => $props ) {
-      $start = $props["start_page"];
-      $where = $props["where"];
+        $start = $props["start_page"];
+        $where = $props["where"];
 
-      // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+        // Place the object on this page if required
+        if ( $this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
             ($where === "all")) ) {
         $this->_pdf->fit_image($obj,0,0,"");
-      }
+        }
     }
 
-  }
+    }
 
-  function get_width() { return $this->_width; }
+    function get_width() { return $this->_width; }
 
-  function get_height() { return $this->_height; }
+    function get_height() { return $this->_height; }
 
-  function get_page_number() { return $this->_page_number; }
+    function get_page_number() { return $this->_page_number; }
 
-  function get_page_count() { return $this->_page_count; }
+    function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+    function set_page_number($num) { $this->_page_number = (int)$num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+    function set_page_count($count) { $this->_page_count = (int)$count; }
 
 
-  /**
-   * Sets the line style
-   *
-   * @param float width
-   * @param string corner
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    /**
+     * Sets the line style
+     *
+     * @param float width
+     * @param string corner
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
 
     if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+        $dash[] = $dash[0];
 
     if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+        $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
     else
-      $this->_pdf->setdash(0,0);
+        $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
     case "miter":
       $this->_pdf->setlinejoin(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinejoin(1);
-      break;
+        break;
 
     case "bevel":
       $this->_pdf->setlinejoin(2);
-      break;
+        break;
 
     default:
       break;
@@ -473,15 +473,15 @@ 
     switch ( $cap ) {
     case "butt":
       $this->_pdf->setlinecap(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinecap(1);
-      break;
+        break;
 
     case "square":
       $this->_pdf->setlinecap(2);
-      break;
+        break;
 
     default:
       break;
@@ -489,69 +489,69 @@ 
 
     $this->_pdf->setlinewidth($width);
 
-  }
+    }
 
-  /**
-   * Sets the line color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the line color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_stroke_color($color) {
     if($this->_last_stroke_color == $color)
-    	return;
+        return;
 
     $this->_last_stroke_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
-  }
-
-  /**
-   * Sets the fill color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_fill_color($color) {
+    }
+
+    /**
+     * Sets the fill color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_fill_color($color) {
     if($this->_last_fill_color == $color)
-    	return;
+        return;
 
     $this->_last_fill_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
-  }
+    }
 
-  /**
-   * Loads a specific font and stores the corresponding descriptor.
-   *
-   * @param string $font
-   * @return int the font descriptor for the font
-   */
-  protected function _load_font($font, $encoding = null, $options = "") {
+    /**
+     * Loads a specific font and stores the corresponding descriptor.
+     *
+     * @param string $font
+     * @return int the font descriptor for the font
+     */
+    protected function _load_font($font, $encoding = null, $options = "") {
 
     // Check if the font is a native PDF font
     // Embed non-native fonts
     $native_fonts = array("courier", "courier-bold", "courier-oblique", "courier-boldoblique",
-                          "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
-                          "times-roman", "times-bold", "times-italic", "times-bolditalic",
-                          "symbol", "zapfdinbats");
+                            "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
+                            "times-roman", "times-bold", "times-italic", "times-bolditalic",
+                            "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
     if ( in_array($test, $native_fonts) ) {
-      $font = basename($font);
+        $font = basename($font);
 
     } else {
-      // Embed non-native fonts
-      $options .= " embedding=true";
+        // Embed non-native fonts
+        $options .= " embedding=true";
     }
 
     if ( is_null($encoding) ) {
 
-      // Unicode encoding is only available for the commerical
-      // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        // Unicode encoding is only available for the commerical
+        // version of PDFlib and not PDFlib-Lite
+        if ( defined("DOMPDF_PDFLIB_LICENSE") )
         $encoding = "unicode";
-      else
+        else
         $encoding = "auto";
 
     }
@@ -559,28 +559,28 @@ 
     $key = $font .":". $encoding .":". $options;
 
     if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
+        return $this->_fonts[$key];
 
     else {
 
-      $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
-      return $this->_fonts[$key];
+        $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
+        return $this->_fonts[$key];
 
     }
 
-  }
+    }
 
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
 
-  //........................................................................
+    //........................................................................
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
     $this->_set_line_style($width, "butt", "", $style);
     $this->_set_stroke_color($color);
 
@@ -590,11 +590,11 @@ 
     $this->_pdf->moveto($x1,$y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
 
@@ -602,93 +602,93 @@ 
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_set_fill_color($color);
 
     $y1 = $this->y($y1) - $h;
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->fill();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
     $this->_pdf->moveto($x,$y);
 
     while (count($points) > 1) {
-      $y = $this->y(array_pop($points));
-      $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+        $y = $this->y(array_pop($points));
+        $x = array_pop($points);
+        $this->_pdf->lineto($x,$y);
     }
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->closepath_stroke();
-  }
+        $this->_pdf->closepath_stroke();
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->stroke();
+        $this->_pdf->stroke();
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     $w = (int)$w;
     $h = (int)$h;
 
     $img_type = strtolower($img_type);
 
     if ( $img_type === "jpg" )
-      $img_type = "jpeg";
+        $img_type = "jpeg";
 
     if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+        $img = $this->_imgs[$img_url];
 
     else {
 
-      $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
+        $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
 
     $y = $this->y($y) - $h;
     $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -701,72 +701,72 @@ 
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     $this->_pdf->add_nameddest($anchorname,"");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
     if ( strpos($url, '#') === 0 ) {
-      // Local link
-      $name = substr($url,1);
-      if ( $name )
+        // Local link
+        $name = substr($url,1);
+        if ( $name )
         $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
     } else {
 
-      list($proto, $host, $path, $file) = explode_url($url);
+        list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+        if ( $proto == "" || $proto === "file://" )
         return; // Local links are not allowed
-      $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+        $url = build_url($proto, $host, $path, $file);
+        $url = '{' . rawurldecode($url) . '}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
-      $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+        $action = $this->_pdf->create_action("URI", "url=" . $url);
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
     $num_spaces = mb_substr_count($text," ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
 
     $fh = $this->_load_font($font);
 
@@ -777,54 +777,54 @@ 
 
     // $desc is usually < 0,
     return self::FONT_HEIGHT_SCALE * $size * ($asc - $desc);
-  }
-
-  //........................................................................
-
-  /**
-   * Writes text at the specified x and y coordinates on every page
-   *
-   * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
-   * with their current values.
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
-   */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
+    }
+
+    //........................................................................
+
+    /**
+     * Writes text at the specified x and y coordinates on every page
+     *
+     * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
+     * with their current values.
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle angle to write the text at, measured CW starting from the x-axis
+     */
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
+                        $adjust = 0, $angle = 0,  $blend = "Normal", $opacity = 1.0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
-  }
-
-  //........................................................................
-
-  /**
-   * Processes a script on every page
-   *
-   * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
-   *
-   * This function can be used to add page numbers to all pages
-   * after the first one, for example.
-   *
-   * @param string $code the script code
-   * @param string $type the language type for script
-   */
-  function page_script($code, $type = "text/php") {
+    }
+
+    //........................................................................
+
+    /**
+     * Processes a script on every page
+     *
+     * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
+     *
+     * This function can be used to add page numbers to all pages
+     * after the first one, for example.
+     *
+     * @param string $code the script code
+     * @param string $type the language type for script
+     */
+    function page_script($code, $type = "text/php") {
     $_t = "script";
     $this->_page_text[] = compact("_t", "code", "type");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function new_page() {
+    function new_page() {
 
     // Add objects to the current page
     $this->_place_objects();
@@ -833,69 +833,69 @@ 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
     $this->_page_number = ++$this->_page_count;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add text to each page after rendering is complete
-   */
-  protected function _add_page_text() {
+    /**
+     * Add text to each page after rendering is complete
+     */
+    protected function _add_page_text() {
 
     if ( !count($this->_page_text) )
-      return;
+        return;
 
     $this->_pdf->suspend_page("");
 
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->resume_page("pagenumber=$p");
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
 
         case "text":
           $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $this->_page_count), $text);
-          $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+                                array($p, $this->_page_count), $text);
+            $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+            break;
 
         case "script":
           if (!$eval) {
             $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->_pdf->suspend_page("");
+        $this->_pdf->suspend_page("");
     }
 
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function stream($filename, $options = null) {
+    function stream($filename, $options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY ) {
-      $data = $this->_pdf->get_buffer();
-      $size = strlen($data);
+        $data = $this->_pdf->get_buffer();
+        $size = strlen($data);
 
     } else
-      $size = filesize($this->_file);
+        $size = filesize($this->_file);
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -908,63 +908,63 @@ 
     //header("Content-length: " . $size);
 
     if ( self::$IN_MEMORY )
-      echo $data;
+        echo $data;
 
     else {
 
-      // Chunked readfile()
-      $chunk = (1 << 21); // 2 MB
-      $fh = fopen($this->_file, "rb");
-      if ( !$fh )
+        // Chunked readfile()
+        $chunk = (1 << 21); // 2 MB
+        $fh = fopen($this->_file, "rb");
+        if ( !$fh )
         throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
 
-      while ( !feof($fh) )
+        while ( !feof($fh) )
         echo fread($fh,$chunk);
-      fclose($fh);
+        fclose($fh);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     flush();
 
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function output($options = null) {
+    function output($options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
+        $data = $this->_pdf->get_buffer();
 
     else {
-      $data = file_get_contents($this->_file);
+        $data = file_get_contents($this->_file);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     return $data;
-  }
+    }
 }
 
 // Workaround for idiotic limitation on statics...

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

Indentation +288 added lines, -289 removed lines

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

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

Indentation +344 added lines, -345 removed lines

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

main/inc/lib/phpdocx/pdf/include/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*/  {