From 5f7712d1b1d90f8f122f608e0789a84c3fc003fd Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 15 Mar 2011 17:59:04 +0100 Subject: [PATCH] 5.9.061 --- CHANGELOG.TXT | 4 ++++ README.TXT | 4 ++-- tcpdf.php | 18 ++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 1b96279..7d7b38e 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.9.061 (2011-03-15) + - Bug item #3213488 "wrong function call in function Write" was fixed. + - Bug item #3203007 "list element with black background" was fixed. + 5.9.060 (2011-03-08) - addTOC() method was fixed for text alignment problems. diff --git a/README.TXT b/README.TXT index 7b5ef2f..27ce592 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.060 -Release date: 2011-03-08 +Version: 5.9.061 +Release date: 2011-03-15 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index 85acc68..c283be0 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.060 + * @version 5.9.061 */ // 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.060 + * @version 5.9.061 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.060'; + private $tcpdf_version = '5.9.061'; // Protected properties @@ -6604,7 +6604,7 @@ class TCPDF { $rtlmode = false; } // get a char width - $chrwidth = $this->GetCharWidth('.'); + $chrwidth = $this->GetCharWidth(46); // dot character // get array of unicode values $chars = $this->UTF8StringToArray($s); // get array of chars @@ -22370,7 +22370,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: protected function putHtmlListBullet($listdepth, $listtype='', $size=10) { $size /= $this->k; $fill = ''; + $bgcolor = $this->bgcolor; $color = $this->fgcolor; + $strokecolor = $this->strokecolor; $width = 0; $textitem = ''; $tmpx = $this->x; @@ -22542,6 +22544,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: } $this->x = $tmpx; $this->lispacer = '^'; + // restore colors + $this->SetFillColorArray($bgcolor); + $this->SetDrawColorArray($strokecolor); + $this->SettextColorArray($color); } /**