chamilo / chamilo-lms

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

Indentation +16 added lines, -17 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,11 +52,11 @@ 
  */
 class List_Bullet_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
     
     // Bullets & friends are positioned an absolute distance to the left of
     // the content edge of their parent element
@@ -75,19 +74,19 @@ 
     // This is a bit of a hack...
     $n = $this->_frame->get_next_sibling();
     if ( $n ) {
-      $style = $n->get_style();
-      $y += $style->length_in_pt( array($style->margin_top, $style->padding_top),
-                                  $n->get_containing_block("w") );
+        $style = $n->get_style();
+        $y += $style->length_in_pt( array($style->margin_top, $style->padding_top),
+                                    $n->get_containing_block("w") );
     }
 
-	// Now the position is the left top of the block which should be marked with the bullet.
-	// We tried to find out the y of the start of the first text character within the block.
-	// But the top margin/padding does not fit, neither from this nor from the next sibling
-	// The "bit of a hack" above does not work also.
+    // Now the position is the left top of the block which should be marked with the bullet.
+    // We tried to find out the y of the start of the first text character within the block.
+    // But the top margin/padding does not fit, neither from this nor from the next sibling
+    // The "bit of a hack" above does not work also.
 	
-	// Instead let's position the bullet vertically centered to the block which should be marked.
-	// But for get_next_sibling() the get_containing_block is all zero, and for find_block_parent()
-	// the get_containing_block is paper width and the entire list as height.
+    // Instead let's position the bullet vertically centered to the block which should be marked.
+    // But for get_next_sibling() the get_containing_block is all zero, and for find_block_parent()
+    // the get_containing_block is paper width and the entire list as height.
 	
     // if ($p) {
     //   //$cb = $n->get_containing_block();
@@ -96,8 +95,8 @@ 
     // print 'cb:'.$cb["x"].':'.$cb["y"].':'.$cb["w"].':'.$cb["h"].':';
     // }	 
 
-	// Todo:
-	// For now give up on the above. Use Guesswork with font y-pos in the middle of the line spacing
+    // Todo:
+    // For now give up on the above. Use Guesswork with font y-pos in the middle of the line spacing
 
     $style = $p->get_style();
     $font_size = $style->get_font_size();
@@ -107,5 +106,5 @@ 
     //Position is x-end y-top of character position of the bullet.    
     $this->_frame->set_position($x, $y);
     
-  }
+    }
 }

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

Indentation +13 added lines, -14 removed lines

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

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

Indentation +172 added lines, -173 removed lines

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

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

Indentation +6 added lines, -7 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: list_bullet_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,20 +46,20 @@ 
  */
 class List_Bullet_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
     
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
 
     $style->width = $this->_frame->get_width();
     $this->_frame->position();
 
     if ( $style->list_style_position === "inside" ) {
-      $p = $this->_frame->find_block_parent();
-      $p->add_frame_to_line($this->_frame);
+        $p = $this->_frame->find_block_parent();
+        $p->add_frame_to_line($this->_frame);
     }
 
-  }
+    }
 }

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

Indentation +34 added lines, -35 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_cell_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,25 +46,25 @@ 
  */
 class Table_Cell_Renderer extends Block_Renderer {
 
-  //........................................................................
+    //........................................................................
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
     $style = $frame->get_style();
     list($x, $y, $w, $h) = $frame->get_padding_box();
 
     // Draw our background, border and content
     if ( ($bg = $style->background_color) !== "transparent" ) {
-      list($x, $y, $w, $h) = $frame->get_padding_box();
-      $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color );
+        list($x, $y, $w, $h) = $frame->get_padding_box();
+        $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color );
     }
 
     if ( ($url = $style->background_image) && $url !== "none" ) {
-      $this->_background_image($url, $x, $y, $w, $h, $style);
+        $this->_background_image($url, $x, $y, $w, $h, $style);
     }
 
     if ( $style->border_collapse !== "collapse" ) {
-      $this->_render_border($frame, "bevel");
-      return;
+        $this->_render_border($frame, "bevel");
+        return;
     }
 
     // The collapsed case is slightly complicated...
@@ -83,35 +82,35 @@ 
     // then we draw its bottom border.  Otherwise the next row down will
     // draw its top border instead.
     if (in_array( $num_rows - 1, $cells["rows"])) {
-      $draw_bottom = true;
-      $bottom_row = $cellmap->get_row($num_rows - 1);
+        $draw_bottom = true;
+        $bottom_row = $cellmap->get_row($num_rows - 1);
     } else
-      $draw_bottom = false;
+        $draw_bottom = false;
 
 
     // Draw the horizontal borders
     foreach ( $cells["columns"] as $j ) {
-      $bp = $cellmap->get_border_properties($i, $j);
+        $bp = $cellmap->get_border_properties($i, $j);
 
-      $y = $top_row["y"] - $bp["top"]["width"] / 2;
+        $y = $top_row["y"] - $bp["top"]["width"] / 2;
 
-      $col = $cellmap->get_column($j);
-      $x = $col["x"] - $bp["left"]["width"] / 2;
-      $w = $col["used-width"] + ($bp["left"]["width"] + $bp["right"]["width"] ) / 2;
+        $col = $cellmap->get_column($j);
+        $x = $col["x"] - $bp["left"]["width"] / 2;
+        $w = $col["used-width"] + ($bp["left"]["width"] + $bp["right"]["width"] ) / 2;
 
-      if ( $bp["top"]["style"] !== "none" && $bp["top"]["width"] > 0 ) {
+        if ( $bp["top"]["style"] !== "none" && $bp["top"]["width"] > 0 ) {
         $widths = array($bp["top"]["width"],
                         $bp["right"]["width"],
                         $bp["bottom"]["width"],
                         $bp["left"]["width"]);
         $method = "_border_". $bp["top"]["style"];
         $this->$method($x, $y, $w, $bp["top"]["color"], $widths, "top", "square");
-      }
+        }
 
-      if ( $draw_bottom ) {
+        if ( $draw_bottom ) {
         $bp = $cellmap->get_border_properties($num_rows - 1, $j);
         if ( $bp["bottom"]["style"] === "none" || $bp["bottom"]["width"] <= 0 )
-          continue;
+            continue;
 
         $y = $bottom_row["y"] + $bottom_row["height"] + $bp["bottom"]["width"] / 2;
 
@@ -122,7 +121,7 @@ 
         $method = "_border_". $bp["bottom"]["style"];
         $this->$method($x, $y, $w, $bp["bottom"]["color"], $widths, "bottom", "square");
 
-      }
+        }
     }
 
     $j = $cells["columns"][0];
