joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2025-04-05 02:41:49 +00:00
Code Issues Releases Activity

5.5.009

Browse Source
This commit is contained in:
nicolaasuni 2010-07-05 12:21:38 +02:00
parent 59efe72b38
commit 439d7d02b0
22 changed files with 585 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,3 +1,7 @@
5.5.009 (2010-07-05)
- A problem related to last page footer was fixed.
- Image alignments and fit-on-page features were improved.
5.5.008 (2010-07-02) 5.5.008 (2010-07-02)
- A problem on table header alignment in booklet mode was fixed. - A problem on table header alignment in booklet mode was fixed.
- Default graphic vars are now applied for setHeader(); - Default graphic vars are now applied for setHeader();

4
README.TXT
View File

@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.5.008 Version: 5.5.009
Release date: 2010-07-02 Release date: 2010-07-05
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2010: Copyright (c) 2002-2010:

2
doc/classtrees_com-tecnick-tcpdf.html
View File

@ -60,7 +60,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/PDF417.html
View File

@ -1003,7 +1003,7 @@ $code)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/QRcode.html
View File

@ -5551,7 +5551,7 @@ $frame)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

788
doc/com-tecnick-tcpdf/TCPDF.html
View File

File diff suppressed because it is too large Load Diff

2
doc/com-tecnick-tcpdf/TCPDF2DBarcode.html
View File

@ -299,7 +299,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/TCPDFBarcode.html
View File

@ -1377,7 +1377,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_2dbarcodes.php.html
View File

@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_barcodes.php.html
View File

@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
View File

@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:56 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:33 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_htmlcolors.php.html
View File

@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_pdf417.php.html
View File

@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_qrcode.php.html
View File

@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

6
doc/com-tecnick-tcpdf/_tcpdf.php.html
View File

