diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index d81d405..fd49a4c 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.7.002 (2010-08-06) + - Methods copyPage(), movePage() and deletePage() were changed to account for internal markings. + 5.7.001 (2010-08-05) - Bug #3040105 "Broken PDF when using TOC (example 45)" was fixed. diff --git a/README.TXT b/README.TXT index 1fcd21d..1994d13 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.7.001 -Release date: 2010-08-05 +Version: 5.7.002 +Release date: 2010-08-06 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 0342550..ab5c737 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index f10dd6a..b83cf92 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:05 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 5012f36..e62e8eb 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:05 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index bc058d3..79c5667 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

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

method addHTMLTOC [line 21181]

+

method addHTMLTOC [line 21195]

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

method addTOC [line 21031]

+

method addTOC [line 21045]

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

method commitTransaction [line 21293]

+

method commitTransaction [line 21307]

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

method convertSVGtMatrix [line 22249]

+

method convertSVGtMatrix [line 22263]

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

method copyPage [line 20963]

+

method copyPage [line 20975]

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

method deletePage [line 20826]

+

method deletePage [line 20832]

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

method empty_string [line 21347]

+

method empty_string [line 21361]

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

method endSVGElementHandler [line 23275]

+

method endSVGElementHandler [line 23289]

@@ -10442,7 +10442,7 @@ $char)
-

method getColumn [line 21475]

+

method getColumn [line 21489]

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

method getFontSubsetting [line 21831]

+

method getFontSubsetting [line 21845]

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

method getHyphenPatternsFromTEX [line 21631]

+

method getHyphenPatternsFromTEX [line 21645]

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

method getPathPaintOperator [line 21743]

+

method getPathPaintOperator [line 21757]

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

method getSVGTransformMatrix [line 22127]

+

method getSVGTransformMatrix [line 22141]

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

method getTransformationMatrixProduct [line 22231]

+

method getTransformationMatrixProduct [line 22245]

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

method getVectorsAngle [line 22861]

+

method getVectorsAngle [line 22875]

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

method hyphenateText [line 21670]

+

method hyphenateText [line 21684]

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

method hyphenateWord [line 21561]

+

method hyphenateWord [line 21575]

@@ -13590,7 +13590,7 @@ $palign)
-

method ImageSVG [line 21856]

+

method ImageSVG [line 21870]

@@ -14620,7 +14620,7 @@ $fitcell = false])
-

method objclone [line 21336]

+

method objclone [line 21350]

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

method revstrpos [line 21360]

+

method revstrpos [line 21374]

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

method rollbackTransaction [line 21307]

+

method rollbackTransaction [line 21321]

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

method segSVGContentHandler [line 23314]

+

method segSVGContentHandler [line 23328]

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

method selectColumn [line 21423]

+

method selectColumn [line 21437]

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

method serializeTCPDFtagParameters [line 21486]

+

method serializeTCPDFtagParameters [line 21500]

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

method setColumnsArray [line 21410]

+

method setColumnsArray [line 21424]

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

method setEqualColumns [line 21377]

+

method setEqualColumns [line 21391]