@@ -130,23 +129,23 @@ 
     $left_col = $cellmap->get_column($j);
 
     if (in_array($num_cols - 1, $cells["columns"])) {
-      $draw_right = true;
-      $right_col = $cellmap->get_column($num_cols - 1);
+        $draw_right = true;
+        $right_col = $cellmap->get_column($num_cols - 1);
     } else
-      $draw_right = false;
+        $draw_right = false;
 
     // Draw the vertical borders
     foreach ( $cells["rows"] as $i ) {
-      $bp = $cellmap->get_border_properties($i, $j);
+        $bp = $cellmap->get_border_properties($i, $j);
 
-      $x = $left_col["x"] - $bp["left"]["width"] / 2;
+        $x = $left_col["x"] - $bp["left"]["width"] / 2;
 
-      $row = $cellmap->get_row($i);
+        $row = $cellmap->get_row($i);
 
-      $y = $row["y"] - $bp["top"]["width"] / 2;
-      $h = $row["height"] + ($bp["top"]["width"] + $bp["bottom"]["width"])/ 2;
+        $y = $row["y"] - $bp["top"]["width"] / 2;
+        $h = $row["height"] + ($bp["top"]["width"] + $bp["bottom"]["width"])/ 2;
 
-      if ( $bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0 ) {
+        if ( $bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0 ) {
 
         $widths = array($bp["top"]["width"],
                         $bp["right"]["width"],
@@ -155,12 +154,12 @@ 
 
         $method = "_border_" . $bp["left"]["style"];
         $this->$method($x, $y, $h, $bp["left"]["color"], $widths, "left", "square");
-      }
+        }
 
-      if ( $draw_right ) {
+        if ( $draw_right ) {
         $bp = $cellmap->get_border_properties($i, $num_cols - 1);
         if ( $bp["right"]["style"] === "none" || $bp["right"]["width"] <= 0 )
-          continue;
+            continue;
 
         $x = $right_col["x"] + $right_col["used-width"] + $bp["right"]["width"] / 2;
 
@@ -172,8 +171,8 @@ 
         $method = "_border_" . $bp["right"]["style"];
         $this->$method($x, $y, $h, $bp["right"]["color"], $widths, "right", "square");
 
-      }
+        }
     }
 
-  }
+    }
 }

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

