32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-26 14:26:28 +00:00
This commit is contained in:
nicolaasuni 2010-02-12 17:46:01 +01:00
parent 31a5e1afbb
commit 3e5158b666
16 changed files with 265 additions and 205 deletions

View File

@ -1,3 +1,6 @@
4.8.033 (2010-02-12)
- A bug related to protection mode with links was fixed.
4.8.032 (2010-02-04) 4.8.032 (2010-02-04)
- A bug related to $maxh parameter on Write() and MultiCell() was fixed. - A bug related to $maxh parameter on Write() and MultiCell() was fixed.
- Support for body tag was added. - Support for body tag was added.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 4.8.032 Version: 4.8.033
Release date: 2010-02-04 Release date: 2010-02-12
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2001-2010: Copyright (c) 2001-2010:

View File

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

File diff suppressed because it is too large Load Diff

View File

@ -1368,7 +1368,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -96,7 +96,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 Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:43 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -73,7 +73,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>4.8.032</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.033</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>
@ -104,7 +104,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 4.8.032 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.8.033 (http://www.tcpdf.org)'</code>
</td></tr></table> </td></tr></table>
</td></tr></table> </td></tr></table>
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:41 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Thu, 04 Feb 2010 11:18:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:43 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -1325,6 +1325,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_addfield">TCPDF::_addfield()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Adds a javascript form field.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_addfield">TCPDF::_addfield()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Adds a javascript form field.</dd>
<dt><b>_beginpage</b></dt> <dt><b>_beginpage</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd>
<dt><b>_dataannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_dataannobjstring">TCPDF::_dataannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for annotation objects</dd>
<dt><b>_datastring</b></dt> <dt><b>_datastring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd>
<dt><b>_datestring</b></dt> <dt><b>_datestring</b></dt>
@ -1454,7 +1456,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 Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -90,6 +90,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_addfield">TCPDF::_addfield()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Adds a javascript form field.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_addfield">TCPDF::_addfield()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Adds a javascript form field.</dd>
<dt><b>_beginpage</b></dt> <dt><b>_beginpage</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd>
<dt><b>_dataannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_dataannobjstring">TCPDF::_dataannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for annotation objects</dd>
<dt><b>_datastring</b></dt> <dt><b>_datastring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd>
<dt><b>_datestring</b></dt> <dt><b>_datestring</b></dt>
@ -1477,7 +1479,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 Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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 Thu, 04 Feb 2010 11:18:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:43 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -58,7 +58,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 Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -58,7 +58,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 Thu, 04 Feb 2010 11:18:18 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 12 Feb 2010 17:45:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -2,9 +2,9 @@
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-02-04 // Last Update : 2010-02-12
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.8.032 // Version : 4.8.033
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. // Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l.
@ -128,7 +128,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 4.8.032 * @version 4.8.033
*/ */
/** /**
@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 4.8.032 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.8.033 (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 4.8.032 * @version 4.8.033
* @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
@ -5781,7 +5781,7 @@ if (!class_exists('TCPDF', false)) {
$annots = '<<'; $annots = '<<';
$annots .= ' /Type /Annot'; $annots .= ' /Type /Annot';
$annots .= ' /Subtype /Widget'; $annots .= ' /Subtype /Widget';
$annots .= ' /T '.$this->_datastring($pl['txt']); $annots .= ' /T '.$this->_dataannobjstring($pl['txt']);
$annots .= ' /FT /Btn'; $annots .= ' /FT /Btn';
$annots .= ' /Ff 49152'; $annots .= ' /Ff 49152';
$annots .= ' /Kids ['; $annots .= ' /Kids [';
@ -5823,7 +5823,7 @@ if (!class_exists('TCPDF', false)) {
} }
$annots .= ' /Contents '.$this->_textstring($pl['txt']); $annots .= ' /Contents '.$this->_textstring($pl['txt']);
$annots .= ' /P '.$this->page_obj_id[$n].' 0 R'; $annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key)); $annots .= ' /NM '.$this->_dataannobjstring(sprintf('%04u-%04u', $n, $key));
$annots .= ' /M '.$this->_datestring(); $annots .= ' /M '.$this->_datestring();
if (isset($pl['opt']['f'])) { if (isset($pl['opt']['f'])) {
$val = 0; $val = 0;
@ -6029,7 +6029,7 @@ if (!class_exists('TCPDF', false)) {
case 'link': { case 'link': {
if(is_string($pl['txt'])) { if(is_string($pl['txt'])) {
// external URI link // external URI link
$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt'])).'>>'; $annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlentities($pl['txt'])).'>>';
} else { } else {
// internal link // internal link
$l = $this->links[$pl['txt']]; $l = $this->links[$pl['txt']];
@ -6126,7 +6126,7 @@ if (!class_exists('TCPDF', false)) {
} }
$filename = basename($pl['opt']['fs']); $filename = basename($pl['opt']['fs']);
if (isset($this->embeddedfiles[$filename]['n'])) { if (isset($this->embeddedfiles[$filename]['n'])) {
$annots .= ' /FS <</Type /Filespec /F '.$this->_datastring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>'; $annots .= ' /FS <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag'); $iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag');
if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) { if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
$annots .= ' /Name /'.$pl['opt']['name']; $annots .= ' /Name /'.$pl['opt']['name'];
@ -6144,7 +6144,7 @@ if (!class_exists('TCPDF', false)) {
if (isset($this->embeddedfiles[$filename]['n'])) { if (isset($this->embeddedfiles[$filename]['n'])) {
// ... TO BE COMPLETED ... // ... TO BE COMPLETED ...
// /R /C /B /E /CO /CP // /R /C /B /E /CO /CP
$annots .= ' /Sound <</Type /Filespec /F '.$this->_datastring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>'; $annots .= ' /Sound <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$iconsapp = array('Speaker', 'Mic'); $iconsapp = array('Speaker', 'Mic');
if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) { if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
$annots .= ' /Name /'.$pl['opt']['name']; $annots .= ' /Name /'.$pl['opt']['name'];
@ -6243,13 +6243,13 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R'; $annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R';
} }
if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) { if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
$annots .= ' /T '.$this->_datastring($pl['opt']['t']); $annots .= ' /T '.$this->_dataannobjstring($pl['opt']['t']);
} }
if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) { if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
$annots .= ' /TU '.$this->_datastring($pl['opt']['tu']); $annots .= ' /TU '.$this->_dataannobjstring($pl['opt']['tu']);
} }
if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) { if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) {
$annots .= ' /TM '.$this->_datastring($pl['opt']['tm']); $annots .= ' /TM '.$this->_dataannobjstring($pl['opt']['tm']);
} }
if (isset($pl['opt']['ff'])) { if (isset($pl['opt']['ff'])) {
if (is_array($pl['opt']['ff'])) { if (is_array($pl['opt']['ff'])) {
@ -7413,7 +7413,7 @@ if (!class_exists('TCPDF', false)) {
/** /**
* Format a data string for meta information * Format a data string for meta information
* @param string $s date string to escape. * @param string $s data string to escape.
* @return string escaped string. * @return string escaped string.
* @access protected * @access protected
*/ */
@ -7424,6 +7424,19 @@ if (!class_exists('TCPDF', false)) {
return '('. $this->_escape($s).')'; return '('. $this->_escape($s).')';
} }
/**
* Format a data string for annotation objects
* @param string $s data string to escape.
* @return string escaped string.
* @access protected
*/
protected function _dataannobjstring($s) {
if ($this->encrypted) {
$s = $this->_RC4($this->_objectkey($this->annot_obj_id + 1), $s);
}
return '('. $this->_escape($s).')';
}
/** /**
* Returns a formatted date for meta information * Returns a formatted date for meta information
* @return string escaped date string. * @return string escaped date string.