diff --git a/tcpdf.php b/tcpdf.php index 13a875c..b0a1a0c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * 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.7.001 + * @version 5.7.002 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3355,7 +3355,7 @@ if (!class_exists('TCPDF', false)) { * @see getPage(), lastpage(), getNumPages() */ public function setPage($pnum, $resetmargins=false) { - if (($pnum == $this->page) AND (!$resetmargins)) { + if (($pnum == $this->page) AND ($this->state == 2)) { return; } if (($pnum > 0) AND ($pnum <= $this->numpages)) { @@ -20699,6 +20699,8 @@ if (!class_exists('TCPDF', false)) { $tmppagedim = $this->pagedim[$frompage]; $tmppagelen = $this->pagelen[$frompage]; $tmpintmrk = $this->intmrk[$frompage]; + $tmpbordermrk = $this->bordermrk[$frompage]; + $tmpcntmrk = $this->cntmrk[$frompage]; if (isset($this->footerpos[$frompage])) { $tmpfooterpos = $this->footerpos[$frompage]; } @@ -20721,6 +20723,8 @@ if (!class_exists('TCPDF', false)) { $this->pagedim[$i] = $this->pagedim[$j]; $this->pagelen[$i] = $this->pagelen[$j]; $this->intmrk[$i] = $this->intmrk[$j]; + $this->bordermrk[$i] = $this->bordermrk[$j]; + $this->cntmrk[$i] = $this->cntmrk[$j]; if (isset($this->footerpos[$j])) { $this->footerpos[$i] = $this->footerpos[$j]; } elseif (isset($this->footerpos[$i])) { @@ -20751,6 +20755,8 @@ if (!class_exists('TCPDF', false)) { $this->pagedim[$topage] = $tmppagedim; $this->pagelen[$topage] = $tmppagelen; $this->intmrk[$topage] = $tmpintmrk; + $this->bordermrk[$topage] = $tmpbordermrk; + $this->cntmrk[$topage] = $tmpcntmrk; if (isset($tmpfooterpos)) { $this->footerpos[$topage] = $tmpfooterpos; } elseif (isset($this->footerpos[$topage])) { @@ -20832,6 +20838,8 @@ if (!class_exists('TCPDF', false)) { unset($this->pagedim[$page]); unset($this->pagelen[$page]); unset($this->intmrk[$page]); + unset($this->bordermrk[$page]); + unset($this->cntmrk[$page]); if (isset($this->footerpos[$page])) { unset($this->footerpos[$page]); } @@ -20858,6 +20866,8 @@ if (!class_exists('TCPDF', false)) { $this->pagedim[$i] = $this->pagedim[$j]; $this->pagelen[$i] = $this->pagelen[$j]; $this->intmrk[$i] = $this->intmrk[$j]; + $this->bordermrk[$i] = $this->bordermrk[$j]; + $this->cntmrk[$i] = $this->cntmrk[$j]; if (isset($this->footerpos[$j])) { $this->footerpos[$i] = $this->footerpos[$j]; } elseif (isset($this->footerpos[$i])) { @@ -20894,6 +20904,8 @@ if (!class_exists('TCPDF', false)) { unset($this->pagedim[$this->numpages]); unset($this->pagelen[$this->numpages]); unset($this->intmrk[$this->numpages]); + unset($this->bordermrk[$this->numpages]); + unset($this->cntmrk[$this->numpages]); if (isset($this->footerpos[$this->numpages])) { unset($this->footerpos[$this->numpages]); } @@ -20979,6 +20991,8 @@ if (!class_exists('TCPDF', false)) { $this->pagedim[$this->page] = $this->pagedim[$page]; $this->pagelen[$this->page] = $this->pagelen[$page]; $this->intmrk[$this->page] = $this->intmrk[$page]; + $this->bordermrk[$this->page] = $this->bordermrk[$page]; + $this->cntmrk[$this->page] = $this->cntmrk[$page]; $this->pageopen[$this->page] = false; if (isset($this->footerpos[$page])) { $this->footerpos[$this->page] = $this->footerpos[$page];
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 0212dee..54ad4a0 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
@@ -17896,7 +17896,7 @@ $data)
-

method setFontSubsetting [line 21820]

+

method setFontSubsetting [line 21834]

diff --git a/doc/index.html b/doc/index.html index 0212dee..54ad4a0 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 77d1280..28f7d44 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:10 +0200 by phpDocumentor 1.4.3
@@ -19556,7 +19556,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 21717]

+

method setRasterizeVectorImages [line 21731]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index c5ffd0f..c955aa3 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2060,7 +2060,7 @@ top
- Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index fd34c0e..bd1691e 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2028,7 +2028,7 @@ top
- Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
@@ -19904,7 +19904,7 @@ $subject)
-

method setSVGStyles [line 22288]

+

method setSVGStyles [line 22302]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 99c6206..04e56f5 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.



- Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:10 +0200 by phpDocumentor 1.4.3
@@ -20157,7 +20157,7 @@ $color)
-

method setTextRenderingMode [line 21498]

+

method setTextRenderingMode [line 21512]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 8c5dc9e..2233e27 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -113,7 +113,7 @@ unicode data

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 05eadff..b1fc2b3 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:05 +0200 by phpDocumentor 1.4.3
@@ -21067,7 +21067,7 @@ $page = ''])
-

method startSVGElementHandler [line 22884]

+

method startSVGElementHandler [line 22898]

diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 8f01c75..ea97343 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:05 +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 b82fdb2..b2ed1a0 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:05 +0200 by phpDocumentor 1.4.3
@@ -21121,7 +21121,7 @@ $attribs)
-

method startTransaction [line 21276]

+

method startTransaction [line 21290]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index a7423d7..8294b37 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.



- Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:10 +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 10f784d..99111eb 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
@@ -21211,7 +21211,7 @@ $attribs)
-

method SVGPath [line 22543]

+

method SVGPath [line 22557]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index c05177f..d017c10 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index fa9f617..3a6b2b2 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
@@ -21262,7 +21262,7 @@ $style = ''])
-

method SVGTransform [line 22269]

+

method SVGTransform [line 22283]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 009a31d..fa5c5fe 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:04 +0200 by phpDocumentor 1.4.3
@@ -26255,7 +26255,7 @@ $file)
- Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:06 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.7.001version:  5.7.002
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.7.001 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.7.002 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 06 Aug 2010 11:53:06 +0200 by phpDocumentor 1.4.3