chamilo / chamilo-lms

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

Indentation +378 added lines, -379 removed lines

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

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

Indentation +4 added lines, -5 removed lines

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

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

Indentation +37 added lines, -38 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: image_renderer.cls.php,v $
- * Created on: 2004-08-04
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: image_renderer.cls.php,v $
+     * Created on: 2004-08-04
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: image_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,7 +46,7 @@ 
  */
 class Image_Renderer extends Abstract_Renderer {
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
 
     // Render background & borders
     //parent::render($frame);
@@ -65,5 +64,5 @@ 
 
     $this->_canvas->image( $frame->get_image_url(), $frame->get_image_ext(), $x, $y, $w, $h);
 
-  }
+    }
 }

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

Indentation +91 added lines, -92 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: generated_frame_reflower.cls.php,v $
- * Created on: 2004-06-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: generated_frame_reflower.cls.php,v $
+     * Created on: 2004-06-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: generated_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,22 +46,22 @@ 
  */
 class Generated_Frame_Reflower extends Frame_Reflower {
 
-  protected $_reflower; // Decoration target
+    protected $_reflower; // Decoration target
 
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function set_reflower(Frame_Reflower $reflow) {
+    function set_reflower(Frame_Reflower $reflow) {
     $this->_reflower = $reflow;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  protected function _parse_string($string) {
+    protected function _parse_string($string) {
     $string = trim($string, "'\"");
     $string = str_replace(array("\\\n",'\\"',"\\'"),
-                          array("",'"',"'"), $string);
+                            array("",'"',"'"), $string);
 
     // Convert escaped hex characters into ascii characters (e.g. \A => newline)
     $string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})(\s)?(?(2)|(?=[^0-9a-fA-F]))/",
@@ -70,40 +69,40 @@ 
                                                     'return chr(hexdec($matches[1]));'),
                                     $string);
     return $string;
-  }
+    }
 
-  protected function _parse_content() {
+    protected function _parse_content() {
     $style = $this->_frame->get_style();
 
     // Matches generated content
     $re = "/\n".
-      "\s(counters?\\([^)]*\\))|\n".
-      "\A(counters?\\([^)]*\\))|\n".
-      "\s([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\3|\n".
-      "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n" .
-      "\s([^\s\"']+)|\n" .
-      "\A([^\s\"']+)\n".
-      "/xi";
+        "\s(counters?\\([^)]*\\))|\n".
+        "\A(counters?\\([^)]*\\))|\n".
+        "\s([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\3|\n".
+        "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n" .
+        "\s([^\s\"']+)|\n" .
+        "\A([^\s\"']+)\n".
+        "/xi";
 
     $content = $style->content;
 
     // split on spaces, except within quotes
     if (!preg_match_all($re, $content, $matches, PREG_SET_ORDER))
-      return;
+        return;
 
     $text = "";
 
     foreach ($matches as $match) {
-      if ( isset($match[2]) && $match[2] !== "" )
+        if ( isset($match[2]) && $match[2] !== "" )
         $match[1] = $match[1];
 
-      if ( isset($match[6]) && $match[6] !== "" )
+        if ( isset($match[6]) && $match[6] !== "" )
         $match[4] = $match[6];
 
-      if ( isset($match[8]) && $match[8] !== "" )
+        if ( isset($match[8]) && $match[8] !== "" )
         $match[7] = $match[8];
 
-      if ( isset($match[1]) && $match[1] !== "" ) {
+        if ( isset($match[1]) && $match[1] !== "" ) {
         // counters?(...)
         $match[1] = mb_strtolower(trim($match[1]));
 
@@ -112,85 +111,85 @@ 
 
         $i = mb_strpos($match[1], ")");
         if ( $i === false )
-          continue;
+            continue;
 
         $args = explode(",", mb_substr($match[1], 7, $i - 7));
         $counter_id = $args[0];
 
         if ( $match[1]{7} === "(" ) {
-          // counter(name [,style])
+            // counter(name [,style])
 
-          if ( isset($args[1]) )
+            if ( isset($args[1]) )
             $type = $args[1];
-          else
+            else
             $type = null;
 
 
-          $p = $this->_frame->find_block_parent();
+            $p = $this->_frame->find_block_parent();
 
-          $text .= $p->counter_value($counter_id, $type);
+            $text .= $p->counter_value($counter_id, $type);
 
         } else if ( $match[1]{7} === "s" ) {
-          // counters(name, string [,style])
-          if ( isset($args[1]) )
+            // counters(name, string [,style])
+            if ( isset($args[1]) )
             $string = $this->_parse_string(trim($args[1]));
-          else
+            else
             $string = "";
 
-          if ( isset($args[2]) )
+            if ( isset($args[2]) )
             $type = $args[2];
-          else
+            else
             $type = null;
 
-          $p = $this->_frame->find_block_parent();
-          $tmp = "";
-          while ($p) {
+            $p = $this->_frame->find_block_parent();
+            $tmp = "";
+            while ($p) {
             $tmp = $p->counter_value($counter_id, $type) . $string . $tmp;
             $p = $p->find_block_parent();
-          }
-          $text .= $tmp;
+            }
+            $text .= $tmp;
 
         } else
-          // countertops?
-          continue;
+            // countertops?
+            continue;
 
-      } else if ( isset($match[4]) && $match[4] !== "" ) {
+        } else if ( isset($match[4]) && $match[4] !== "" ) {
         // String match
         $text .= $this->_parse_string($match[4]);
 
-      } else if ( isset($match[7]) && $match[7] !== "" ) {
+        } else if ( isset($match[7]) && $match[7] !== "" ) {
         // Directive match
 
         if ( $match[7] === "open-quote" ) {
-          // FIXME: do something here
+            // FIXME: do something here
         } else if ( $match[7] === "close-quote" ) {
-          // FIXME: do something else here
+            // FIXME: do something else here
         } else if ( $match[7] === "no-open-quote" ) {
-          // FIXME:
+            // FIXME:
         } else if ( $match[7] === "no-close-quote" ) {
-          // FIXME:
+            // FIXME:
         } else if ( mb_strpos($match[7],"attr(") === 0 ) {
 
-          $i = mb_strpos($match[7],")");
-          if ( $i === false )
+            $i = mb_strpos($match[7],")");
+            if ( $i === false )
             continue;
 
-          $attr = mb_substr($match[7], 6, $i - 6);
-          if ( $attr == "" )
+            $attr = mb_substr($match[7], 6, $i - 6);
+            if ( $attr == "" )
             continue;
 
-          $text .= $this->_frame->get_node()->getAttribute($attr);
+            $text .= $this->_frame->get_node()->getAttribute($attr);
         } else
-          continue;
+            continue;
 
-      }
+        }
     }
 
     return $text;
 
-  }
+    }
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
 
     $text = $this->_parse_content();
