diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index d8b7004..2ab2199 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.1.001 (2010-05-26) + - The problem of blank page after table was fixed. + 5.1.000 (2010-05-25) - This version includes support for CSS (Cascading Style Sheets) (see example n. 61). - The convertHTMLColorToDec() method was improved. diff --git a/README.TXT b/README.TXT index c7ce4f9..b2ae25c 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.1.000 -Release date: 2010-05-25 +Version: 5.1.001 +Release date: 2010-05-26 Author: Nicola Asuni Copyright (c) 2001-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index f8bbacb..484cb1f 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -55,7 +55,7 @@
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 9c8bd9b..e78b0a3 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5548,7 +5548,7 @@ $frame)
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:31 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index bd9eb5b..6304e72 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -80,7 +80,7 @@ Source Location: /tcpdf.php

Version:

@@ -717,7 +717,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.1.000 + version:  5.1.001 link:  http://www.tcpdf.org @@ -7093,7 +7093,7 @@ $firstblock = false])
-

method addHTMLTOC [line 18829]

+

method addHTMLTOC [line 18835]

@@ -7156,7 +7156,7 @@ $correct_align = true])
-

method addHTMLVertSpace [line 17581]

+

method addHTMLVertSpace [line 17587]

@@ -7418,7 +7418,7 @@ $k)
-

method addTOC [line 18679]

+

method addTOC [line 18685]

@@ -8445,7 +8445,7 @@ $h)
-

method closeHTMLTagHandler [line 17191]

+

method closeHTMLTagHandler [line 17197]

@@ -8673,7 +8673,7 @@ $js = false])
-

method commitTransaction [line 18941]

+

method commitTransaction [line 18947]

@@ -8827,7 +8827,7 @@ $s)
-

method convertSVGtMatrix [line 19876]

+

method convertSVGtMatrix [line 19882]

@@ -8977,7 +8977,7 @@ $antialias = false])
-

method copyPage [line 18611]

+

method copyPage [line 18617]

@@ -9193,7 +9193,7 @@ $fill_color = array()])
-

method deletePage [line 18474]

+

method deletePage [line 18480]

@@ -9355,7 +9355,7 @@ $afinish:)
-

method empty_string [line 18995]

+

method empty_string [line 19001]

@@ -9439,7 +9439,7 @@ $tocpage = false])
-

method endSVGElementHandler [line 20903]

+

method endSVGElementHandler [line 20909]

@@ -10039,7 +10039,7 @@ $pagenum = ''])
-

method getBuffer [line 18160]

+

method getBuffer [line 18166]

@@ -10347,7 +10347,7 @@ $size = 0])
-

method getFontBuffer [line 18320]

+

method getFontBuffer [line 18326]

@@ -10724,7 +10724,7 @@ $v)
-

method getGraphicVars [line 18012]

+

method getGraphicVars [line 18018]

@@ -10940,7 +10940,7 @@ $html)
-

method getHTMLUnitToUnits [line 17727]

+

method getHTMLUnitToUnits [line 17733]

@@ -11006,7 +11006,7 @@ $point)
-

method getHyphenPatternsFromTEX [line 19267]

+

method getHyphenPatternsFromTEX [line 19273]

@@ -11051,7 +11051,7 @@ $file)
-

method getImageBuffer [line 18262]

+

method getImageBuffer [line 18268]

@@ -11472,7 +11472,7 @@ $lineWidth = ''])
-

method getObjFilename [line 18092]

+

method getObjFilename [line 18098]

@@ -11582,7 +11582,7 @@ $prefix)
-

method getPageBuffer [line 18203]

+

method getPageBuffer [line 18209]

@@ -11869,7 +11869,7 @@ $pagenum = ''])
-

method getPathPaintOperator [line 19379]

+

method getPathPaintOperator [line 19385]

@@ -12038,7 +12038,7 @@ $mode)
-

method getSpaceString [line 15404]

+

method getSpaceString [line 15406]

@@ -12241,7 +12241,7 @@ $getarray = false])
-

method getSVGTransformMatrix [line 19754]

+

method getSVGTransformMatrix [line 19760]

@@ -12340,7 +12340,7 @@ $css)
-

method getTransformationMatrixProduct [line 19858]

+

method getTransformationMatrixProduct [line 19864]

@@ -12439,7 +12439,7 @@ $mode = 0])
-

method getVectorsAngle [line 20489]

+

method getVectorsAngle [line 20495]

@@ -12683,7 +12683,7 @@ $antialias = false])
-

method hyphenateText [line 19306]

+

method hyphenateText [line 19312]

@@ -12764,7 +12764,7 @@ $charmax = 8])
-

method hyphenateWord [line 19197]

+

method hyphenateWord [line 19203]

@@ -13190,7 +13190,7 @@ $palign = ''])
-

method ImageSVG [line 19470]

