From f19e03ded62e355ef98c3239ad20491632339167 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Mon, 21 Dec 2009 18:32:21 +0100 Subject: [PATCH] 4.8.020 --- CHANGELOG.TXT | 4 ++++ README.TXT | 4 ++-- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 6 +++--- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +++--- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 14 +++++++------- 16 files changed, 30 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index efc25f9..b5fd914 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.8.020 (2009-12-21) + - Bug item #2918545 "Display problem of the first row of a table with larger font" was fixed. + - A Bug relative to table rowspan mode was fixed. + 4.8.019 (2009-12-16) - Bug item #2915684 "Image size" was fixed. - Bug item #2914995 "Image jpeg quality" was fixed. diff --git a/README.TXT b/README.TXT index ba944bb..54b0f7d 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.8.019 -Release date: 2009-12-16 +Version: 4.8.020 +Release date: 2009-12-21 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 91d4b3a..d50bc72 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index a72a42c..280dad8 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -630,7 +630,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.8.019 + version:  4.8.020 link:  http://www.tcpdf.org @@ -20807,7 +20807,7 @@ $file)
- Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index aab1b60..eb460e4 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 0e9eabe..b797672 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 6850f9d..f8f175a 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -507,7 +507,7 @@ Configuration file for TCPDF.



- Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:14 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index f535368..168915c 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.



- Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index c65b37a..1feb42d 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - version:  4.8.019 + version:  4.8.020 copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com @@ -104,7 +104,7 @@ unicode data

- PDF_PRODUCER = 'TCPDF 4.8.019 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.020 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index d25f26a..82bf3eb 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.



- Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:14 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 7af91ee..30174ff 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1448,7 +1448,7 @@ top
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 66e45f6..22f6a9b 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1471,7 +1471,7 @@ top
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 8fd6645..6a44fb5 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:14 +0100 by phpDocumentor 1.4.3
diff --git a/doc/index.html b/doc/index.html index 490c60d..1a262d8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 490c60d..1a262d8 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 21 Dec 2009 18:32:08 +0100 by phpDocumentor 1.4.3
diff --git a/tcpdf.php b/tcpdf.php index 1d7212c..00e50a3 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-12-16 +// Last Update : 2009-12-21 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.019 +// Version : 4.8.020 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.8.019 + * @version 4.8.020 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.019 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.020 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
* 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.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 4.8.019 + * @version 4.8.020 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -13367,7 +13367,7 @@ if (!class_exists('TCPDF', false)) { } $pask = $next_pask; } - if (($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) { + if (($dom[$key]['value'] != 'tr') AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) { $this->y += (($curfontsize - $fontsize) / $this->k); } $minstartliney = min($this->y, $minstartliney); @@ -14759,7 +14759,7 @@ if (!class_exists('TCPDF', false)) { // update row-spanned cells if (isset($dom[($dom[$key]['parent'])]['rowspans'])) { foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) { - if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] == 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) { + if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] > 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) { $dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy; $dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1; }