30
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-09-29 20:49:01 +00:00
This commit is contained in:
nicolaasuni 2010-11-19 17:05:41 +01:00
parent a39c64ba22
commit 766488a040
23 changed files with 357 additions and 332 deletions

View File

@ -1,3 +1,8 @@
5.9.019 (2010-11-19)
- An SVG bug was fixed.
- ImageSVG() and ImageEPS() methods now accepts image data streams (put the string on the $file parameter preceded by '@' character).
- Option 'E' was added to the $dest parameter of Output() method to return the document as base64 mime multi-part email attachment (RFC 2045).
5.9.018 (2010-11-19) 5.9.018 (2010-11-19)
- An SVG bug was fixed. - An SVG bug was fixed.

View File

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

View File

@ -65,7 +65,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -1004,7 +1004,7 @@ $code)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:32 +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

@ -5552,7 +5552,7 @@ $frame)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:32 +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

@ -300,7 +300,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -1378,7 +1378,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library<br /><br /><br /><b
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:38 +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

@ -106,7 +106,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -106,7 +106,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -543,7 +543,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:38 +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

@ -98,7 +98,7 @@ Array of WEB safe colors<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:32 +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

@ -158,7 +158,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, 19 Nov 2010 13:00:04 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:32 +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

@ -481,7 +481,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:32 +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

@ -83,7 +83,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.9.018</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>5.9.019</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>
@ -110,7 +110,7 @@ main configuration file<br /><br /><p>(define the K_TCPDF_EXTERNAL_CONFIG consta
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:05 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:33 +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

@ -103,7 +103,7 @@ Unicode data class for TCPDF library.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:38 +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

@ -2140,7 +2140,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -2173,7 +2173,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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 Fri, 19 Nov 2010 13:00:10 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:38 +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

@ -68,7 +68,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -68,7 +68,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, 19 Nov 2010 13:00:03 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 19 Nov 2010 17:05:31 +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

@ -1,7 +1,7 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.018 // Version : 5.9.019
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-11-19 // Last Update : 2010-11-19
// 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
@ -134,7 +134,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.9.018 * @version 5.9.019
*/ */
/** /**
@ -148,7 +148,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
* 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.9.018 * @version 5.9.019
* @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
@ -161,7 +161,7 @@ class TCPDF {
* @var current TCPDF version * @var current TCPDF version
* @access private * @access private
*/ */
private $tcpdf_version = '5.9.018'; private $tcpdf_version = '5.9.019';
// Protected properties // Protected properties
@ -7909,7 +7909,7 @@ class TCPDF {
* In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br /> * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
* The method first calls Close() if necessary to terminate the document. * The method first calls Close() if necessary to terminate the document.
* @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character. * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
* @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string. name is ignored.</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li></ul> * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
* @access public * @access public
* @since 1.0 * @since 1.0
* @see Close() * @see Close()
@ -8090,6 +8090,16 @@ class TCPDF {
} }
break; break;
} }
case 'E': {
// Return PDF as base64 mime multi-part email attachment (RFC 2045)
$retval = 'Content-Type: application/pdf;'."\r\n";
$retval .= ' name="'.$name.'"'."\r\n";
$retval .= 'Content-Transfer-Encoding: base64'."\r\n";
$retval .= 'Content-Disposition: attachment;'."\r\n";
$retval .= ' filename="'.$name.'"'."\r\n\r\n";
$retval .= chunk_split(base64_encode($this->getBuffer()), 76, "\r\n");
return $retval;
}
case 'S': { case 'S': {
// Returns PDF as a string // Returns PDF as a string
return $this->getBuffer(); return $this->getBuffer();
@ -16415,7 +16425,7 @@ class TCPDF {
* NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library. * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
* Only vector drawing is supported, not text or bitmap. * Only vector drawing is supported, not text or bitmap.
* Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2). * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2).
* @param string $file Name of the file containing the image. * @param string $file Name of the file containing the image or a '@' character followed by the EPS/AI data string.
* @param float $x Abscissa of the upper-left corner. * @param float $x Abscissa of the upper-left corner.
* @param float $y Ordinate of the upper-left corner. * @param float $y Ordinate of the upper-left corner.
* @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated. * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
@ -16444,7 +16454,11 @@ class TCPDF {
// check page for no-write regions and adapt page margins if necessary // check page for no-write regions and adapt page margins if necessary
$this->checkPageRegions($h, $x, $y); $this->checkPageRegions($h, $x, $y);
$k = $this->k; $k = $this->k;
$data = file_get_contents($file); if ($file{0} === '@') { // image from string
$data = substr($file, 1);
} else { // EPS/AI file
$data = file_get_contents($file);
}
if ($data === false) { if ($data === false) {
$this->Error('EPS file not found: '.$file); $this->Error('EPS file not found: '.$file);
} }
@ -24310,7 +24324,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
/** /**
* Embedd a Scalable Vector Graphics (SVG) image. * Embedd a Scalable Vector Graphics (SVG) image.
* NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library. * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
* @param string $file Name of the SVG file. * @param string $file Name of the SVG file or a '@' character followed by the SVG data string.
* @param float $x Abscissa of the upper-left corner. * @param float $x Abscissa of the upper-left corner.
* @param float $y Ordinate of the upper-left corner. * @param float $y Ordinate of the upper-left corner.
* @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated. * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
@ -24329,8 +24343,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// 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);
} }
$this->svgdir = dirname($file); if ($file{0} === '@') { // image from string
$svgdata = file_get_contents($file); $this->svgdir = '';
$svgdata = substr($file, 1);
} else { // SVG file
$this->svgdir = dirname($file);
$svgdata = file_get_contents($file);
}
if ($svgdata === false) { if ($svgdata === false) {
$this->Error('SVG file not found: '.$file); $this->Error('SVG file not found: '.$file);
} }
@ -25063,7 +25082,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$paths = array(); $paths = array();
$d = str_replace('-', ' -', $d); $d = str_replace('-', ' -', $d);
$d = str_replace('+', ' +', $d); $d = str_replace('+', ' +', $d);
preg_match_all('/([a-zA-Z])[\s]*([^a-zA-Z\"]*)/si', $d, $paths, PREG_SET_ORDER); $d = str_replace('e ', 'e', $d);
preg_match_all('/([ACHLMQSTVZ])[\s]*([^ACHLMQSTVZ\"]*)/si', $d, $paths, PREG_SET_ORDER);
$x = 0; $x = 0;
$y = 0; $y = 0;
$x1 = 0; $x1 = 0;