32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-25 22:07:33 +00:00
This commit is contained in:
nicolaasuni 2010-05-19 21:31:25 +02:00
parent 46e9bec8d0
commit 0c3b729f12
20 changed files with 334 additions and 310 deletions

View File

@ -1,3 +1,6 @@
5.0.013 (2010-05-19)
- A bug related to page-breaks and table cells was fixed.
5.0.012 (2010-05-19)
- Page orientation bug was fixed.
- The access to method setPageFormat() was changed to 'protected' because it is not intended to be directly called.

View File

@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 5.0.012
Version: 5.0.013
Release date: 2010-05-19
Author: Nicola Asuni

View File

@ -55,7 +55,7 @@
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -5548,7 +5548,7 @@ $frame)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

File diff suppressed because it is too large Load Diff

View File

@ -296,7 +296,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1374,7 +1374,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -539,7 +539,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:43 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -94,7 +94,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -477,7 +477,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -79,7 +79,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.0.012</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.0.013</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>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</td>
@ -110,7 +110,7 @@ unicode data<br /><br /></div>
<div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 5.0.012 (http://www.tcpdf.org)'</code>
<code>PDF_PRODUCER = 'TCPDF 5.0.013 (http://www.tcpdf.org)'</code>
</td></tr></table>
</td></tr></table>
@ -121,7 +121,7 @@ unicode data<br /><br /></div>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:39 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -243,7 +243,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:43 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1956,7 +1956,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1985,7 +1985,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br>
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:43 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -64,7 +64,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -64,7 +64,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Wed, 19 May 2010 18:18:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 19 May 2010 21:31:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -4,7 +4,7 @@
// Begin : 2002-08-03
// Last Update : 2010-05-19
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 5.0.012
// Version : 5.0.013
// 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.0.012
* @version 5.0.013
*/
/**
@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
define('PDF_PRODUCER', 'TCPDF 5.0.012 (http://www.tcpdf.org)');
define('PDF_PRODUCER', 'TCPDF 5.0.013 (http://www.tcpdf.org)');
/**
* This is a PHP class for generating PDF documents without requiring external extensions.<br>
* 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.<br>
* @name TCPDF
* @package com.tecnick.tcpdf
* @version 5.0.012
* @version 5.0.013
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -4207,10 +4207,15 @@ if (!class_exists('TCPDF', false)) {
}
}
}
$this->newline = true;
return true;
}
// account for columns mode
return ($current_page != $this->page);
if ($current_page != $this->page) {
// account for columns mode
$this->newline = true;
return true;
}
return false;
}
/**
@ -4708,9 +4713,13 @@ if (!class_exists('TCPDF', false)) {
} else {
$y = $this->GetY();
}
// check for page break
$this->checkPageBreak($h);
$y = $this->GetY();
$resth = 0;
if ((!$this->InFooter) AND (($y + $h) > $this->PageBreakTrigger)) {
// spit cell in two pages
$newh = $this->PageBreakTrigger - $y;
$resth = $h - $newh; // cell to be printed on the next page
$h = $newh;
}
// get current page number
$startpage = $this->page;
if (!$this->empty_string($x)) {
@ -4768,22 +4777,34 @@ if (!class_exists('TCPDF', false)) {
$currentY = $this->y;
// get latest page number
$endpage = $this->page;
if (($resth > 0) AND ($endpage == $startpage)) {
// add new page to print the remaining cell portion
$this->AddPage();
$currentY = $this->y;
$endpage = $this->page;
}
// check if a new page has been created
if ($endpage > $startpage) {
// design borders around HTML cells.
for ($page=$startpage; $page <= $endpage; ++$page) {
$this->setPage($page);
if ($page == $startpage) {
// first page
$this->y = $starty; // put cursor at the beginning of cell on the first page
$h = $this->getPageHeight() - $starty - $this->getBreakMargin();
$h = $this->h - $starty - $this->bMargin;
$cborder = $this->getBorderMode($border, $position='start');
} elseif ($page == $endpage) {
// last page
$this->y = $this->tMargin; // put cursor at the beginning of last page
$h = $currentY - $this->tMargin;
if ($resth > $h) {
$h = $resth;
}
$cborder = $this->getBorderMode($border, $position='end');
} else {
$this->y = $this->tMargin; // put cursor at the beginning of the current page
$h = $this->getPageHeight() - $this->tMargin - $this->getBreakMargin();
$h = $this->h - $this->tMargin - $this->bMargin;
$resth -= $h;
$cborder = $this->getBorderMode($border, $position='middle');
}
$nx = $x;