mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-22 12:55:10 +00:00
5.8.006
This commit is contained in:
nicolaasuni
parent
79fcfc99aa
commit
66a14e4365
@ -1,3 +1,6 @@
|
||||
5.8.006 (2010-08-17)
|
||||
- A bug affecting HTML table nesting was fixed.
|
||||
|
||||
5.8.005 (2010-08-17)
|
||||
- A bug affecting the HTML 'select' tag in certain conditions was fixed.
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ http: sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 5.8.005
|
||||
Version: 5.8.006
|
||||
Release date: 2010-08-17
|
||||
Author: Nicola Asuni
|
||||
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1003,7 +1003,7 @@ $code)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -5551,7 +5551,7 @@ $frame)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +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
@ -299,7 +299,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1377,7 +1377,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:16 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>version:</b> </td><td>5.8.005</td>
|
||||
<td><b>version:</b> </td><td>5.8.006</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>copyright:</b> </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">
|
||||
<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.8.005 (http://www.tcpdf.org)'</code>
|
||||
<code>PDF_PRODUCER = 'TCPDF 5.8.006 (http://www.tcpdf.org)'</code>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
|
||||
@ -124,7 +124,7 @@ unicode data<br /><br /></div>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:16 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1103,8 +1103,6 @@
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$objcopy">TCPDF::$objcopy</a><br> Used to store a cloned copy of the current class object</dd>
|
||||
<dt><b>$offsets</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$offsets">TCPDF::$offsets</a></dd>
|
||||
<dt><b>$oldcMargin</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$oldcMargin">TCPDF::$oldcMargin</a></dd>
|
||||
<dt><b>$opencell</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$opencell">TCPDF::$opencell</a></dd>
|
||||
<dt><b>$openMarkedContent</b></dt>
|
||||
@ -2042,7 +2040,7 @@
|
||||
<a href="elementindex.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1297,8 +1297,6 @@
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$objcopy">TCPDF::$objcopy</a><br> Used to store a cloned copy of the current class object</dd>
|
||||
<dt><b>$offsets</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$offsets">TCPDF::$offsets</a></dd>
|
||||
<dt><b>$oldcMargin</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$oldcMargin">TCPDF::$oldcMargin</a></dd>
|
||||
<dt><b>$opencell</b></dt>
|
||||
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$opencell">TCPDF::$opencell</a></dd>
|
||||
<dt><b>$openMarkedContent</b></dt>
|
||||
@ -2074,7 +2072,7 @@
|
||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<a href="#Post-parsing">Post-parsing</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Tue, 17 Aug 2010 14:14:16 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -67,7 +67,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 Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -67,7 +67,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 Tue, 17 Aug 2010 14:14:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Tue, 17 Aug 2010 17:40:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
45
tcpdf.php
45
tcpdf.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 5.8.005
|
||||
// Version : 5.8.006
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2010-08-17
|
||||
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||
@ -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
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
* @version 5.8.005
|
||||
* @version 5.8.006
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
|
||||
/**
|
||||
* define default PDF document producer
|
||||
*/
|
||||
define('PDF_PRODUCER', 'TCPDF 5.8.005 (http://www.tcpdf.org)');
|
||||
define('PDF_PRODUCER', 'TCPDF 5.8.006 (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.8.005
|
||||
* @version 5.8.006
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
@ -290,15 +290,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
* @var cell internal padding
|
||||
* @access protected
|
||||
*/
|
||||
//protected
|
||||
public $cMargin;
|
||||
|
||||
/**
|
||||
* @var cell internal padding (previous value)
|
||||
* @access protected
|
||||
*/
|
||||
protected $oldcMargin;
|
||||
|
||||
/**
|
||||
* @var current horizontal position in user unit for cell positioning
|
||||
* @access protected
|
||||
@ -16945,11 +16938,15 @@ if (!class_exists('TCPDF', false)) {
|
||||
$key = $i;
|
||||
$parent_table = $dom[$dom[$dom[($dom[$key]['parent'])]['parent']]['parent']];
|
||||
$parent_padding = 0;
|
||||
$parent_spacing = 0;
|
||||
if (isset($parent_table['attribute']['cellpadding'])) {
|
||||
$parent_padding = $this->getHTMLUnitToUnits($parent_table['attribute']['cellpadding'], 1, 'px');
|
||||
}
|
||||
if (isset($parent_table['attribute']['cellspacing'])) {
|
||||
$parent_spacing = $this->getHTMLUnitToUnits($parent_table['attribute']['cellspacing'], 1, 'px');
|
||||
}
|
||||
// mark nested tables
|
||||
$dom[($dom[$key]['parent'])]['content'] = str_replace('<table', '<table nested="true" pcellpadding="'.$parent_padding.'"', $dom[($dom[$key]['parent'])]['content']);
|
||||
$dom[($dom[$key]['parent'])]['content'] = str_replace('<table', '<table nested="true" pcellpadding="'.$parent_padding.'" pcellspacing="'.$parent_spacing.'"', $dom[($dom[$key]['parent'])]['content']);
|
||||
// remove thead sections from nested tables
|
||||
$dom[($dom[$key]['parent'])]['content'] = str_replace('<thead>', '', $dom[($dom[$key]['parent'])]['content']);
|
||||
$dom[($dom[$key]['parent'])]['content'] = str_replace('</thead>', '', $dom[($dom[$key]['parent'])]['content']);
|
||||
@ -18473,8 +18470,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
}
|
||||
$this->openHTMLTagHandler($dom, $key, $cell);
|
||||
}
|
||||
} else {
|
||||
// closing tag
|
||||
} else { // closing tag
|
||||
$prev_numpages = $this->numpages;
|
||||
$old_bordermrk = $this->bordermrk[$this->page];
|
||||
$this->closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney);
|
||||
@ -18804,10 +18800,10 @@ if (!class_exists('TCPDF', false)) {
|
||||
}
|
||||
}
|
||||
}
|
||||
// store current margins and page
|
||||
$dom[$key]['oldcmargin'] = $this->cMargin;
|
||||
if (isset($tag['attribute']['cellpadding'])) {
|
||||
$cp = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
|
||||
$this->oldcMargin = $this->cMargin;
|
||||
$this->cMargin = $cp;
|
||||
$this->cMargin = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
|
||||
}
|
||||
if (isset($tag['attribute']['cellspacing'])) {
|
||||
$cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
|
||||
@ -19433,7 +19429,9 @@ if (!class_exists('TCPDF', false)) {
|
||||
}
|
||||
}
|
||||
$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
|
||||
$this->selectColumn($dom[($dom[$key]['parent'])]['endcolumn']);
|
||||
if ($this->num_columns > 1) {
|
||||
$this->selectColumn($dom[($dom[$key]['parent'])]['endcolumn']);
|
||||
}
|
||||
$this->y = $dom[($dom[$key]['parent'])]['endy'];
|
||||
if (isset($dom[$table_el]['attribute']['cellspacing'])) {
|
||||
$cellspacing = $this->getHTMLUnitToUnits($dom[$table_el]['attribute']['cellspacing'], 1, 'px');
|
||||
@ -19694,11 +19692,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!$in_table_head) {
|
||||
// we are not inside a thead section
|
||||
if (isset($parent['cellpadding'])) {
|
||||
$this->cMargin = $this->oldcMargin;
|
||||
}
|
||||
if (!$in_table_head) { // we are not inside a thead section
|
||||
$this->cMargin = $table_el['oldcmargin'];
|
||||
$this->lasth = $this->FontSize * $this->cell_height_ratio;
|
||||
if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
|
||||
// remove last blank page
|
||||
@ -21620,10 +21615,6 @@ if (!class_exists('TCPDF', false)) {
|
||||
$this->x = $x + $listindent;
|
||||
}
|
||||
$this->columns[$col]['x'] = $x;
|
||||
} else {
|
||||
// restore original margins
|
||||
$this->lMargin = $this->original_lMargin;
|
||||
$this->rMargin = $this->original_rMargin;
|
||||
}
|
||||
$this->current_column = $col;
|
||||
// fix for HTML mode
|
||||
|
||||
Loading…
Reference in New Issue
Block a user