Indentation +188 added lines, -189 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,73 +45,73 @@ 
  * @package dompdf
  */
 class Table_Frame_Decorator extends Frame_Decorator {
-  static $VALID_CHILDREN = array("table-row-group",
-                                 "table-row",
-                                 "table-header-group",
-                                 "table-footer-group",
-                                 "table-column",
-                                 "table-column-group",
-                                 "table-caption",
-                                 "table-cell");
-
-  static $ROW_GROUPS = array('table-row-group',
-                             'table-header-group',
-                             'table-footer-group');
-
-  /**
-   * The Cellmap object for this table.  The cellmap maps table cells
-   * to rows and columns, and aids in calculating column widths.
-   *
-   * @var Cellmap
-   */
-  protected $_cellmap;
-
-  /**
-   * The minimum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_min_width;
-
-  /**
-   * The maximum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_max_width;
-
-  /**
-   * Table header rows.  Each table header is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_headers;
-
-  /**
-   * Table footer rows.  Each table footer is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_footers;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    static $VALID_CHILDREN = array("table-row-group",
+                                    "table-row",
+                                    "table-header-group",
+                                    "table-footer-group",
+                                    "table-column",
+                                    "table-column-group",
+                                    "table-caption",
+                                    "table-cell");
+
+    static $ROW_GROUPS = array('table-row-group',
+                                'table-header-group',
+                                'table-footer-group');
+
+    /**
+     * The Cellmap object for this table.  The cellmap maps table cells
+     * to rows and columns, and aids in calculating column widths.
+     *
+     * @var Cellmap
+     */
+    protected $_cellmap;
+
+    /**
+     * The minimum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_min_width;
+
+    /**
+     * The maximum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_max_width;
+
+    /**
+     * Table header rows.  Each table header is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_headers;
+
+    /**
+     * Table footer rows.  Each table footer is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_footers;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_cellmap = new Cellmap($this);
     $this->_min_width = null;
     $this->_max_width = null;
     $this->_headers = array();
     $this->_footers = array();
-  }
+    }
 
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_cellmap->reset();
     $this->_min_width = null;
@@ -120,22 +119,22 @@ 
     $this->_headers = array();
     $this->_footers = array();
     $this->_reflower->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split the table at $row.  $row and all subsequent rows will be
-   * added to the clone.  This method is overidden in order to remove
-   * frames from the cellmap properly.
-   *
-   * @param Frame $row
-   */
-  function split($child = null) {
+    /**
+     * split the table at $row.  $row and all subsequent rows will be
+     * added to the clone.  This method is overidden in order to remove
+     * frames from the cellmap properly.
+     *
+     * @param Frame $row
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
     // If $child is a header or if it is the first non-header row, do
@@ -143,200 +142,200 @@ 
     if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
          !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
 
-      $first_header = null;
+        $first_header = null;
 
-      // Insert copies of the table headers before $child
-      foreach ($this->_headers as $header) {
+        // Insert copies of the table headers before $child
+        foreach ($this->_headers as $header) {
 
         $new_header = $header->deep_copy();
 
         if ( is_null($first_header) )
-          $first_header = $new_header;
+            $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
-      }
+        }
 
-      parent::split($first_header);
+        parent::split($first_header);
 
     } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
 
-      // Individual rows should have already been handled
-      parent::split($child);
+        // Individual rows should have already been handled
+        parent::split($child);
 
     } else {
 
-      $iter = $child;
+        $iter = $child;
 
-      while ($iter) {
+        while ($iter) {
         $this->_cellmap->remove_row($iter);
         $iter = $iter->get_next_sibling();
-      }
+        }
 
-      parent::split($child);
+        parent::split($child);
+    }
     }
-  }
 
-  /**
-   * Static function to locate the parent table of a frame
-   *
-   * @param Frame $frame
-   * @return Frame the table that is an ancestor of $frame
-   */
-  static function find_parent_table(Frame $frame) {
+    /**
+     * Static function to locate the parent table of a frame
+     *
+     * @param Frame $frame
+     * @return Frame the table that is an ancestor of $frame
+     */
+    static function find_parent_table(Frame $frame) {
 
     while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+        if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
 
     return $frame;
-  }
-
-  /**
-   * Return this table's Cellmap
-   *
-   * @return Cellmap
-   */
-  function get_cellmap() { return $this->_cellmap; }
-
-  /**
-   * Return the minimum width of this table
-   *
-   * @return float
-   */
-  function get_min_width() { return $this->_min_width; }
-
-  /**
-   * Return the maximum width of this table
-   *
-   * @return float
-   */
-  function get_max_width() { return $this->_max_width; }
-
-  /**
-   * Set the minimum width of the table
-   *
-   * @param float $width the new minimum width
-   */
-  function set_min_width($width) { $this->_min_width = $width; }
-
-  /**
-   * Set the maximum width of the table
-   *
-   * @param float $width the new maximum width
-   */
-  function set_max_width($width) { $this->_max_width = $width; }
-
-  /**
-   * Restructure tree so that the table has the correct structure.
-   * Invalid children (i.e. all non-table-rows) are moved below the
-   * table.
-   */
-  function normalise() {
+    }
+
+    /**
+     * Return this table's Cellmap
+     *
+     * @return Cellmap
+     */
+    function get_cellmap() { return $this->_cellmap; }
+
+    /**
+     * Return the minimum width of this table
+     *
+     * @return float
+     */
+    function get_min_width() { return $this->_min_width; }
+
+    /**
+     * Return the maximum width of this table
+     *
+     * @return float
+     */
+    function get_max_width() { return $this->_max_width; }
+
+    /**
+     * Set the minimum width of the table
+     *
+     * @param float $width the new minimum width
+     */
+    function set_min_width($width) { $this->_min_width = $width; }
+
+    /**
+     * Set the maximum width of the table
+     *
+     * @param float $width the new maximum width
+     */
+    function set_max_width($width) { $this->_max_width = $width; }
+
+    /**
+     * Restructure tree so that the table has the correct structure.
+     * Invalid children (i.e. all non-table-rows) are moved below the
+     * table.
+     */
+    function normalise() {
 
     // Store frames generated by invalid tags and move them outside the table
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
     while ( $iter ) {
-      $child = $iter;
-      $iter = $iter->get_next_sibling();
+        $child = $iter;
+        $iter = $iter->get_next_sibling();
 
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+        if ( $anon_row ) {
 
         if ( $display === "table-row" ) {
-          // Add the previous anonymous row
-          $this->insert_child_before($table_row, $child);
+            // Add the previous anonymous row
+            $this->insert_child_before($table_row, $child);
 
-          $table_row->normalise();
-          $child->normalise();
-          $anon_row = false;
-          continue;
+            $table_row->normalise();
+            $child->normalise();
+            $anon_row = false;
+            continue;
         }
 
         // add the child to the anonymous row
         $table_row->append_child($child);
         continue;
 
-      } else {
+        } else {
 
         if ( $display === "table-row" ) {
-          $child->normalise();
-          continue;
+            $child->normalise();
+            continue;
         }
 
         if ( $display === "table-cell") {
-          // Create an anonymous table row
-          $tr = $this->get_node()->ownerDocument->createElement("tr");
+            // Create an anonymous table row
+            $tr = $this->get_node()->ownerDocument->createElement("tr");
 
-          $frame = new Frame($tr);
+            $frame = new Frame($tr);
 
-          $css = $this->get_style()->get_stylesheet();
-          $style = $css->create_style();
-          $style->inherit($this->get_style());
+            $css = $this->get_style()->get_stylesheet();
+            $style = $css->create_style();
+            $style->inherit($this->get_style());
 
-          // Lookup styles for tr tags.  If the user wants styles to work
-          // better, they should make the tr explicit... I'm not going to
-          // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+            // Lookup styles for tr tags.  If the user wants styles to work
+            // better, they should make the tr explicit... I'm not going to
+            // try to guess what they intended.
+            if ( $tr_style = $css->lookup("tr") )
             $style->merge($tr_style);
 
-          // Okay, I have absolutely no idea why I need this clone here, but
-          // if it's omitted, php (as of 2004-07-28) segfaults.
-          $frame->set_style(clone $style);
-          $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
-          $table_row->set_root($this->_root);
+            // Okay, I have absolutely no idea why I need this clone here, but
+            // if it's omitted, php (as of 2004-07-28) segfaults.
+            $frame->set_style(clone $style);
+            $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
+            $table_row->set_root($this->_root);
 
-          // Add the cell to the row
-          $table_row->append_child($child);
+            // Add the cell to the row
+            $table_row->append_child($child);
 
-          $anon_row = true;
-          continue;
+            $anon_row = true;
+            continue;
         }
 
         if ( !in_array($display, self::$VALID_CHILDREN) ) {
-          $erroneous_frames[] = $child;
-          continue;
+            $erroneous_frames[] = $child;
+            continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+            if ( $grandchild->get_style()->display === "table-row" )
             $grandchild->normalise();
         }
 
         // Add headers and footers
         if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
+            $this->_headers[] = $child;
 
         else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
-      }
+            $this->_footers[] = $child;
+        }
     }
 
     if ( $anon_row ) {
-      // Add the row to the table
-      $this->_frame->append_child($table_row);
-      $table_row->normalise();
-      $this->_cellmap->add_row();
+        // Add the row to the table
+        $this->_frame->append_child($table_row);
+        $table_row->normalise();
+        $this->_cellmap->add_row();
     }
 
     foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+        $this->move_after($frame);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Moves the specified frame and it's corresponding node outside of
-   * the table.
-   *
-   * @param Frame $frame the frame to move
-   */
-  function move_after(Frame $frame) {
+    /**
+     * Moves the specified frame and it's corresponding node outside of
+     * the table.
+     *
+     * @param Frame $frame the frame to move
+     */
+    function move_after(Frame $frame) {
     $this->get_parent()->insert_child_after($frame, $this);
-  }
+    }
 
 }

main/inc/lib/phpdocx/pdf/include/null_frame_decorator.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_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,13 +46,13 @@ 
  */
 class Null_Frame_Decorator extends Frame_Decorator {
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $style = $this->_frame->get_style();
     $style->width = 0;
     $style->height = 0;
     $style->margin = 0;
     $style->padding = 0;
-  }
+    }
 
 }

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