@@ -202,5 +201,5 @@ 
 
     $this->_frame->prepend_child(Frame_Factory::decorate_frame($t_frame));
     $this->_reflower->reflow();
-  }
+    }
 }

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

Indentation +48 added lines, -49 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: table_row_frame_reflower.cls.php,v $
- * Created on: 2004-06-17
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: table_row_frame_reflower.cls.php,v $
+     * Created on: 2004-06-17
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: table_row_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -48,17 +47,17 @@ 
 class Table_Row_Frame_Reflower extends Frame_Reflower {
 
 
-  function __construct(Table_Row_Frame_Decorator $frame) {
+    function __construct(Table_Row_Frame_Decorator $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $page = $this->_frame->get_root();
 
     if ( $page->is_full() )
-      return;
+        return;
 
     $this->_frame->position();
     $style = $this->_frame->get_style();
@@ -66,16 +65,16 @@ 
 
     foreach ($this->_frame->get_children() as $child) {
 
-      if ( $page->is_full() )
+        if ( $page->is_full() )
         return;
 
-      $child->set_containing_block($cb);
-      $child->reflow();
+        $child->set_containing_block($cb);
+        $child->reflow();
 
     }
 
     if ( $page->is_full() )
-      return;
+        return;
 
     $table = Table_Frame_Decorator::find_parent_table($this->_frame);
     $cellmap = $table->get_cellmap();
@@ -84,11 +83,11 @@ 
 
     $this->_frame->set_position($cellmap->get_frame_position($this->_frame));
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_min_max_width() {
+    function get_min_max_width() {
     throw new DOMPDF_Exception("Min/max width is undefined for table rows");
-  }
+    }
 }

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

Indentation +61 added lines, -62 removed lines

@@ -1,47 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: list_bullet_frame_decorator.cls.php,v $
- * Created on: 2004-06-23
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
-
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 20090622
- * - bullet size proportional to font size, center position
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: list_bullet_frame_decorator.cls.php,v $
+     * Created on: 2004-06-23
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 20090622
+     * - bullet size proportional to font size, center position
+     */
 
 /* $Id: list_bullet_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -53,42 +52,42 @@ 
  */
 class List_Bullet_Frame_Decorator extends Frame_Decorator {
 
-  const BULLET_PADDING = 1; // Distance from bullet to text in pt
-  // As fraction of font size (including descent). See also DECO_THICKNESS.
-  const BULLET_THICKNESS = 0.04;   // Thickness of bullet outline. Screen: 0.08, print: better less, e.g. 0.04
-  const BULLET_DESCENT = 0.3;  //descent of font below baseline. Todo: Guessed for now.
-  const BULLET_SIZE = 0.35;   // bullet diameter. For now 0.5 of font_size without descent.
+    const BULLET_PADDING = 1; // Distance from bullet to text in pt
+    // As fraction of font size (including descent). See also DECO_THICKNESS.
+    const BULLET_THICKNESS = 0.04;   // Thickness of bullet outline. Screen: 0.08, print: better less, e.g. 0.04
+    const BULLET_DESCENT = 0.3;  //descent of font below baseline. Todo: Guessed for now.
+    const BULLET_SIZE = 0.35;   // bullet diameter. For now 0.5 of font_size without descent.
   
-  static $BULLET_TYPES = array("disc", "circle", "square");
+    static $BULLET_TYPES = array("disc", "circle", "square");
   
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
-  }
+    }
   
-  function get_margin_width() {
+    function get_margin_width() {
     $style = $this->_frame->get_style();
     // Small hack to prevent extra indenting of list text on list_style_position === "inside"
     // and on suppressed bullet
     if ( $style->list_style_position === "outside" ||
          $style->list_style_type === "none" )
-      return 0;
+        return 0;
     return $style->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
-  }
+    }
 
-  //hits only on "inset" lists items, to increase height of box
-  function get_margin_height() {
+    //hits only on "inset" lists items, to increase height of box
+    function get_margin_height() {
     return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
-  }
+    }
 
-  function get_width() {
+    function get_width() {
     return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
-  }
+    }
   
-  function get_height() {
+    function get_height() {
     return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 }

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

Indentation +8 added lines, -9 removed lines

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

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