+

method ImageSVG [line 19476]

@@ -13328,7 +13328,7 @@ $script)
-

method intToRoman [line 17806]

+

method intToRoman [line 17812]

@@ -14034,7 +14034,7 @@ $y = ''])
-

method movePage [line 18337]

+

method movePage [line 18343]

@@ -14208,7 +14208,7 @@ $maxh = 0])
-

method objclone [line 18984]

+

method objclone [line 18990]

@@ -14281,7 +14281,7 @@ $object)
-

method openHTMLTagHandler [line 16606]

+

method openHTMLTagHandler [line 16612]

@@ -14892,7 +14892,7 @@ $closed)
-

method putHtmlListBullet [line 17871]

+

method putHtmlListBullet [line 17877]

@@ -15111,7 +15111,7 @@ $js = false])
-

method readDiskCache [line 18132]

+

method readDiskCache [line 18138]

@@ -15462,7 +15462,7 @@ $txt = ''])
-

method revstrpos [line 19008]

+

method revstrpos [line 19014]

@@ -15567,7 +15567,7 @@ $length)
-

method rollbackTransaction [line 18955]

+

method rollbackTransaction [line 18961]

@@ -16065,7 +16065,7 @@ $y = ''])
-

method segSVGContentHandler [line 20941]

+

method segSVGContentHandler [line 20947]

@@ -16113,7 +16113,7 @@ $data)
-

method selectColumn [line 19071]

+

method selectColumn [line 19077]

@@ -16152,7 +16152,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 19122]

+

method serializeTCPDFtagParameters [line 19128]

@@ -16365,7 +16365,7 @@ $bc = ''])
-

method SetBooklet [line 17641]

+

method SetBooklet [line 17647]

@@ -16416,7 +16416,7 @@ $outer = -1])
-

method setBuffer [line 18142]

+

method setBuffer [line 18148]

@@ -16536,7 +16536,7 @@ $pad)
-

method setColumnsArray [line 19058]

+

method setColumnsArray [line 19064]

@@ -16974,7 +16974,7 @@ $tint = 100])
-

method setEqualColumns [line 19025]

+

method setEqualColumns [line 19031]

@@ -17274,7 +17274,7 @@ $fontfile = ''])
-

method setFontBuffer [line 18278]

+

method setFontBuffer [line 18284]

@@ -17361,7 +17361,7 @@ $size)
-

method setFontSubBuffer [line 18300]

+

method setFontSubBuffer [line 18306]

@@ -17557,7 +17557,7 @@ $prop = array()])
-

method setGraphicVars [line 18051]

+

method setGraphicVars [line 18057]

@@ -17753,7 +17753,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 17712]

+

method setHtmlLinksStyle [line 17718]

@@ -17798,7 +17798,7 @@ $fontstyle = 'U'])
-

method setHtmlVSpace [line 17681]

+

method setHtmlVSpace [line 17687]

@@ -17837,7 +17837,7 @@ $tagvs)
-

method setImageBuffer [line 18219]

+

method setImageBuffer [line 18225]

@@ -17924,7 +17924,7 @@ $scale)
-

method setImageSubBuffer [line 18242]

+

method setImageSubBuffer [line 18248]

@@ -18321,7 +18321,7 @@ $page = -1])
-

method setListIndentWidth [line 17691]

+

method setListIndentWidth [line 17697]

@@ -18360,7 +18360,7 @@ $width)
-

method setLIsymbol [line 17602]

+

method setLIsymbol [line 17608]

@@ -18459,7 +18459,7 @@ $keepmargins = false])
-

method setOpenCell [line 17701]

+

method setOpenCell [line 17707]

@@ -18615,7 +18615,7 @@ $ury)
-

method setPageBuffer [line 18176]

+

method setPageBuffer [line 18182]

@@ -19012,7 +19012,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 19353]

+

method setRasterizeVectorImages [line 19359]

@@ -19291,7 +19291,7 @@ $subject)
-

method setSVGStyles [line 19915]

+

method setSVGStyles [line 19921]

@@ -19544,7 +19544,7 @@ $color)
-

method setTextRenderingMode [line 19134]

+

method setTextRenderingMode [line 19140]