Indentation +271 added lines, -271 removed lines

@@ -60,57 +60,57 @@ 
  */
 abstract class Abstract_Renderer {
 
-  /**
-   * Rendering backend
-   *
-   * @var Canvas
-   */
-  protected $_canvas;
-
-  /**
-   * Current dompdf instance
-   *
-   * @var DOMPDF
-   */
-  protected $_dompdf;
+    /**
+     * Rendering backend
+     *
+     * @var Canvas
+     */
+    protected $_canvas;
+
+    /**
+     * Current dompdf instance
+     *
+     * @var DOMPDF
+     */
+    protected $_dompdf;
   
-  /**
-   * Class constructor
-   *
-   * @param DOMPDF $dompdf The current dompdf instance
-   */
-  function __construct(DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param DOMPDF $dompdf The current dompdf instance
+     */
+    function __construct(DOMPDF $dompdf) {
     $this->_dompdf = $dompdf;
     $this->_canvas = $dompdf->get_canvas();
-  }
+    }
   
-  /**
-   * Render a frame.
-   *
-   * Specialized in child classes
-   *
-   * @param Frame $frame The frame to render
-   */
-  abstract function render(Frame $frame);
-
-  //........................................................................
-
-  /**
-   * Render a background image over a rectangular area
-   *
-   * @param string $img      The background image to load
-   * @param float  $x        The left edge of the rectangular area
-   * @param float  $y        The top edge of the rectangular area
-   * @param float  $width    The width of the rectangular area
-   * @param float  $height   The height of the rectangular area
-   * @param Style  $style    The associated Style object
-   */
-  protected function _background_image($url, $x, $y, $width, $height, $style) {
+    /**
+     * Render a frame.
+     *
+     * Specialized in child classes
+     *
+     * @param Frame $frame The frame to render
+     */
+    abstract function render(Frame $frame);
+
+    //........................................................................
+
+    /**
+     * Render a background image over a rectangular area
+     *
+     * @param string $img      The background image to load
+     * @param float  $x        The left edge of the rectangular area
+     * @param float  $y        The top edge of the rectangular area
+     * @param float  $width    The width of the rectangular area
+     * @param float  $height   The height of the rectangular area
+     * @param Style  $style    The associated Style object
+     */
+    protected function _background_image($url, $x, $y, $width, $height, $style) {
     $sheet = $style->get_stylesheet();
 
     // Skip degenerate cases
     if ( $width == 0 || $height == 0 )
-      return;
+        return;
 
     //debugpng
     if (DEBUGPNG) print '[_background_image '.$url.']';
@@ -122,24 +122,24 @@ 
 
     // Bail if the image is no good
     if ( $img === DOMPDF_LIB_DIR . "/res/broken_image.png" )
-      return;
+        return;
 
-	//Try to optimize away reading and composing of same background multiple times
-	//Postponing read with imagecreatefrom   ...()
-	//final composition paramters and name not known yet
-	//Therefore read dimension directly from file, instead of creating gd object first.
+    //Try to optimize away reading and composing of same background multiple times
+    //Postponing read with imagecreatefrom   ...()
+    //final composition paramters and name not known yet
+    //Therefore read dimension directly from file, instead of creating gd object first.
     //$img_w = imagesx($src); $img_h = imagesy($src);
 
     list($img_w, $img_h) = getimagesize($img);
     if (!isset($img_w) || $img_w == 0 || !isset($img_h) || $img_h == 0) {
-      return;
+        return;
     }
 
     $repeat = $style->background_repeat;
     $bg_color = $style->background_color;
 
-	//Increase background resolution and dependent box size according to image resolution to be placed in
-	//Then image can be copied in without resize
+    //Increase background resolution and dependent box size according to image resolution to be placed in
+    //Then image can be copied in without resize
     $bg_width = round((float)($width * DOMPDF_DPI) / 72);
     $bg_height = round((float)($height * DOMPDF_DPI) / 72);
 
@@ -148,27 +148,27 @@ 
     list($bg_x, $bg_y) = $style->background_position;
 
     if ( is_percent($bg_x) ) {
-      // The point $bg_x % from the left edge of the image is placed
-      // $bg_x % from the left edge of the background rectangle
-      $p = ((float)$bg_x)/100.0;
-      $x1 = $p * $img_w;
-      $x2 = $p * $bg_width;
+        // The point $bg_x % from the left edge of the image is placed
+        // $bg_x % from the left edge of the background rectangle
+        $p = ((float)$bg_x)/100.0;
+        $x1 = $p * $img_w;
+        $x2 = $p * $bg_width;
 
-      $bg_x = round($x2 - $x1);
+        $bg_x = round($x2 - $x1);
     } else {
-      $bg_x = round((float)($style->length_in_pt($bg_x)*DOMPDF_DPI) / 72);
+        $bg_x = round((float)($style->length_in_pt($bg_x)*DOMPDF_DPI) / 72);
     }
 
     if ( is_percent($bg_y) ) {
-      // The point $bg_y % from the left edge of the image is placed
-      // $bg_y % from the left edge of the background rectangle
-      $p = ((float)$bg_y)/100.0;
-      $y1 = $p * $img_h;
-      $y2 = $p * $bg_height;
+        // The point $bg_y % from the left edge of the image is placed
+        // $bg_y % from the left edge of the background rectangle
+        $p = ((float)$bg_y)/100.0;
+        $y1 = $p * $img_h;
+        $y2 = $p * $bg_height;
 
-      $bg_y = round($y2 - $y1);
+        $bg_y = round($y2 - $y1);
     } else {
-      $bg_y = round((float)($style->length_in_pt($bg_y)*DOMPDF_DPI) / 72);
+        $bg_y = round((float)($style->length_in_pt($bg_y)*DOMPDF_DPI) / 72);
     }
 
     //clip background to the image area on partial repeat. Nothing to do if img off area
@@ -177,79 +177,79 @@ 
     //Handle x/y Dimensions separately
 
     if ( $repeat !== "repeat" && $repeat !== "repeat-x" ) {
-      //No repeat x
-      if ($bg_x < 0) {
+        //No repeat x
+        if ($bg_x < 0) {
         $bg_width = $img_w + $bg_x;
-      } else {
+        } else {
         $x += ($bg_x * 72)/DOMPDF_DPI;
         $bg_width = $bg_width - $bg_x;
         if ($bg_width > $img_w) {
-          $bg_width = $img_w;
+            $bg_width = $img_w;
         }
         $bg_x = 0;
-      }
-      if ($bg_width <= 0) {
-      	return;
-      }
-      $width = (float)($bg_width * 72)/DOMPDF_DPI;
+        }
+        if ($bg_width <= 0) {
+            return;
+        }
+        $width = (float)($bg_width * 72)/DOMPDF_DPI;
     } else {
-      //repeat x
-      if ($bg_x < 0) {
+        //repeat x
+        if ($bg_x < 0) {
         $bg_x = - ((-$bg_x) % $img_w);
-      } else {
+        } else {
         $bg_x = $bg_x % $img_w;
         if ($bg_x > 0) {
-          $bg_x -= $img_w;
+            $bg_x -= $img_w;
+        }
         }
-      }
     }
 
     if ( $repeat !== "repeat" && $repeat !== "repeat-y" ) {
-      //no repeat y
-      if ($bg_y < 0) {
+        //no repeat y
+        if ($bg_y < 0) {
         $bg_height = $img_h + $bg_y;
-      } else {
+        } else {
         $y += ($bg_y * 72)/DOMPDF_DPI;
         $bg_height = $bg_height - $bg_y;
         if ($bg_height > $img_h) {
-          $bg_height = $img_h;
+            $bg_height = $img_h;
         }
         $bg_y = 0;
-      }
-      if ($bg_height <= 0) {
-      	return;
-      }
-      $height = (float)($bg_height * 72)/DOMPDF_DPI;
+        }
+        if ($bg_height <= 0) {
+            return;
+        }
+        $height = (float)($bg_height * 72)/DOMPDF_DPI;
     } else {
-      //repeat y
-      if ($bg_y < 0) {
+        //repeat y
+        if ($bg_y < 0) {
         $bg_y = - ((-$bg_y) % $img_h);
-      } else {
+        } else {
         $bg_y = $bg_y % $img_h;
         if ($bg_y > 0) {
-          $bg_y -= $img_h;
+            $bg_y -= $img_h;
+        }
         }
-      }
     }
 
     //Optimization, if repeat has no effect
     if ( $repeat === "repeat" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height ) {
-      $repeat = "repeat-x";
+        $repeat = "repeat-x";
     }
     if ( $repeat === "repeat" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width ) {
-      $repeat = "repeat-y";
+        $repeat = "repeat-y";
     }
     if ( ($repeat === "repeat-x" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width) ||
          ($repeat === "repeat-y" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height) ) {
-      $repeat = "no-repeat";
+        $repeat = "no-repeat";
     }
 
-	//Use filename as indicator only
-	//different names for different variants to have different copies in the pdf
-	//This is not dependent of background color of box! .'_'.(is_array($bg_color) ? $bg_color["hex"] : $bg_color)
-	//Note: Here, bg_* are the start values, not end values after going through the tile loops!
+    //Use filename as indicator only
+    //different names for different variants to have different copies in the pdf
+    //This is not dependent of background color of box! .'_'.(is_array($bg_color) ? $bg_color["hex"] : $bg_color)
+    //Note: Here, bg_* are the start values, not end values after going through the tile loops!
 
-	$filedummy = $img;
+    $filedummy = $img;
 
     /* 
     //Make shorter strings with limited characters for cache associative array index - needed?	
@@ -274,50 +274,50 @@ 
 	}
 	*/
 	
-	$filedummy .= '_'.$bg_width.'_'.$bg_height.'_'.$bg_x.'_'.$bg_y.'_'.$repeat;
+    $filedummy .= '_'.$bg_width.'_'.$bg_height.'_'.$bg_x.'_'.$bg_y.'_'.$repeat;
     //debugpng
     //if (DEBUGPNG) print '<pre>[_background_image name '.$filedummy.']</pre>';
 
     //Optimization to avoid multiple times rendering the same image.
     //If check functions are existing and identical image already cached,
     //then skip creation of duplicate, because it is not needed by addImagePng
-	if ( method_exists( $this->_canvas, "get_cpdf" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "image_iscached" ) &&
-	     $this->_canvas->get_cpdf()->image_iscached($filedummy) ) {
-	  $bg = null;
+    if ( method_exists( $this->_canvas, "get_cpdf" ) &&
+         method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) &&
+         method_exists( $this->_canvas->get_cpdf(), "image_iscached" ) &&
+         $this->_canvas->get_cpdf()->image_iscached($filedummy) ) {
+        $bg = null;
 
-      //debugpng
-      //if (DEBUGPNG) print '[_background_image skip]';
+        //debugpng
+        //if (DEBUGPNG) print '[_background_image skip]';
 
-	} else {
+    } else {
 
     // Create a new image to fit over the background rectangle
     $bg = imagecreatetruecolor($bg_width, $bg_height);
     //anyway default
-	//imagealphablending($img, true);
+    //imagealphablending($img, true);
 
     switch (strtolower($ext)) {
 
     case "png":
       $src = imagecreatefrompng($img);
-      break;
+        break;
 
     case "jpg":
     case "jpeg":
       $src = imagecreatefromjpeg($img);
-      break;
+        break;
 
     case "gif":
       $src = imagecreatefromgif($img);
-      break;
+        break;
 
     default:
       return; // Unsupported image type
     }
 
     if ($src == null) {
-      return;
+        return;
     }
 
     //Background color if box is not relevant here
@@ -325,34 +325,34 @@ 
     //Transparent image: The image controls the transparency and lets shine through whatever background.
     //However on transparent imaage preset the composed image with the transparency color,
     //to keep the transparency when copying over the non transparent parts of the tiles.
-	$ti = imagecolortransparent($src);
-	if ($ti >= 0) {
-	  $tc = imagecolorsforindex($src,$ti);
-      $ti = imagecolorallocate($bg,$tc['red'],$tc['green'],$tc['blue']);
-      imagefill($bg,0,0,$ti);
-      imagecolortransparent($bg, $ti);
+    $ti = imagecolortransparent($src);
+    if ($ti >= 0) {
+        $tc = imagecolorsforindex($src,$ti);
+        $ti = imagecolorallocate($bg,$tc['red'],$tc['green'],$tc['blue']);
+        imagefill($bg,0,0,$ti);
+        imagecolortransparent($bg, $ti);
     }
 
     //This has only an effect for the non repeatable dimension.
     //compute start of src and dest coordinates of the single copy
     if ( $bg_x < 0 ) {
-      $dst_x = 0;
-      $src_x = -$bg_x;
+        $dst_x = 0;
+        $src_x = -$bg_x;
     } else {
-      $src_x = 0;
-      $dst_x = $bg_x;
+        $src_x = 0;
+        $dst_x = $bg_x;
     }
 
     if ( $bg_y < 0 ) {
-      $dst_y = 0;
-      $src_y = -$bg_y;
+        $dst_y = 0;
+        $src_y = -$bg_y;
     } else {
-      $src_y = 0;
-      $dst_y = $bg_y;
+        $src_y = 0;
+        $dst_y = $bg_y;
     }
 
-	//For historical reasons exchange meanings of variables:
-	//start_* will be the start values, while bg_* will be the temporary start values in the loops
+    //For historical reasons exchange meanings of variables:
+    //start_* will be the start values, while bg_* will be the temporary start values in the loops
     $start_x = $bg_x;
     $start_y = $bg_y;
 
@@ -360,117 +360,117 @@ 
 
     if ( $repeat === "no-repeat" ) {
 
-      // Simply place the image on the background
-      imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h);
+        // Simply place the image on the background
+        imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h);
 
     } else if ( $repeat === "repeat-x" ) {
 
-      for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
+        for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
         if ( $bg_x < 0 ) {
-          $dst_x = 0;
-          $src_x = -$bg_x;
-          $w = $img_w + $bg_x;
+            $dst_x = 0;
+            $src_x = -$bg_x;
+            $w = $img_w + $bg_x;
         } else {
-          $dst_x = $bg_x;
-          $src_x = 0;
-          $w = $img_w;
+            $dst_x = $bg_x;
+            $src_x = 0;
+            $w = $img_w;
         }
         imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $img_h);
-      }
+        }
 
     } else if ( $repeat === "repeat-y" ) {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
+        for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
         if ( $bg_y < 0 ) {
-          $dst_y = 0;
-          $src_y = -$bg_y;
-          $h = $img_h + $bg_y;
+            $dst_y = 0;
+            $src_y = -$bg_y;
+            $h = $img_h + $bg_y;
         } else {
-          $dst_y = $bg_y;
-          $src_y = 0;
-          $h = $img_h;
+            $dst_y = $bg_y;
+            $src_y = 0;
+            $h = $img_h;
         }
         imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $h);
 