@ -82,7 +82,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> <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr> </tr>
<tr> <tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.5.008</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>5.5.009</td>
</tr> </tr>
<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> <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>
@ -113,7 +113,7 @@ unicode data<br /><br /></div>
<div class="tags"> <div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border"> <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"> <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 5.5.008 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 5.5.009 (http://www.tcpdf.org)'</code>
</td></tr></table> </td></tr></table>
</td></tr></table> </td></tr></table>
@ -124,7 +124,7 @@ unicode data<br /><br /></div>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_unicode_data.php.html
View File

@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:56 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:33 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

4
doc/elementindex.html
View File

@ -527,6 +527,8 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$frames">QRcode::$frames</a></dd> <dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$frames">QRcode::$frames</a></dd>
<dt><b>$fwPt</b></dt> <dt><b>$fwPt</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$fwPt">TCPDF::$fwPt</a></dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$fwPt">TCPDF::$fwPt</a></dd>
<dt><b>fitBlock</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodfitBlock">TCPDF::fitBlock()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the block dimensions accounting for page breaks and page/column fitting</dd>
<dt><b>Footer</b></dt> <dt><b>Footer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodFooter">TCPDF::Footer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method is used to render the page footer.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodFooter">TCPDF::Footer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method is used to render the page footer.</dd>
<dt><b>formatPageNumber</b></dt> <dt><b>formatPageNumber</b></dt>
@ -2028,7 +2030,7 @@
<a href="elementindex.html#top">top</a><br> <a href="elementindex.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

4
doc/elementindex_com-tecnick-tcpdf.html
View File

@ -725,6 +725,8 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$frames">QRcode::$frames</a></dd> <dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$frames">QRcode::$frames</a></dd>
<dt><b>$fwPt</b></dt> <dt><b>$fwPt</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$fwPt">TCPDF::$fwPt</a></dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$fwPt">TCPDF::$fwPt</a></dd>
<dt><b>fitBlock</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodfitBlock">TCPDF::fitBlock()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the block dimensions accounting for page breaks and page/column fitting</dd>
<dt><b>Footer</b></dt> <dt><b>Footer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodFooter">TCPDF::Footer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method is used to render the page footer.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodFooter">TCPDF::Footer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method is used to render the page footer.</dd>
<dt><b>formatPageNumber</b></dt> <dt><b>formatPageNumber</b></dt>
@ -2060,7 +2062,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br> <a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/errors.html
View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br> <a href="#Post-parsing">Post-parsing</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:56 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:33 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/index.html
View File

@ -67,7 +67,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/li_com-tecnick-tcpdf.html
View File

@ -67,7 +67,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 02 Jul 2010 16:13:50 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Mon, 05 Jul 2010 12:21:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

263
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.5.008 // Version : 5.5.009
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-07-02 // Last Update : 2010-07-05
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -126,7 +126,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 * @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 * @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL * @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 5.5.008 * @version 5.5.009
*/ */
/** /**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 5.5.008 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 5.5.009 (http://www.tcpdf.org)');
/** /**
* This is a PHP class for generating PDF documents without requiring external extensions.<br> * 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> * 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 * @name TCPDF
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @version 5.5.008 * @version 5.5.009
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org * @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL * @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -3345,6 +3345,9 @@ if (!class_exists('TCPDF', false)) {
if ($this->page == 0) { if ($this->page == 0) {
$this->AddPage(); $this->AddPage();
} }
// save current graphic settings
$gvars = $this->getGraphicVars();
$this->lastpage(); $this->lastpage();
$this->SetAutoPageBreak(false); $this->SetAutoPageBreak(false);
$this->x = 0; $this->x = 0;
@ -3359,6 +3362,8 @@ if (!class_exists('TCPDF', false)) {
$this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B'); $this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B');
$this->setVisibility('all'); $this->setVisibility('all');
$this->_out('Q'); $this->_out('Q');
// restore graphic settings
$this->setGraphicVars($gvars);
// close page // close page
$this->endPage(); $this->endPage();
// close document // close document
@ -3788,7 +3793,7 @@ if (!class_exists('TCPDF', false)) {
if ($this->print_header) { if ($this->print_header) {
$this->setGraphicVars($this->default_graphic_vars); $this->setGraphicVars($this->default_graphic_vars);
$temp_thead = $this->thead; $temp_thead = $this->thead;
$temp_theadMargins = $this->theadMargins; $temp_theadMargins = $this->theadMargins;
$lasth = $this->lasth; $lasth = $this->lasth;
$this->_out('q'); $this->_out('q');
$this->rMargin = $this->original_rMargin; $this->rMargin = $this->original_rMargin;
@ -3829,8 +3834,9 @@ if (!class_exists('TCPDF', false)) {
$this->footerpos[$this->page] = $this->pagelen[$this->page]; $this->footerpos[$this->page] = $this->pagelen[$this->page];
$this->_out("\n"); $this->_out("\n");
if ($this->print_footer) { if ($this->print_footer) {
$this->setGraphicVars($this->default_graphic_vars);
$temp_thead = $this->thead; $temp_thead = $this->thead;
$temp_theadMargins = $this->theadMargins; $temp_theadMargins = $this->theadMargins;
$lasth = $this->lasth; $lasth = $this->lasth;
$this->_out('q'); $this->_out('q');
$this->rMargin = $this->original_rMargin; $this->rMargin = $this->original_rMargin;
@ -6289,6 +6295,61 @@ if (!class_exists('TCPDF', false)) {
return $type; return $type;
} }
/**
* Set the block dimensions accounting for page breaks and page/column fitting
* @param float $w width
* @param float $h height
* @param float $x X coordinate
* @param float $y Y coodiante
* @param boolean $fitonpage if true the block is resized to not exceed page dimensions.
* @access protected
* @since 5.5.009 (2010-07-05)
*/
protected function fitBlock(&$w, &$h, &$x, &$y, $fitonpage=false) {
// resize the block to be vertically contained on a single page or single column
if ($fitonpage OR $this->AutoPageBreak) {
$ratio_wh = ($w / $h);
if ($h > ($this->PageBreakTrigger - $this->tMargin)) {
$h = $this->PageBreakTrigger - $this->tMargin;
$w = ($h * $ratio_wh);
}
// resize the block to be horizontally contained on a single page or single column
if ($fitonpage) {
$maxw = ($this->w - $this->lMargin - $this->rMargin);
if ($w > $maxw) {
$w = $maxw;
$h = ($w / $ratio_wh);
}
}
}
// Check whether we need a new page or new column first as this does not fit
$prev_x = $this->x;
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// resize the block to be contained on the remaining available page or column space
if ($fitonpage) {
$ratio_wh = ($w / $h);
if (($y + $h) > $this->PageBreakTrigger) {
$h = $this->PageBreakTrigger - $y;
$w = ($h * $ratio_wh);
}
if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
$w = $this->w - $this->rMargin - $x;
$h = ($w / $ratio_wh);
} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
$w = $x - $this->lMargin;
$h = ($w / $ratio_wh);
}
}
}
/** /**
* Puts an image in the page. * Puts an image in the page.
* The upper-left corner must be given. * The upper-left corner must be given.
@ -6363,32 +6424,8 @@ if (!class_exists('TCPDF', false)) {
$w = $h * $pixw / $pixh; $w = $h * $pixw / $pixh;
} }
} }
// Check whether we need a new page or new column first as this does not fit // fit the image on available space
$prev_x = $this->x; $this->fitBlock($w, $h, $x, $y, $fitonpage);
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// resize image to be contained on a single page
if ($fitonpage) {
$ratio_wh = $w / $h;
if (($y + $h) > $this->PageBreakTrigger) {
$h = $this->PageBreakTrigger - $y;
$w = $h * $ratio_wh;
}
if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
$w = $this->w - $this->rMargin - $x;
$h = $w / $ratio_wh;
} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
$w = $x - $this->lMargin;
$h = $w / $ratio_wh;
}
}
// calculate new minimum dimensions in pixels // calculate new minimum dimensions in pixels
$neww = round($w * $this->k * $dpi / $this->dpi); $neww = round($w * $this->k * $dpi / $this->dpi);
$newh = round($h * $this->k * $dpi / $this->dpi); $newh = round($h * $this->k * $dpi / $this->dpi);
@ -7071,7 +7108,6 @@ if (!class_exists('TCPDF', false)) {
public function Output($name='doc.pdf', $dest='I') { public function Output($name='doc.pdf', $dest='I') {
//Output PDF to some destination //Output PDF to some destination
//Finish document if necessary //Finish document if necessary
$this->lastpage();
if ($this->state < 3) { if ($this->state < 3) {
$this->Close(); $this->Close();
} }
@ -10366,7 +10402,7 @@ if (!class_exists('TCPDF', false)) {
* <pre> * <pre>
* Encoding UTF-16: * Encoding UTF-16:
* *
* Encoding of a single character from an ISO 10646 character value to * Encoding of a single character from an ISO 10646 character value to
* UTF-16 proceeds as follows. Let U be the character number, no greater * UTF-16 proceeds as follows. Let U be the character number, no greater
* than 0x10FFFF. * than 0x10FFFF.
* *
@ -10795,7 +10831,7 @@ if (!class_exists('TCPDF', false)) {
if (function_exists('mcrypt_decrypt') AND ($out = @mcrypt_decrypt(@MCRYPT_ARCFOUR, $key, $text, @MCRYPT_MODE_STREAM))) { if (function_exists('mcrypt_decrypt') AND ($out = @mcrypt_decrypt(@MCRYPT_ARCFOUR, $key, $text, @MCRYPT_MODE_STREAM))) {
// try to use mcrypt function if exist // try to use mcrypt function if exist
return $out; return $out;
} }
if ($this->last_enc_key != $key) { if ($this->last_enc_key != $key) {
$k = str_repeat($key, ((256 / strlen($key)) + 1)); $k = str_repeat($key, ((256 / strlen($key)) + 1));
$rc4 = range(0, 255); $rc4 = range(0, 255);
@ -10990,7 +11026,7 @@ if (!class_exists('TCPDF', false)) {
// store signature on recipients array // store signature on recipients array
$this->encryptdata['Recipients'][] = $hexsignature; $this->encryptdata['Recipients'][] = $hexsignature;
// The bytes of each item in the Recipients array of PKCS#7 objects in the order in which they appear in the array // The bytes of each item in the Recipients array of PKCS#7 objects in the order in which they appear in the array
$recipient_bytes .= $signature; $recipient_bytes .= $signature;
} }
// calculate encryption key // calculate encryption key
$this->encryptdata['key'] = substr(sha1($seed.$recipient_bytes, true), 0, $keybytelen); $this->encryptdata['key'] = substr(sha1($seed.$recipient_bytes, true), 0, $keybytelen);
@ -14281,7 +14317,7 @@ if (!class_exists('TCPDF', false)) {
/** /**
* Returns the string alias used for the total number of pages. * Returns the string alias used for the total number of pages.
* If the current font is unicode type, the returned string is surrounded by additional curly braces. * If the current font is unicode type, the returned string is surrounded by additional curly braces.
* @return string * @return string
* @access public * @access public
* @since 4.0.018 (2008-08-08) * @since 4.0.018 (2008-08-08)
@ -14290,7 +14326,7 @@ if (!class_exists('TCPDF', false)) {
public function getAliasNbPages() { public function getAliasNbPages() {
if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
return '{'.$this->AliasNbPages.'}'; return '{'.$this->AliasNbPages.'}';
} }
return $this->AliasNbPages; return $this->AliasNbPages;
} }
@ -14309,7 +14345,7 @@ if (!class_exists('TCPDF', false)) {
/** /**
* Returns the string alias used for the page number. * Returns the string alias used for the page number.
* If the current font is unicode type, the returned string is surrounded by additional curly braces. * If the current font is unicode type, the returned string is surrounded by additional curly braces.
* @return string * @return string
* @access public * @access public
* @since 4.5.000 (2009-01-02) * @since 4.5.000 (2009-01-02)
@ -14318,7 +14354,7 @@ if (!class_exists('TCPDF', false)) {
public function getAliasNumPage() { public function getAliasNumPage() {
if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
return '{'.$this->AliasNumPage.'}'; return '{'.$this->AliasNumPage.'}';
} }
return $this->AliasNumPage; return $this->AliasNumPage;
} }
@ -14340,11 +14376,11 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function getGroupPageNoFormatted() { public function getGroupPageNoFormatted() {
return $this->formatPageNumber($this->getGroupPageNo()); return $this->formatPageNumber($this->getGroupPageNo());
} }
/** /**
* Return the alias of the current page group * Return the alias of the current page group
* If the current font is unicode type, the returned string is surrounded by additional curly braces. * If the current font is unicode type, the returned string is surrounded by additional curly braces.
* (will be replaced by the total number of pages in this group). * (will be replaced by the total number of pages in this group).
* @return alias of the current page group * @return alias of the current page group
* @access public * @access public
@ -14353,13 +14389,13 @@ if (!class_exists('TCPDF', false)) {
public function getPageGroupAlias() { public function getPageGroupAlias() {
if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
return '{'.$this->currpagegroup.'}'; return '{'.$this->currpagegroup.'}';
} }
return $this->currpagegroup; return $this->currpagegroup;
} }
/** /**
* Return the alias for the page number on the current page group * Return the alias for the page number on the current page group
* If the current font is unicode type, the returned string is surrounded by additional curly braces. * If the current font is unicode type, the returned string is surrounded by additional curly braces.
* (will be replaced by the total number of pages in this group). * (will be replaced by the total number of pages in this group).
* @return alias of the current page group * @return alias of the current page group
* @access public * @access public
@ -14368,7 +14404,7 @@ if (!class_exists('TCPDF', false)) {
public function getPageNumGroupAlias() { public function getPageNumGroupAlias() {
if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
return '{'.str_replace('{nb', '{pnb', $this->currpagegroup).'}'; return '{'.str_replace('{nb', '{pnb', $this->currpagegroup).'}';
} }
return str_replace('{nb', '{pnb', $this->currpagegroup); return str_replace('{nb', '{pnb', $this->currpagegroup);
} }
@ -14395,7 +14431,7 @@ if (!class_exists('TCPDF', false)) {
return number_format((float)$num, 0, '', '.'); return number_format((float)$num, 0, '', '.');
} }
/** /**
* Returns the current page number formatted as a string. * Returns the current page number formatted as a string.
* @access public * @access public
* @since 4.2.005 (2008-11-06) * @since 4.2.005 (2008-11-06)
@ -14403,9 +14439,9 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function PageNoFormatted() { public function PageNoFormatted() {
return $this->formatPageNumber($this->PageNo()); return $this->formatPageNumber($this->PageNo());
} }
/** /**
* Put visibility settings. * Put visibility settings.
* @access protected * @access protected
* @since 3.0.000 (2008-03-27) * @since 3.0.000 (2008-03-27)
@ -15362,32 +15398,8 @@ if (!class_exists('TCPDF', false)) {
} elseif ($h <= 0) { } elseif ($h <= 0) {
$h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k)); $h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k));
} }
// Check whether we need a new page or new column first as this does not fit // fit the image on available space
$prev_x = $this->x; $this->fitBlock($w, $h, $x, $y, $fitonpage);
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// resize image to be contained on a single page
if ($fitonpage) {
$ratio_wh = $w / $h;
if (($y + $h) > $this->PageBreakTrigger) {
$h = $this->PageBreakTrigger - $y;
$w = $h * $ratio_wh;
}
if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
$w = $this->w - $this->rMargin - $x;
$h = $w / $ratio_wh;
} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
$w = $x - $this->lMargin;
$h = $w / $ratio_wh;
}
}
if ($this->rasterize_vector_images) { if ($this->rasterize_vector_images) {
// convert EPS to raster image using GD or ImageMagick libraries // convert EPS to raster image using GD or ImageMagick libraries
return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage); return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
@ -15680,17 +15692,8 @@ if (!class_exists('TCPDF', false)) {
// maximum bar height // maximum bar height
$barh = $h; $barh = $h;
$h += $extraspace; $h += $extraspace;
// Check whether we need a new page or new column first as this does not fit // fit the barcode on available space
$prev_x = $this->x; $this->fitBlock($w, $h, $x, $y, false);
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// set alignment // set alignment
$this->img_rb_y = $y + $h; $this->img_rb_y = $y + $h;
// set alignment // set alignment
@ -15969,17 +15972,8 @@ if (!class_exists('TCPDF', false)) {
$style['vpadding'] = ($h - $bh) / (2 * $ch); $style['vpadding'] = ($h - $bh) / (2 * $ch);
} }
} }
// Check whether we need a new page or new column first as this does not fit // fit the barcode on available space
$prev_x = $this->x; $this->fitBlock($w, $h, $x, $y, false);
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// set alignment // set alignment
$this->img_rb_y = $y + $h; $this->img_rb_y = $y + $h;
// set alignment // set alignment
@ -17326,6 +17320,7 @@ if (!class_exists('TCPDF', false)) {
$startlinepos = $this->cntmrk[$this->page]; $startlinepos = $this->cntmrk[$this->page];
$startlinepage = $this->page; $startlinepage = $this->page;
$startliney = $this->y; $startliney = $this->y;
$this->newline = false;
} }
$this->y += ((($curfontsize * $this->cell_height_ratio / $this->k) + $curfontascent - $curfontdescent) / 2) - $imgh; $this->y += ((($curfontsize * $this->cell_height_ratio / $this->k) + $curfontascent - $curfontdescent) / 2) - $imgh;
$minstartliney = min($this->y, $minstartliney); $minstartliney = min($this->y, $minstartliney);
@ -19360,7 +19355,7 @@ if (!class_exists('TCPDF', false)) {
$this->tagvspaces = $tagvs; $this->tagvspaces = $tagvs;
} }
/** /**
* Set custom width for list indentation. * Set custom width for list indentation.
* @param float $width width of the indentation. Use negative value to disable it. * @param float $width width of the indentation. Use negative value to disable it.
* @access public * @access public
@ -19368,9 +19363,9 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function setListIndentWidth($width) { public function setListIndentWidth($width) {
return $this->customlistindent = floatval($width); return $this->customlistindent = floatval($width);
} }
/** /**
* Set the top/bottom cell sides to be open or closed when the cell cross the page. * Set the top/bottom cell sides to be open or closed when the cell cross the page.
* @param boolean $isopen if true keeps the top/bottom border open for the cell sides that cross the page. * @param boolean $isopen if true keeps the top/bottom border open for the cell sides that cross the page.
* @access public * @access public
@ -19378,9 +19373,9 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function setOpenCell($isopen) { public function setOpenCell($isopen) {
$this->opencell = $isopen; $this->opencell = $isopen;
} }
/** /**
* Set the color and font style for HTML links. * Set the color and font style for HTML links.
* @param array $color RGB array of colors * @param array $color RGB array of colors
* @param string $fontstyle additional font styles to add * @param string $fontstyle additional font styles to add
@ -19390,9 +19385,9 @@ if (!class_exists('TCPDF', false)) {
public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') { public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
$this->htmlLinkColorArray = $color; $this->htmlLinkColorArray = $color;
$this->htmlLinkFontStyle = $fontstyle; $this->htmlLinkFontStyle = $fontstyle;
} }
/** /**
* Convert HTML string containing value and unit of measure to user's units or points. * Convert HTML string containing value and unit of measure to user's units or points.
* @param string $htmlval string containing values and unit * @param string $htmlval string containing values and unit
* @param string $refsize reference value in points * @param string $refsize reference value in points
@ -19402,7 +19397,7 @@ if (!class_exists('TCPDF', false)) {
* @access public * @access public
* @since 4.4.004 (2008-12-10) * @since 4.4.004 (2008-12-10)
*/ */
public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) { public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt'); $supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
$retval = 0; $retval = 0;
$value = 0; $value = 0;
@ -19566,8 +19561,8 @@ if (!class_exists('TCPDF', false)) {
// set default list type for ordered list // set default list type for ordered list
$listtype = 'decimal'; $listtype = 'decimal';
} }
switch ($listtype) { switch ($listtype) {
// unordered types // unordered types
case 'none': { case 'none': {
break; break;
} }
@ -19685,7 +19680,7 @@ if (!class_exists('TCPDF', false)) {
$this->lispacer = '^'; $this->lispacer = '^';
} }
/** /**
* Returns current graphic variables as array. * Returns current graphic variables as array.
* @return array graphic variables * @return array graphic variables
* @access protected * @access protected
@ -19724,7 +19719,7 @@ if (!class_exists('TCPDF', false)) {
return $grapvars; return $grapvars;
} }
/** /**
* Set graphic variables. * Set graphic variables.
* @param $gvars array graphic variables * @param $gvars array graphic variables
* @access protected * @access protected
@ -19775,7 +19770,7 @@ if (!class_exists('TCPDF', false)) {
return tempnam(K_PATH_CACHE, $name.'_'); return tempnam(K_PATH_CACHE, $name.'_');
} }
/** /**
* Writes data to a temporary file on filesystem. * Writes data to a temporary file on filesystem.
* @param string $file file name * @param string $file file name
* @param mixed $data data to write on file * @param mixed $data data to write on file
@ -19804,7 +19799,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Read data from a temporary file on filesystem. * Read data from a temporary file on filesystem.
* @param string $file file name * @param string $file file name
* @return mixed retrieved data * @return mixed retrieved data
@ -19851,7 +19846,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Get buffer content. * Get buffer content.
* @return string buffer content * @return string buffer content
* @access protected * @access protected
@ -19865,7 +19860,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Set page buffer content. * Set page buffer content.
* @param int $page page number * @param int $page page number
* @param string $data page data * @param string $data page data
@ -19893,7 +19888,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Get page buffer content. * Get page buffer content.
* @param int $page page number * @param int $page page number
* @return string page buffer content or false in case of error * @return string page buffer content or false in case of error
@ -19909,7 +19904,7 @@ if (!class_exists('TCPDF', false)) {
return false; return false;
} }
/** /**
* Set image buffer content. * Set image buffer content.
* @param string $image image key * @param string $image image key
* @param array $data image data * @param array $data image data
@ -19931,7 +19926,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Set image buffer content for a specified sub-key. * Set image buffer content for a specified sub-key.
* @param string $image image key * @param string $image image key
* @param string $key image sub-key * @param string $key image sub-key
@ -19952,7 +19947,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Get image buffer content. * Get image buffer content.
* @param string $image image key * @param string $image image key
* @return string image buffer content or false in case of error * @return string image buffer content or false in case of error
@ -19989,7 +19984,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Set font buffer content. * Set font buffer content.
* @param string $font font key * @param string $font font key
* @param string $key font sub-key * @param string $key font sub-key
@ -20010,7 +20005,7 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/** /**
* Get font buffer content. * Get font buffer content.
* @param string $font font key * @param string $font font key
* @return string font buffer content or false in case of error * @return string font buffer content or false in case of error
@ -20164,7 +20159,7 @@ if (!class_exists('TCPDF', false)) {
return true; return true;
} }
/** /**
* Remove the specified page. * Remove the specified page.
* @param int $page page to remove * @param int $page page to remove
* @return true in case of success, false in case of error. * @return true in case of success, false in case of error.
@ -21277,32 +21272,8 @@ if (!class_exists('TCPDF', false)) {
} elseif ($h <= 0) { } elseif ($h <= 0) {
$h = $w * $oh / $ow; $h = $w * $oh / $ow;
} }
// Check whether we need a new page or new column first as this does not fit // fit the image on available space
$prev_x = $this->x; $this->fitBlock($w, $h, $x, $y, $fitonpage);
$prev_y = $this->y;
if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
$y = $this->y;
if ($this->rtl) {
$x += ($prev_x - $this->x);
} else {
$x += ($this->x - $prev_x);
}
}
// resize image to be contained on a single page
if ($fitonpage) {
$ratio_wh = $w / $h;
if (($y + $h) > $this->PageBreakTrigger) {
$h = $this->PageBreakTrigger - $y;
$w = $h * $ratio_wh;
}
if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
$w = $this->w - $this->rMargin - $x;
$h = $w / $ratio_wh;
} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
$w = $x - $this->lMargin;
$h = $w / $ratio_wh;
}
}
if ($this->rasterize_vector_images) { if ($this->rasterize_vector_images) {
// convert SVG to raster image using GD or ImageMagick libraries // convert SVG to raster image using GD or ImageMagick libraries
return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false); return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);