From 1fb14f22f3fd37723df4955539e740f8ff2a2b37 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 4 Sep 2011 17:32:47 +0200 Subject: [PATCH] 5.9.114 --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- tcpdf.php | 16 ++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 8dccc8e..03ec0ff 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.114 (2011-09-04) + - A bug related to column position was fixed. + 5.9.113 (2011-08-24) - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under development). diff --git a/README.TXT b/README.TXT index d4fbd7c..89c4e71 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.113 -Release date: 2011-08-24 +Version: 5.9.114 +Release date: 2011-09-04 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index db1759a..4cf93e0 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.113 + * @version 5.9.114 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -148,7 +148,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.113 + * @version 5.9.114 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -159,7 +159,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.113'; + private $tcpdf_version = '5.9.114'; // Protected properties @@ -24662,7 +24662,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $xshift = $this->colxshift; // set X position of the current column by case $listindent = ($this->listindentlevel * $this->listindent); - $colpos = ($col * ($this->columns[$col]['w'] + $this->columns[$col]['s'])); + // calculate column X position + $colpos = 0; + for ($i=0; $i < $col; ++$i) { + $colpos += ($this->columns[$i]['w'] + $this->columns[$i]['s']); + } if ($this->rtl) { $x = $this->w - $this->original_rMargin - $colpos; $this->rMargin = ($this->w - $x + $listindent);