-      }
+        }
 
     } else if ( $repeat === "repeat" ) {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
+        for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
         for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
 
-          if ( $bg_x < 0 ) {
+            if ( $bg_x < 0 ) {
             $dst_x = 0;
             $src_x = -$bg_x;
             $w = $img_w + $bg_x;
-          } else {
+            } else {
             $dst_x = $bg_x;
             $src_x = 0;
             $w = $img_w;
-          }
+            }
 
-          if ( $bg_y < 0 ) {
+            if ( $bg_y < 0 ) {
             $dst_y = 0;
             $src_y = -$bg_y;
             $h = $img_h + $bg_y;
-          } else {
+            } else {
             $dst_y = $bg_y;
             $src_y = 0;
             $h = $img_h;
-          }
-          imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $h);
+            }
+            imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $h);
+        }
         }
-      }
     } else {
- print 'Unknown repeat!';
+    print 'Unknown repeat!';
     }   
 
     } /* End optimize away creation of duplicates */
 
     //img: image url string
-	//img_w, img_h: original image size in px
-	//width, height: box size in pt
-	//bg_width, bg_height: box size in px
-	//x, y: left/top edge of box on page in pt
-	//start_x, start_y: placement of image relativ to pattern
-	//$repeat: repeat mode
-	//$bg: GD object of result image
-	//$src: GD object of original image
+    //img_w, img_h: original image size in px
+    //width, height: box size in pt
+    //bg_width, bg_height: box size in px
+    //x, y: left/top edge of box on page in pt
+    //start_x, start_y: placement of image relativ to pattern
+    //$repeat: repeat mode
+    //$bg: GD object of result image
+    //$src: GD object of original image
     //When using cpdf and optimization to direct png creation from gd object is available,
     //don't create temp file, but place gd object directly into the pdf
