diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index ff109ad..d8851f4 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.149 (2012-02-21) + - Bug item #3489933 "SVG Parser treats tspan like text" was fixed. + 5.9.148 (2012-02-17) - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed. diff --git a/README.TXT b/README.TXT index 8852064..d83ebca 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.148 -Release date: 2012-02-17 +Version: 5.9.149 +Release date: 2012-02-21 Author: Nicola Asuni Copyright (c) 2002-2012: diff --git a/tcpdf.php b/tcpdf.php index 9860684..100e481 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.148 + * @version 5.9.149 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -149,7 +149,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.148 + * @version 5.9.149 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -160,7 +160,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.148'; + private $tcpdf_version = '5.9.149'; // Protected properties @@ -28750,9 +28750,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: break; } // print text - $text = $this->stringTrim($this->svgtext); + $text = $this->svgtext; + //$text = $this->stringTrim($text); + $textlen = $this->GetStringWidth($text); if ($this->svgtextmode['text-anchor'] != 'start') { - $textlen = $this->GetStringWidth($text); // check if string is RTL text if ($this->svgtextmode['text-anchor'] == 'end') { if ($this->svgtextmode['rtl']) { @@ -28771,7 +28772,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $textrendermode = $this->textrendermode; $textstrokewidth = $this->textstrokewidth; $this->setTextRenderingMode($this->svgtextmode['stroke'], true, false); - $this->Cell(0, 0, $text, 0, 0, '', false, '', 0, false, 'L', 'T'); + $this->Cell($textlen, 0, $text, 0, 0, '', false, '', 0, false, 'L', 'T'); // restore previous rendering mode $this->textrendermode = $textrendermode; $this->textstrokewidth = $textstrokewidth;