chamilo / chamilo-lms

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

Spacing +14 added lines, -14 removed lines

@@ -46,7 +46,7 @@ 
 
 /* $Id: font_metrics.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . "/class.pdf.php");
+require_once(DOMPDF_LIB_DIR."/class.pdf.php");
 
 /**
  * Name of the font cache file
@@ -59,10 +59,10 @@ 
  *
  * Declared here because PHP5 prevents constants from being declared with expressions
  */
-if (file_exists(DOMPDF_FONT_DIR . "dompdf_font_family_cache")) {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache");
+if (file_exists(DOMPDF_FONT_DIR."dompdf_font_family_cache")) {
+	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR."dompdf_font_family_cache");
 } else {
-	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR . "dompdf_font_family_cache.dist");
+	define('__DOMPDF_FONT_CACHE_FILE', DOMPDF_FONT_DIR."dompdf_font_family_cache.dist");
 }
 
 
@@ -157,11 +157,11 @@ 
      * Only on checking the fallback font, check various subtypes on same font.
      */
 
-    if ( $family ) {
-      $family = str_replace( array("'", '"'), "", mb_strtolower($family));
+    if ($family) {
+      $family = str_replace(array("'", '"'), "", mb_strtolower($family));
       $subtype = mb_strtolower($subtype);
 
-      if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+      if (isset(self::$_font_lookup[$family][$subtype])) {
         return self::$_font_lookup[$family][$subtype];
       }
       return null;
@@ -169,18 +169,18 @@ 
 
     $family = DOMPDF_DEFAULT_FONT;
 
-    if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+    if (isset(self::$_font_lookup[$family][$subtype])) {
       return self::$_font_lookup[$family][$subtype];
     }
 
-    foreach ( self::$_font_lookup[$family] as $sub => $font ) {
+    foreach (self::$_font_lookup[$family] as $sub => $font) {
       if (strpos($subtype, $sub) !== false) {
         return $font;
       }
     }
 
     if ($subtype !== "normal") {
-      foreach ( self::$_font_lookup[$family] as $sub => $font ) {
+      foreach (self::$_font_lookup[$family] as $sub => $font) {
         if ($sub !== "normal") {
           return $font;
         }
@@ -189,7 +189,7 @@ 
 
     $subtype = "normal";
 
-    if ( isset(self::$_font_lookup[$family][$subtype]) ) {
+    if (isset(self::$_font_lookup[$family][$subtype])) {
       return self::$_font_lookup[$family][$subtype];
     }
     return null;
@@ -216,13 +216,13 @@ 
    * @see save_font_families()
    */
   static function load_font_families() {
-    if ( !is_readable(self::CACHE_FILE) )
+    if (!is_readable(self::CACHE_FILE))
       return;
 
     $data = file_get_contents(self::CACHE_FILE);
 
-    if ( $data != "" )
-      eval ('self::$_font_lookup = ' . $data . ";");
+    if ($data != "")
+      eval ('self::$_font_lookup = '.$data.";");
   }
 
   /**

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

Spacing +6 added lines, -6 removed lines

@@ -54,11 +54,11 @@ 
     list($x, $y, $w, $h) = $frame->get_padding_box();
 
     // Draw our background, border and content
-    if ( ($bg = $style->background_color) !== "transparent" ) {
-      $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color );
+    if (($bg = $style->background_color) !== "transparent") {
+      $this->_canvas->filled_rectangle($x, $y, $w, $h, $style->background_color);
     }
 
-    if ( ($url = $style->background_image) && $url !== "none" )
+    if (($url = $style->background_image) && $url !== "none")
       $this->_background_image($url, $x, $y, $w, $h, $style);
 
 
@@ -81,11 +81,11 @@ 
     foreach ($bp as $side => $props) {
       list($x, $y, $w, $h) = $bbox;
 
-      if ( !$props["style"] || $props["style"] === "none" || $props["width"] <= 0 )
+      if (!$props["style"] || $props["style"] === "none" || $props["width"] <= 0)
         continue;
 
 
-      switch($side) {
+      switch ($side) {
       case "top":
         $length = $w;
         break;
@@ -106,7 +106,7 @@ 
       default:
         break;
       }
-      $method = "_border_" . $props["style"];
+      $method = "_border_".$props["style"];
 
       $this->$method($x, $y, $length, $props["color"], $widths, $side, $corner_style);
     }

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

Spacing +5 added lines, -5 removed lines

@@ -57,15 +57,15 @@ 
 
   function split($frame = null) {
 
-    if ( is_null($frame) ) {
+    if (is_null($frame)) {
       $this->get_parent()->split($this);
       return;
     }
     
-    if ( $frame->get_parent() !== $this )
+    if ($frame->get_parent() !== $this)
       throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
         
-    $split = $this->copy( $this->_frame->get_node()->cloneNode() ); 
+    $split = $this->copy($this->_frame->get_node()->cloneNode()); 
     $this->get_parent()->insert_child_after($split, $this);
 
     // Unset the current node's right style properties
@@ -84,8 +84,8 @@ 
     //On continuation of inline element on next line,
     //don't repeat non-vertically repeatble background images
     //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"
+    if (($url = $style->background_image) && $url !== "none"
+         && ($repeat = $style->background_repeat) && $repeat !== "repeat" && $repeat !== "repeat-y"
        ) {
       $style->background_image = "none";
     }           

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

Spacing +8 added lines, -8 removed lines

@@ -79,7 +79,7 @@ 
   function render(Frame $frame) {    
     global $_dompdf_debug;
 
-    if ( $_dompdf_debug ) {
+    if ($_dompdf_debug) {
       echo $frame;
       flush();
     }
@@ -100,7 +100,7 @@ 
       break;
 
     case "inline":
-      if ( $frame->get_node()->nodeName === "#text" )
+      if ($frame->get_node()->nodeName === "#text")
         $this->_render_frame("text", $frame);
       else
         $this->_render_frame("inline", $frame);
@@ -121,15 +121,15 @@ 
     case "none":
       $node = $frame->get_node();
           
-      if ( $node->nodeName === "script" ) {
-        if ( $node->getAttribute("type") === "text/php" ||
-             $node->getAttribute("language") === "php" ) {
+      if ($node->nodeName === "script") {
+        if ($node->getAttribute("type") === "text/php" ||
+             $node->getAttribute("language") === "php") {
           // Evaluate embedded php scripts
           $this->_render_frame("php", $frame);
         }
         
-        elseif ( $node->getAttribute("type") === "text/javascript" ||
-             $node->getAttribute("language") === "javascript" ) {
+        elseif ($node->getAttribute("type") === "text/javascript" ||
+             $node->getAttribute("language") === "javascript") {
           // Insert JavaScript
           $this->_render_frame("javascript", $frame);
         }
@@ -192,7 +192,7 @@ 
    */
   protected function _render_frame($type, $frame) {
 
-    if ( !isset($this->_renderers[$type]) ) {
+    if (!isset($this->_renderers[$type])) {
       
       switch ($type) {
       case "block":

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

Spacing +29 added lines, -29 removed lines

@@ -52,7 +52,7 @@ 
   function render(Frame $frame) {
     $style = $frame->get_style();
 
-    if ( !$frame->get_first_child() )
+    if (!$frame->get_first_child())
       return; // No children, no service
     
     // Draw the left border if applicable
@@ -76,7 +76,7 @@ 
       list($child_x, $child_y, $child_w, $child_h) = $child->get_padding_box();
       $child_h += $widths[2];
       
-      if ( !is_null($w) && $child_x < $x + $w ) {
+      if (!is_null($w) && $child_x < $x + $w) {
         //This branch seems to be supposed to being called on the first part
         //of an inline html element, and the part after the if clause for the
         //parts after a line break.
@@ -87,38 +87,38 @@ 
         // borders on this line.
 
         // Background:
-        if ( ($bg = $style->background_color) !== "transparent" )
-          $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color);
+        if (($bg = $style->background_color) !== "transparent")
+          $this->_canvas->filled_rectangle($x, $y, $w, $h, $style->background_color);
 
-        if ( ($url = $style->background_image) && $url !== "none" ) {
+        if (($url = $style->background_image) && $url !== "none") {
           $this->_background_image($url, $x, $y, $w, $h, $style);
         }
 
         // If this is the first row, draw the left border
-        if ( $first_row ) {
+        if ($first_row) {
 
-          if ( $bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0 ) {
-            $method = "_border_" . $bp["left"]["style"];            
+          if ($bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0) {
+            $method = "_border_".$bp["left"]["style"];            
             $this->$method($x, $y, $h + $widths[0] + $widths[2], $bp["left"]["color"], $widths, "left");
           }
           $first_row = false;
         }
 
         // Draw the top & bottom borders
-        if ( $bp["top"]["style"] !== "none" && $bp["top"]["width"] > 0 ) {
-          $method = "_border_" . $bp["top"]["style"];
+        if ($bp["top"]["style"] !== "none" && $bp["top"]["width"] > 0) {
+          $method = "_border_".$bp["top"]["style"];
           $this->$method($x, $y, $w + $widths[1] + $widths[3], $bp["top"]["color"], $widths, "top");
         }
         
-        if ( $bp["bottom"]["style"] !== "none" && $bp["bottom"]["width"] > 0 ) {
-          $method = "_border_" . $bp["bottom"]["style"];
+        if ($bp["bottom"]["style"] !== "none" && $bp["bottom"]["width"] > 0) {
+          $method = "_border_".$bp["bottom"]["style"];
           $this->$method($x, $y + $h + $widths[0] + $widths[2], $w + $widths[1] + $widths[3], $bp["bottom"]["color"], $widths, "bottom");
         }
 
         // Handle anchors & links
-        if ( $frame->get_node()->nodeName === "a" ) {
+        if ($frame->get_node()->nodeName === "a") {
                     
-          if ( $href = $frame->get_node()->getAttribute("href") )
+          if ($href = $frame->get_node()->getAttribute("href"))
             $this->_canvas->add_link($href, $x, $y, $w, $h);
 
         }
@@ -130,7 +130,7 @@ 
         continue;
       }
 
-      if ( is_null($w) )
+      if (is_null($w))
         $w = $child_w;
       else
         $w += $child_w;
@@ -140,8 +140,8 @@ 
 
     
     // Handle the last child
-    if ( ($bg = $style->background_color) !== "transparent" ) 
-      $this->_canvas->filled_rectangle( $x + $widths[3], $y + $widths[0], $w, $h, $style->background_color);
+    if (($bg = $style->background_color) !== "transparent") 
+      $this->_canvas->filled_rectangle($x + $widths[3], $y + $widths[0], $w, $h, $style->background_color);
 
     //On continuation lines (after line break) of inline elements, the style got copied.
     //But a non repeatable background image should not be repeated on the next line.
@@ -151,7 +151,7 @@ 
     // Repeat not given: default is Style::__construct
     // ... && (!($repeat = $style->background_repeat) || $repeat === "repeat" ...
     //different position? $this->_background_image($url, $x, $y, $w, $h, $style);
-    if ( ($url = $style->background_image) && $url !== "none" )           
+    if (($url = $style->background_image) && $url !== "none")           
       $this->_background_image($url, $x + $widths[3], $y + $widths[0], $w, $h, $style);
         
     // Add the border widths
@@ -163,37 +163,37 @@ 
     $x += $left_margin;
 
     // If this is the first row, draw the left border too
-    if ( $first_row && $bp["left"]["style"] !== "none" && $widths[3] > 0 ) {
-      $method = "_border_" . $bp["left"]["style"];
+    if ($first_row && $bp["left"]["style"] !== "none" && $widths[3] > 0) {
+      $method = "_border_".$bp["left"]["style"];
       $this->$method($x, $y, $h, $bp["left"]["color"], $widths, "left");
     }
     
     // Draw the top & bottom borders
-    if ( $bp["top"]["style"] !== "none" && $widths[0] > 0 ) {
-      $method = "_border_" . $bp["top"]["style"];
+    if ($bp["top"]["style"] !== "none" && $widths[0] > 0) {
+      $method = "_border_".$bp["top"]["style"];
       $this->$method($x, $y, $w, $bp["top"]["color"], $widths, "top");
     }
     
-    if ( $bp["bottom"]["style"] !== "none" && $widths[2] > 0 ) {
-      $method = "_border_" . $bp["bottom"]["style"];
+    if ($bp["bottom"]["style"] !== "none" && $widths[2] > 0) {
+      $method = "_border_".$bp["bottom"]["style"];
       $this->$method($x, $y + $h, $w, $bp["bottom"]["color"], $widths, "bottom");
     }
 
     //    pre_var_dump(get_class($frame->get_next_sibling()));
     //    $last_row = get_class($frame->get_next_sibling()) !== 'Inline_Frame_Decorator';
     // Draw the right border if this is the last row
-    if ( $bp["right"]["style"] !== "none" && $widths[1] > 0 ) {
-      $method = "_border_" . $bp["right"]["style"];
+    if ($bp["right"]["style"] !== "none" && $widths[1] > 0) {
+      $method = "_border_".$bp["right"]["style"];
       $this->$method($x + $w, $y, $h, $bp["right"]["color"], $widths, "right");
     }
 
     // Handle anchors & links
-    if ( $frame->get_node()->nodeName === "a" ) {
+    if ($frame->get_node()->nodeName === "a") {
 
-      if ( $name = $frame->get_node()->getAttribute("name") )
+      if ($name = $frame->get_node()->getAttribute("name"))
         $this->_canvas->add_named_dest($name);
 
-      if ( $href = $frame->get_node()->getAttribute("href") )
+      if ($href = $frame->get_node()->getAttribute("href"))
         $this->_canvas->add_link($href, $x, $y, $w, $h);
     }
   }

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

Spacing +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     // Resample the bullet image to be consistent with 'auto' sized images
     // See also Image_Frame_Reflower::get_min_max_width
     // Tested php ver: value measured in px, suffix "px" not in value: rtrim unnecessary.
-    $this->_width = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-    $this->_height = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+    $this->_width = (((float) rtrim($width, "px")) * 72) / DOMPDF_DPI;
+    $this->_height = (((float) rtrim($height, "px")) * 72) / DOMPDF_DPI;
  
     //If an image is taller as the containing block/box, the box should be extended.
     //Neighbour elements are overwriting the overlapping image areas.
@@ -116,7 +116,7 @@ 
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
-    return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
+    return $this->_frame->get_style()->get_font_size() * List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
   }
 
@@ -145,7 +145,7 @@ 
 
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
-    if ( $this->_frame->get_style()->list_style_position === "outside" ||
+    if ($this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
       return 0;
     //This aligns the "inside" image position with the text.

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

Spacing +12 added lines, -12 removed lines

@@ -54,14 +54,14 @@ 
 
   static function decorate_root(Frame $root, DOMPDF $dompdf) {
     $frame = new Page_Frame_Decorator($root, $dompdf);
-    $frame->set_reflower( new Page_Frame_Reflower($frame) );
+    $frame->set_reflower(new Page_Frame_Reflower($frame));
     $root->set_decorator($frame);
     return $frame;
   }
 
   // FIXME: this is admittedly a little smelly...
   static function decorate_frame(Frame $frame, $dompdf) {
-    if ( is_null($dompdf) )
+    if (is_null($dompdf))
       throw new Exception("foo");
     switch ($frame->get_style()->display) {
       
@@ -79,7 +79,7 @@ 
 
     case "inline":
       $positioner = "Inline";
-      if ( $frame->get_node()->nodeName === "#text" ) {
+      if ($frame->get_node()->nodeName === "#text") {
         $decorator = "Text";
         $reflower = "Text";
       } else {
@@ -127,12 +127,12 @@ 
       break;
 
     case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
+      if ($frame->get_style()->list_style_position === "inside")
         $positioner = "Inline";
       else        
         $positioner = "List_Bullet";
 
-      if ( $frame->get_style()->list_style_image !== "none" )
+      if ($frame->get_style()->list_style_image !== "none")
         $decorator = "List_Bullet_Image";
       else
         $decorator = "List_Bullet";
@@ -162,8 +162,8 @@ 
 
     }
 
-    if ( $frame->get_style()->position === "absolute" ||
-         $frame->get_style()->position === "fixed" )
+    if ($frame->get_style()->position === "absolute" ||
+         $frame->get_style()->position === "fixed")
       $positioner = "Absolute";
     
     $positioner .= "_Positioner";
@@ -171,18 +171,18 @@ 
     $reflower .= "_Frame_Reflower";
 
     $deco = new $decorator($frame, $dompdf);
-    $deco->set_positioner( new $positioner($deco) );
+    $deco->set_positioner(new $positioner($deco));
     $reflow = new $reflower($deco);
     
     // Generated content is a special case
-    if ( $frame->get_node()->nodeName === "_dompdf_generated" ) {
+    if ($frame->get_node()->nodeName === "_dompdf_generated") {
       // Decorate the reflower
-      $gen = new Generated_Frame_Reflower( $deco );
-      $gen->set_reflower( $reflow );
+      $gen = new Generated_Frame_Reflower($deco);
+      $gen->set_reflower($reflow);
       $reflow = $gen;
     }
     
-    $deco->set_reflower( $reflow );
+    $deco->set_reflower($reflow);
 
     // Images are a special case
 //    if ( $frame->get_node()->nodeName === "img" ) {

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

Spacing +34 added lines, -34 removed lines

@@ -101,8 +101,8 @@ 
    */
   function dispose($recursive = false) {
     
-    if ( $recursive ) {
-      while ( $child = $this->get_first_child() )
+    if ($recursive) {
+      while ($child = $this->get_first_child())
         $child->dispose(true);
     }
     
@@ -183,41 +183,41 @@ 
   function __toString() { return $this->_frame->__toString(); }
   
   function prepend_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $child->_frame;
     
     $this->_frame->prepend_child($child, $update_node);
   }
 
   function append_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $child->_frame;
 
     $this->_frame->append_child($child, $update_node);
   }
 
   function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
+    while ($new_child instanceof Frame_Decorator)
       $new_child = $new_child->_frame;
 
-    if ( $ref instanceof Frame_Decorator )
+    if ($ref instanceof Frame_Decorator)
       $ref = $ref->_frame;
 
     $this->_frame->insert_child_before($new_child, $ref, $update_node);
   }
 
   function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
+    while ($new_child instanceof Frame_Decorator)
       $new_child = $new_child->_frame;
 
-    while ( $ref instanceof Frame_Decorator )
+    while ($ref instanceof Frame_Decorator)
       $ref = $ref->_frame;
     
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
   }
 
   function remove_child(Frame $child, $update_node = true) {
-    while  ( $child instanceof Frame_Decorator )
+    while ($child instanceof Frame_Decorator)
       $child = $new_child->_frame;
 
     $this->_frame->remove_child($child, $update_node);
@@ -229,11 +229,11 @@ 
 
     $p = $this->_frame->get_parent();
     
-    if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($p && $deco = $p->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $p )
+    } else if ($p)
       return $p;
     else
       return null;
@@ -241,11 +241,11 @@ 
 
   function get_first_child() {
     $c = $this->_frame->get_first_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $c )
+    } else if ($c)
       return $c;
     else
       return null;
@@ -253,11 +253,11 @@ 
 
   function get_last_child() {
     $c = $this->_frame->get_last_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $c )
+    } else if ($c)
       return $c;
     else
       return null;
@@ -265,11 +265,11 @@ 
 
   function get_prev_sibling() {
     $s = $this->_frame->get_prev_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $s )
+    } else if ($s)
       return $s;
     else
       return null;
@@ -277,11 +277,11 @@ 
   
   function get_next_sibling() {
     $s = $this->_frame->get_next_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator())
         $deco = $tmp;      
       return $deco;
-    } else if ( $s )
+    } else if ($s)
       return $s;
     else
       return null;
@@ -299,7 +299,7 @@ 
 
   function set_positioner(Positioner $posn) {
     $this->_positioner = $posn;
-    if ( $this->_frame instanceof Frame_Decorator )
+    if ($this->_frame instanceof Frame_Decorator)
       $this->_frame->set_positioner($posn);
   }
   
@@ -307,8 +307,8 @@ 
 
   function set_reflower(Frame_Reflower $reflower) {
     $this->_reflower = $reflower;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_reflower( $reflower );
+    if ($this->_frame instanceof Frame_Decorator)
+      $this->_frame->set_reflower($reflower);
   }
   
   function get_reflower() { return $this->_reflower; }
@@ -317,7 +317,7 @@ 
   
   function set_root(Frame $root) {
     $this->_root = $root;
-      if ( $this->_frame instanceof Frame_Decorator )
+      if ($this->_frame instanceof Frame_Decorator)
         $this->_frame->set_root($root);
   }
   
@@ -330,8 +330,8 @@ 
     // Find our nearest block level parent
     $p = $this->get_parent();
     
-    while ( $p ) {
-      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
+    while ($p) {
+      if (in_array($p->get_style()->display, Style::$BLOCK_TYPES))
         break;
 
       $p = $p->get_parent();
@@ -353,15 +353,15 @@ 
    */
   function split($child = null) {
 
-    if ( is_null( $child ) ) {
+    if (is_null($child)) {
       $this->get_parent()->split($this);
       return;
     }
     
-    if ( $child->get_parent() !== $this )
+    if ($child->get_parent() !== $this)
       throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
 
-    $split = $this->copy( $this->_frame->get_node()->cloneNode() );
+    $split = $this->copy($this->_frame->get_node()->cloneNode());
     $split->reset();
     $this->get_parent()->insert_child_after($split, $this);
 
@@ -379,7 +379,7 @@ 
 
   //........................................................................
 
-  final function position() { $this->_positioner->position();  }
+  final function position() { $this->_positioner->position(); }
   
   final function reflow() {
     // Uncomment this to see the frames before they're laid out, instead of

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

Spacing +17 added lines, -17 removed lines

@@ -54,17 +54,17 @@ 
  */
 class Text_Renderer extends Abstract_Renderer {
   
-  const DECO_THICKNESS = 0.04;     // Thickness of underline. Screen: 0.08, print: better less, e.g. 0.04
+  const DECO_THICKNESS = 0.04; // Thickness of underline. Screen: 0.08, print: better less, e.g. 0.04
 
   //Tweaking if $base and $descent are not accurate.
   //Check method_exists( $this->_canvas, "get_cpdf" )
   //- For cpdf these can and must stay 0, because font metrics are used directly.
   //- For other renderers, if different values are wanted, separate the parameter sets.
   //  But $size and $size-$height seem to be accurate enough
-  const UNDERLINE_OFFSET = 0.0;    // Relative to bottom of text, as fraction of height.
-  const OVERLINE_OFFSET = 0.0;    // Relative to top of text
+  const UNDERLINE_OFFSET = 0.0; // Relative to bottom of text, as fraction of height.
+  const OVERLINE_OFFSET = 0.0; // Relative to top of text
   const LINETHROUGH_OFFSET = 0.0; // Relative to centre of text.
-  const DECO_EXTENSION = 0.0;     // How far to extend lines past either end, in pt
+  const DECO_EXTENSION = 0.0; // How far to extend lines past either end, in pt
     
   //........................................................................
 
@@ -74,16 +74,16 @@ 
     list($x, $y) = $frame->get_position();
     $cb = $frame->get_containing_block();
 
-    if ( ($ml = $style->margin_left) === "auto" || $ml === "none" )
+    if (($ml = $style->margin_left) === "auto" || $ml === "none")
       $ml = 0;
 
-    if ( ($pl = $style->padding_left) === "auto" || $pl === "none" )
+    if (($pl = $style->padding_left) === "auto" || $pl === "none")
       $pl = 0;
 
-    if ( ($bl = $style->border_left_width) === "auto" || $bl === "none" )
+    if (($bl = $style->border_left_width) === "auto" || $bl === "none")
       $bl = 0;
 
-    $x += $style->length_in_pt( array($ml, $pl, $bl), $cb["w"] );
+    $x += $style->length_in_pt(array($ml, $pl, $bl), $cb["w"]);
 
     $text = $frame->get_text();
     
@@ -99,15 +99,15 @@ 
                          $font, $size,
                          $style->color, $spacing);
 
-    if ( method_exists( $this->_canvas, "get_cpdf" ) ) {
-      $base = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][3]*$size)/1000;
-      $descent = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][1]*$size)/1000;
+    if (method_exists($this->_canvas, "get_cpdf")) {
+      $base = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][3] * $size) / 1000;
+      $descent = ($this->_canvas->get_cpdf()->fonts[$this->_canvas->get_cpdf()->currentFont]['FontBBox'][1] * $size) / 1000;
       //print '<pre>Text_Renderer cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
     } else {
       //Descent is font part below baseline, typically negative. $height is about full height of font box.
       //$descent = -$size/6; is less accurate, depends on font family.
       $base = $size;
-      $descent = $size-$height;
+      $descent = $size - $height;
       //print '<pre>Text_Renderer other than cpdf:'.$base.' '.$descent.' '.$size.'</pre>';
     }
     
@@ -118,14 +118,14 @@ 
     // our way down.
     $p = $frame;
     $stack = array();
-    while ( $p = $p->get_parent() )
+    while ($p = $p->get_parent())
       $stack[] = $p;
     
-    while ( count($stack) > 0 ) {
+    while (count($stack) > 0) {
       $f = array_pop($stack);
 
       $deco_y = $y;
-      if ( ($text_deco = $f->get_style()->text_decoration) === "none" )
+      if (($text_deco = $f->get_style()->text_decoration) === "none")
         continue;
 
       $color = $f->get_style()->color;
@@ -136,11 +136,11 @@ 
         continue;
 
       case "underline":
-        $deco_y += $base - $descent+ $size * (self::UNDERLINE_OFFSET - self::DECO_THICKNESS/2);
+        $deco_y += $base - $descent + $size * (self::UNDERLINE_OFFSET - self::DECO_THICKNESS / 2);
         break;
 
       case "overline":
-        $deco_y += $size * (self::OVERLINE_OFFSET + self::DECO_THICKNESS/2);
+        $deco_y += $size * (self::OVERLINE_OFFSET + self::DECO_THICKNESS / 2);
         break;
 
       case "line-through":