diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 98a1ba9..fcbe87c 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.083 (2011-05-24) + - Bug item #3308387 "line height & SetCellHeightRatio" was fixed. + 5.9.082 (2011-05-22) - Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed. diff --git a/README.TXT b/README.TXT index c4f5aec..bd3adff 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.082 -Release date: 2011-05-22 +Version: 5.9.083 +Release date: 2011-05-27 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index 87aac87..9fee041 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.082 + * @version 5.9.083 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -146,7 +146,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php'); * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.082 + * @version 5.9.083 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.082'; + private $tcpdf_version = '5.9.083'; // Protected properties @@ -571,7 +571,7 @@ class TCPDF { * @protected */ protected $header_xobjid = -1; - + /** * If true reset the Header Xobject template at each page * @protected @@ -19698,10 +19698,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: if ( ($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize) OR ($this->cell_height_ratio != $dom[$key]['line-height']) OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) { - if ((!$this->newline) AND ($key < ($maxel - 1)) - AND ( (is_numeric($fontsize) AND ($fontsize >= 0) AND is_numeric($curfontsize) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize)) - OR ($this->cell_height_ratio != $dom[$key]['line-height'])) - OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) { + if (($key < ($maxel - 1)) AND ( + ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) + OR ($this->cell_height_ratio != $dom[$key]['line-height']) + OR (!$this->newline AND is_numeric($fontsize) AND is_numeric($curfontsize) AND ($fontsize >= 0) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize)) + )) { if ($this->page > $startlinepage) { // fix lines splitted over two pages if (isset($this->footerlen[$startlinepage])) { @@ -24903,9 +24904,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: return array($x, $y); } - // -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- - // SVG METHODS - // -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- + // --- SVG METHODS --------------------------------------------------------- /** * Embedd a Scalable Vector Graphics (SVG) image. @@ -26569,7 +26568,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $this->svgtext .= $data; } - // --- END SVG METHODS ----------------------------- + // --- END SVG METHODS ----------------------------------------------------- } // END OF TCPDF CLASS