diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 77b7ebb..e4a14ce 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.051 (2011-02-12) + - "Commas at beginning of new lines" problem was fixed. + 5.9.050 (2011-02-11) - Bug #3177606 "SVG Bar chart error" was fixed. diff --git a/README.TXT b/README.TXT index edd0ff7..f6752a2 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.050 -Release date: 2011-02-11 +Version: 5.9.051 +Release date: 2011-02-12 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index b685ba7..ac2e3a6 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.050 + * @version 5.9.051 */ // 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.050 + * @version 5.9.051 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.050'; + private $tcpdf_version = '5.9.051'; // Protected properties @@ -20286,7 +20286,6 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $hrefcolor, $hrefstyle, true); } else { $wadj = 0; // space to leave for block continuity - $adjblks = 0; // number of blocks if ($this->rtl) { $cwa = $this->x - $this->lMargin; } else { @@ -20312,11 +20311,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $same_textdir = ($dom[$nkey]['dir'] == $dom[$key]['dir']); } else { $nextstr = preg_split('/'.$this->re_space['p'].'+/'.$this->re_space['m'], $dom[$nkey]['value']); - if (isset($nextstr[0])) { - if ($same_textdir) { - $wadj += $this->GetStringWidth($nextstr[0], $tmp_fontname, $tmp_fontstyle, $tmp_fontsize); - } - ++$adjblks; + if (isset($nextstr[0]) AND $same_textdir) { + $wadj += $this->GetStringWidth($nextstr[0], $tmp_fontname, $tmp_fontstyle, $tmp_fontsize); } if (isset($nextstr[1])) { $write_block = false; @@ -20325,6 +20321,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: ++$nkey; } } + if (($wadj > 0) AND (($strlinelen + $wadj) >= $cwa)) { + $nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $dom[$key]['value'], 2); + if (isset($nextstr[0])) { + $wadj = ($cwa - $this->GetStringWidth($nextstr[0])); + } + } // check for reversed text direction if (($wadj > 0) AND (($this->rtl AND ($this->tmprtl === 'L')) OR (!$this->rtl AND ($this->tmprtl === 'R')))) { // LTR text on RTL direction or RTL text on LTR direction