-	if ( method_exists( $this->_canvas, "get_cpdf" ) && method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) ) {
-      //Note: CPDF_Adapter image converts y position
-	  $this->_canvas->get_cpdf()->addImagePng(
-	  		$filedummy,
-			$x, $this->_canvas->get_height() - $y - $height, $width, $height, $bg);
-	} else {
-      $tmp_file = tempnam(DOMPDF_TEMP_DIR, "bg_dompdf_img_").'.png';
-      //debugpng
-      if (DEBUGPNG) print '[_background_image '.$tmp_file.']';
+    if ( method_exists( $this->_canvas, "get_cpdf" ) && method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) ) {
+        //Note: CPDF_Adapter image converts y position
+        $this->_canvas->get_cpdf()->addImagePng(
+                $filedummy,
+            $x, $this->_canvas->get_height() - $y - $height, $width, $height, $bg);
+    } else {
+        $tmp_file = tempnam(DOMPDF_TEMP_DIR, "bg_dompdf_img_").'.png';
+        //debugpng
+        if (DEBUGPNG) print '[_background_image '.$tmp_file.']';
 
-      imagepng($bg, $tmp_file);
-      $this->_canvas->image($tmp_file, "png", $x, $y, $width, $height);
+        imagepng($bg, $tmp_file);
+        $this->_canvas->image($tmp_file, "png", $x, $y, $width, $height);
 
-      //debugpng
-      if (DEBUGPNG) print '[_background_image unlink '.$tmp_file.']';
+        //debugpng
+        if (DEBUGPNG) print '[_background_image unlink '.$tmp_file.']';
 
-      if (!DEBUGKEEPTEMP)
+        if (!DEBUGKEEPTEMP)
         unlink($tmp_file);
     }
