From 0e790b9788b96c03bde8f69c2da64598e4ea3d24 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 19 Apr 2011 10:04:33 +0200 Subject: [PATCH] 5.9.069 --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- tcpdf.php | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index d43a3aa..356a73d 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.069 (2011-04-19) + - Bug #3288763 "HTML-Table: non-breaking table rows: Bug" was fixed. + 5.9.068 (2011-04-15) - Bookmark, addTOC and addHTMLTOC methods were improved to include font style and color (Examples 15, 49 and 59 were updated). - Default $_SERVER['DOCUMENT_ROOT'] value on tcpdf_config.php file was changed. diff --git a/README.TXT b/README.TXT index f1afe2e..048d88f 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.068 -Release date: 2011-04-15 +Version: 5.9.069 +Release date: 2011-04-19 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index fe723c1..3a81ecb 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.068 + * @version 5.9.069 */ // 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.068 + * @version 5.9.069 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.068'; + private $tcpdf_version = '5.9.069'; // Protected properties @@ -20599,7 +20599,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: ++$key; if (isset($dom[$key]['tag']) AND $dom[$key]['tag'] AND (!isset($dom[$key]['opening']) OR !$dom[$key]['opening']) AND isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) { // check if we are on a new page or on a new column - if ((!$undo) AND ($this->y < $this->start_transaction_y)) { + if ((!$undo) AND (($this->y < $this->start_transaction_y) OR (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['endy'] < $this->start_transaction_y)))) { // we are on a new page or on a new column and the total object height is less than the available vertical space. // restore previous object $this->rollbackTransaction(true);