diff --git a/tcpdf.php b/tcpdf.php index 66abd67..091553c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2010-05-25 +// Last Update : 2010-05-26 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 5.1.000 +// Version : 5.1.001 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. @@ -122,7 +122,7 @@ * @copyright 2002-2010 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 5.1.000 + * @version 5.1.001 */ /** @@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 5.1.000 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 5.1.001 (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 5.1.000 + * @version 5.1.001 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -15276,7 +15276,9 @@ if (!class_exists('TCPDF', false)) { } } if (($dom[$key]['value'] == 'small') OR ($dom[$key]['value'] == 'sup') OR ($dom[$key]['value'] == 'sub')) { - $dom[$key]['fontsize'] = $dom[$key]['fontsize'] * K_SMALL_RATIO; + if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) { + $dom[$key]['fontsize'] = $dom[$key]['fontsize'] * K_SMALL_RATIO; + } } if (($dom[$key]['value'] == 'strong') OR ($dom[$key]['value'] == 'b')) { $dom[$key]['fontstyle'] .= 'B'; @@ -16359,7 +16361,11 @@ if (!class_exists('TCPDF', false)) { } } else { // closing tag + $prev_numpages = $this->numpages; $this->closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney); + if ($prev_numpages > $this->numpages) { + $startlinepage = $this->page; + } } } elseif (strlen($dom[$key]['value']) > 0) { // print list-item @@ -17432,11 +17438,11 @@ if (!class_exists('TCPDF', false)) { $this->cMargin = $this->oldcMargin; } $this->lasth = $this->FontSize * $this->cell_height_ratio; + if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) { + // remove last blank page + $this->deletePage($this->numpages); + } if (isset($this->theadMargins['top'])) { - if (($this->theadMargins['top'] == $this->tMargin) AND ($this->page == ($this->numpages - 1))) { - // remove last page containing only THEAD - $this->deletePage($this->numpages); - } // restore top margin $this->tMargin = $this->theadMargins['top']; $this->pagedim[$this->page]['tm'] = $this->tMargin;
@@ -20454,7 +20454,7 @@ $page = ''])
-

method startSVGElementHandler [line 20512]

+

method startSVGElementHandler [line 20518]

diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 056d786..f654603 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -64,7 +64,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
diff --git a/doc/index.html b/doc/index.html index 056d786..f654603 100644 --- a/doc/index.html +++ b/doc/index.html @@ -64,7 +64,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
@@ -20508,7 +20508,7 @@ $attribs)
-

method startTransaction [line 18924]

+

method startTransaction [line 18930]

diff --git a/doc/errors.html b/doc/errors.html index f343d41..f67f7f3 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Tue, 25 May 2010 19:49:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:36 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 48e116b..d8761e2 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1993,7 +1993,7 @@ top
- Documentation generated on Tue, 25 May 2010 19:49:48 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
@@ -20598,7 +20598,7 @@ $attribs)
-

method SVGPath [line 20171]

+

method SVGPath [line 20177]

diff --git a/doc/elementindex.html b/doc/elementindex.html index e013314..73b6ce4 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1964,7 +1964,7 @@ top
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 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 309ab92..7ffbfb8 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -243,7 +243,7 @@ Unicode Include file for TCPDF.



- Documentation generated on Tue, 25 May 2010 19:49:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:36 +0200 by phpDocumentor 1.4.3
@@ -20649,7 +20649,7 @@ $style = ''])
-

method SVGTransform [line 19896]

+

method SVGTransform [line 19902]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 8a4ee4b..439b0d6 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -79,7 +79,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -110,7 +110,7 @@ unicode data

@@ -20688,7 +20688,7 @@ $tm)
-

method swapMargins [line 17657]

+

method swapMargins [line 17663]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index e66aeb9..0cb1780 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -477,7 +477,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:31 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index c98af34..8ec7b8e 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -94,7 +94,7 @@ Array of WEB safe colors.



- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:31 +0200 by phpDocumentor 1.4.3
@@ -22119,7 +22119,7 @@ $code)
-

method writeDiskCache [line 18104]

+

method writeDiskCache [line 18110]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 012373d..5afd929 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -539,7 +539,7 @@ Configuration file for TCPDF.



- Documentation generated on Tue, 25 May 2010 19:49:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:36 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 5938614..1c54195 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
@@ -22176,7 +22176,7 @@ $file)
-

method writeHTML [line 15448]

+

method writeHTML [line 15450]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 76355fa..77de332 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index b7c5d80..1815df0 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1374,7 +1374,7 @@ $type)
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
@@ -22242,7 +22242,7 @@ $align = ''])
-

method writeHTMLCell [line 15432]

+

method writeHTMLCell [line 15434]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index c3d6d82..ff60c88 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -296,7 +296,7 @@ $type)
- Documentation generated on Tue, 25 May 2010 19:49:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:30 +0200 by phpDocumentor 1.4.3
@@ -25307,7 +25307,7 @@ $file)
- Documentation generated on Tue, 25 May 2010 19:49:50 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:32 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.1.000version:  5.1.001
copyright:  2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- PDF_PRODUCER = 'TCPDF 5.1.000 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.1.001 (http://www.tcpdf.org)'
@@ -121,7 +121,7 @@ unicode data

- Documentation generated on Tue, 25 May 2010 19:49:50 +0200 by phpDocumentor 1.4.3 + Documentation generated on Wed, 26 May 2010 12:21:32 +0200 by phpDocumentor 1.4.3