-  }
+    }
 
-  protected function _border_none($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_none($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     return;
-  }
+    }
   
-  // Border rendering functions
-  protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    // Border rendering functions
+    protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     if ( $$side < 2 )
-      $dash = array($$side, 2);
+        $dash = array($$side, 2);
     else
-      $dash = array($$side);
+        $dash = array($$side);
   
     
     switch ($side) {
@@ -479,24 +479,24 @@ 
       $delta = $top / 2;
     case "bottom":
       $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
-      break;
+        $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
+        break;
 
     case "left":
       $delta = $left / 2;
     case "right":
       $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
-      break;
+        $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
+        break;
 
     default:
       return;
 
     }
-  }
+    }
 
   
-  protected function _border_dashed($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_dashed($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     switch ($side) {
@@ -505,24 +505,24 @@ 
       $delta = $top / 2;
     case "bottom":
       $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
-      break;
+        $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
+        break;
 
     case "left":
       $delta = $left / 2;
     case "right":
       $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
-      break;
+        $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
+        break;
 
     default:
       return;
     }
     
-  }
+    }
 
   
-  protected function _border_solid($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_solid($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     // All this polygon business is for beveled corners...
@@ -536,10 +536,10 @@ 
                         $x + $length - $right, $y + $top,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
       
-      break;
+        break;
       
     case "bottom":
       if ( $corner_style === "bevel" ) {
@@ -548,10 +548,10 @@ 
                         $x + $length - $right, $y - $bottom,
                         $x + $left, $y - $bottom);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
       
-      break;
+        break;
       
     case "left":
       if ( $corner_style === "bevel" ) {
@@ -560,10 +560,10 @@ 
                         $x + $left, $y + $length - $bottom,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
       
-      break;
+        break;
       
     case "right":
       if ( $corner_style === "bevel" ) {
@@ -572,20 +572,20 @@ 
                         $x - $right, $y + $length - $bottom,
                         $x - $right, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
 
-      break;
+        break;
 
     default:
       return;
 
     }
         
-  }
+    }
 
 
-  protected function _border_double($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_double($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     $line_width = $$side / 4;
@@ -612,12 +612,12 @@ 
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
         $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
 
-      }
-      break;
+        }
+        break;
       
     case "bottom":
       if ( $corner_style === "bevel" ) {
@@ -636,12 +636,12 @@ 
                         $x + $left, $y - $bottom);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
         $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
-      }
+        }
           
-      break;
+        break;
 
     case "left":
       if ( $corner_style === "bevel" ) {
@@ -660,12 +660,12 @@ 
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
         $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
-      }
+        }
       
-      break;
+        break;
                       
     case "right":
       if ( $corner_style === "bevel" ) {
@@ -674,7 +674,7 @@ 
         
       
         $points = array($x, $y,
-                      $x, $y + $length,
+                        $x, $y + $length,
                         $x - $line_width, $y + $length - $bottom_line_width,
                         $x - $line_width, $y + $top_line_width);
         $this->_canvas->polygon($points, $color, null, null, true);
@@ -685,21 +685,21 @@ 
                         $x - $right, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
         $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
-      }
+        }
       
-      break;
+        break;
 
     default:
       return;
 
     }
         
-  }
+    }
 
-  protected function _border_groove($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_groove($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
       
     $half_widths = array($top / 2, $right / 2, $bottom / 2, $left / 2);
@@ -710,27 +710,27 @@ 
 
     case "top":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y += $top / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "bottom":
       $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y -= $bottom / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "left":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     case "right":
       $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     default:
       return;
@@ -739,9 +739,9 @@ 
 
     $this->_border_outset($x, $y, $length, $color, $half_widths, $side);
     
-  }
+    }
   
-  protected function _border_ridge($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_ridge($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
      
     $half_widths = array($top / 2, $right / 2, $bottom / 2, $left / 2);
@@ -752,27 +752,27 @@ 
 
     case "top":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y += $top / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "bottom":
       $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y -= $bottom / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "left":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     case "right":
       $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     default:
       return;
@@ -781,23 +781,23 @@ 
 
     $this->_border_inset($x, $y, $length, $color, $half_widths, $side);
 
-  }
+    }
 
