32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-10-31 18:52:35 +00:00
This commit is contained in:
nicolaasuni 2012-02-21 17:13:56 +00:00
parent 953be5bcb2
commit e9ebd692d5
3 changed files with 14 additions and 10 deletions

View File

@ -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) 5.9.148 (2012-02-17)
- Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed. - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.148 Version: 5.9.149
Release date: 2012-02-17 Release date: 2012-02-21
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2012: Copyright (c) 2002-2012:

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.148 // Version : 5.9.149
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2012-02-17 // Last Update : 2012-02-21
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -137,7 +137,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p> * Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @author Nicola Asuni * @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. // 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.<br> * 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.<br>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions. * @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 * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -160,7 +160,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.148'; private $tcpdf_version = '5.9.149';
// Protected properties // Protected properties
@ -28750,9 +28750,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
break; break;
} }
// print text // print text
$text = $this->stringTrim($this->svgtext); $text = $this->svgtext;
//$text = $this->stringTrim($text);
$textlen = $this->GetStringWidth($text);
if ($this->svgtextmode['text-anchor'] != 'start') { if ($this->svgtextmode['text-anchor'] != 'start') {
$textlen = $this->GetStringWidth($text);
// check if string is RTL text // check if string is RTL text
if ($this->svgtextmode['text-anchor'] == 'end') { if ($this->svgtextmode['text-anchor'] == 'end') {
if ($this->svgtextmode['rtl']) { 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; $textrendermode = $this->textrendermode;
$textstrokewidth = $this->textstrokewidth; $textstrokewidth = $this->textstrokewidth;
$this->setTextRenderingMode($this->svgtextmode['stroke'], true, false); $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 // restore previous rendering mode
$this->textrendermode = $textrendermode; $this->textrendermode = $textrendermode;
$this->textstrokewidth = $textstrokewidth; $this->textstrokewidth = $textstrokewidth;