-  protected function _tint($c) {
+    protected function _tint($c) {
     if ( !is_numeric($c) )
-      return $c;
+        return $c;
     
     return min(1, $c + 0.66);
-  }
+    }
 
-  protected function _shade($c) {
+    protected function _shade($c) {
     if ( !is_numeric($c) )
-      return $c;
+        return $c;
     
     return max(0, $c - 0.66);
-  }
+    }
 
-  protected function _border_inset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_inset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
@@ -805,43 +805,43 @@ 
     case "top":
     case "left":
       $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+        break;
 
     case "bottom":
     case "right":
       $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+        break;
 
     default:
       return;
     }
-  }
+    }
   
-  protected function _border_outset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_outset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
     case "top":
     case "left":
       $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+        break;
 
     case "bottom":
     case "right":
       $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+        break;
 
     default:
       return;
 
     }
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
 
 }

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

Indentation +38 added lines, -38 removed lines

@@ -54,23 +54,23 @@ 
  */
 class Image_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Image_Frame_Decorator $frame) {
+    function __construct(Image_Frame_Decorator $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function reflow() {
+    function reflow() {
     
     // Set the frame's width
     $this->get_min_max_width();
     
-  }
+    }
 
-  function get_min_max_width() {
+    function get_min_max_width() {
 
     if (DEBUGPNG) {
-      // Determine the image's size. Time consuming. Only when really needed?
-      list($img_width, $img_height) = getimagesize($this->_frame->get_image_url());
-      print "get_min_max_width() ".
+        // Determine the image's size. Time consuming. Only when really needed?
+        list($img_width, $img_height) = getimagesize($this->_frame->get_image_url());
+        print "get_min_max_width() ".
         $this->_frame->get_style()->width.' '.
         $this->_frame->get_style()->height.';'.
         $this->_frame->get_parent()->get_style()->width." ".
@@ -93,55 +93,55 @@ 
 
     $width = ($style->width > 0 ? $style->width : ($stylep->width > 0 ? $stylep->width : 0));
     if ( is_percent($width) ) {
-      $t = 0.0;
-      for ($f = $this->_frame->get_parent(); $f; $f = $f->get_parent()) {
+        $t = 0.0;
+        for ($f = $this->_frame->get_parent(); $f; $f = $f->get_parent()) {
         $t = (float)($f->get_style()->width); //always in pt
         if ((float)$t != 0) {
-        	break;
+            break;
+        }
         }
-      }
-      $width = ((float)rtrim($width,"%") * $t)/100; //maybe 0
+        $width = ((float)rtrim($width,"%") * $t)/100; //maybe 0
     } else {
-      // Don't set image original size if "%" branch was 0 or size not given.
-      // Otherwise aspect changed on %/auto combination for width/height
-      // Resample according to px per inch
-      // See also List_Bullet_Image_Frame_Decorator::__construct
-      $width = (float)($width * 72) / DOMPDF_DPI;
+        // Don't set image original size if "%" branch was 0 or size not given.
+        // Otherwise aspect changed on %/auto combination for width/height
+        // Resample according to px per inch
+        // See also List_Bullet_Image_Frame_Decorator::__construct
+        $width = (float)($width * 72) / DOMPDF_DPI;
     }
 
     $height = ($style->height > 0 ? $style->height : ($stylep->height > 0 ? $stylep->height : 0));
     if ( is_percent($height) ) {
-      $t = 0.0;
-      for ($f = $this->_frame->get_parent(); $f; $f = $f->get_parent()) {
+        $t = 0.0;
+        for ($f = $this->_frame->get_parent(); $f; $f = $f->get_parent()) {
         $t = (float)($f->get_style()->height); //always in pt
         if ((float)$t != 0) {
-        	break;
+            break;
         }
-      }
-      $height = ((float)rtrim($height,"%") * $t)/100; //maybe 0
+        }
+        $height = ((float)rtrim($height,"%") * $t)/100; //maybe 0
     } else {
-      // Don't set image original size if "%" branch was 0 or size not given.
-      // Otherwise aspect changed on %/auto combination for width/height
-      // Resample according to px per inch
-      // See also List_Bullet_Image_Frame_Decorator::__construct
-      $height = (float)($height * 72) / DOMPDF_DPI;
+        // Don't set image original size if "%" branch was 0 or size not given.
+        // Otherwise aspect changed on %/auto combination for width/height
+        // Resample according to px per inch
+        // See also List_Bullet_Image_Frame_Decorator::__construct
+        $height = (float)($height * 72) / DOMPDF_DPI;
     }
 
     if ($width == 0 || $height == 0) {
-      // Determine the image's size. Time consuming. Only when really needed!
-      list($img_width, $img_height) = getimagesize($this->_frame->get_image_url());
-      // don't treat 0 as error. Can be downscaled or can be catched elsewhere if image not readable.
-      // Resample according to px per inch
-      // See also List_Bullet_Image_Frame_Decorator::__construct
+        // Determine the image's size. Time consuming. Only when really needed!
+        list($img_width, $img_height) = getimagesize($this->_frame->get_image_url());
+        // don't treat 0 as error. Can be downscaled or can be catched elsewhere if image not readable.
+        // Resample according to px per inch
+        // See also List_Bullet_Image_Frame_Decorator::__construct
       
-      if ($width == 0 && $height == 0) {
+        if ($width == 0 && $height == 0) {
         $width = (float)($img_width * 72) / DOMPDF_DPI;
         $height = (float)($img_height * 72) / DOMPDF_DPI;
-      } elseif ($height == 0 && $width != 0) {
+        } elseif ($height == 0 && $width != 0) {
         $height = ($width / $img_width) * $img_height; //keep aspect ratio
-      } elseif ($width == 0 && $height != 0) {
+        } elseif ($width == 0 && $height != 0) {
         $width = ($height / $img_height) * $img_width; //keep aspect ratio
-      }
+        }
     }
 
     if (DEBUGPNG) print $width.' '.$height.';';
@@ -173,5 +173,5 @@ 
 
     return array( $width, $width, "min" => $width, "max" => $width);
     
-  }
+    }
 }