32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-01 03:02:32 +00:00
This commit is contained in:
nicolaasuni 2009-04-20 18:18:44 +02:00
parent 594b05ec61
commit 24878f9379
18 changed files with 235 additions and 228 deletions

View File

@ -1,3 +1,9 @@
4.6.002 (2009-04-20)
- Documentation of rollbackTransaction() method was fixed.
- The setImageScale() and getImageScale() methods now set and get the adjusting parameter used by pixelsToUnits() method.
- HTML images now support other units of measure than pixels (getHTMLUnitToUnits() is now used instead of pixelsToUnits()).
- WARNING: PDF_IMAGE_SCALE_RATIO has been changed by default to 1.
4.6.001 (2009-04-17) 4.6.001 (2009-04-17)
- Spaces between HTML block tags are now automatically removed. - Spaces between HTML block tags are now automatically removed.
- The bug related to cMargin changes between tables was fixed. - The bug related to cMargin changes between tables was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 4.6.001 Version: 4.6.002
Release date: 2009-04-17 Release date: 2009-04-20
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2001-2009: Copyright (c) 2001-2009:
@ -38,7 +38,7 @@ Main Features:
// * includes methods to publish some XHTML code; // * includes methods to publish some XHTML code;
// * includes graphic (geometric) and transformation methods; // * includes graphic (geometric) and transformation methods;
// * includes Javascript and forms support; // * includes Javascript and forms support;
// * includes a method to print various barcode formats; // * includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS;
// * includes methods to set Bookmarks and print a Table of Content; // * includes methods to set Bookmarks and print a Table of Content;
// * includes a method to move pages; // * includes a method to move pages;
// * includes methods for automatic page header and footer management; // * includes methods for automatic page header and footer management;
@ -51,7 +51,6 @@ Main Features:
// * supports Grayscale, RGB, CMYK, Spot Colors and Transparencies; // * supports Grayscale, RGB, CMYK, Spot Colors and Transparencies;
// * supports several annotations, including links, text and file attachments; // * supports several annotations, including links, text and file attachments;
// * supports page compression (requires zlib extension); // * supports page compression (requires zlib extension);
// * supports user rights management so Adobe Reader users can save filled-in copies of forms they complete.
// * supports text hyphenation. // * supports text hyphenation.
// * supports transactions to UNDO commands. // * supports transactions to UNDO commands.

View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : tcpdf_config.php // File name : tcpdf_config.php
// Begin : 2004-06-11 // Begin : 2004-06-11
// Last Update : 2009-03-18 // Last Update : 2009-04-20
// //
// Description : Configuration file for TCPDF. // Description : Configuration file for TCPDF.
// //
@ -201,9 +201,9 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
define ('PDF_FONT_MONOSPACED', 'courier'); define ('PDF_FONT_MONOSPACED', 'courier');
/** /**
* Ratio used to scale the images * ratio used to adjust the conversion of pixels to user units
*/ */
define ('PDF_IMAGE_SCALE_RATIO', 4); define ('PDF_IMAGE_SCALE_RATIO', 1);
/** /**
* magnification factor for titles * magnification factor for titles

View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : tcpdf_config.php // File name : tcpdf_config.php
// Begin : 2004-06-11 // Begin : 2004-06-11
// Last Update : 2009-03-18 // Last Update : 2009-04-20
// //
// Description : Alternative configuration file for TCPDF. // Description : Alternative configuration file for TCPDF.
// //
@ -197,9 +197,9 @@ define ('PDF_FONT_SIZE_DATA', 8);
define ('PDF_FONT_MONOSPACED', 'courier'); define ('PDF_FONT_MONOSPACED', 'courier');
/** /**
* Ratio used to scale the images * ratio used to adjust the conversion of pixels to user units
*/ */
define ('PDF_IMAGE_SCALE_RATIO', 4); define ('PDF_IMAGE_SCALE_RATIO', 1);
/** /**
* magnification factor for titles * magnification factor for titles

View File

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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 Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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 Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -379,11 +379,11 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<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_IMAGE_SCALE_RATIO = 4</code> <code>PDF_IMAGE_SCALE_RATIO = 1</code>
</td></tr></table> </td></tr></table>
</td></tr></table> </td></tr></table>
Ratio used to scale the images<br /><br /> <br /> ratio used to adjust the conversion of pixels to user units<br /><br /> <br />
</div> </div>
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br /> <div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr /> <hr />
@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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 Fri, 17 Apr 2009 16:18:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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.6.001</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.002</td>
</tr> </tr>
<tr> <tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2009 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-2009 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.6.001 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.6.002 (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 Fri, 17 Apr 2009 16:18:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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 Fri, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -216,7 +216,7 @@
<dt><b>ComboBox</b></dt> <dt><b>ComboBox</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodComboBox">TCPDF::ComboBox()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodComboBox">TCPDF::ComboBox()</a></dd>
<dt><b>commitTransaction</b></dt> <dt><b>commitTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodcommitTransaction">TCPDF::commitTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Delete the copy of the current TCPDF object</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodcommitTransaction">TCPDF::commitTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Delete the copy of the current TCPDF object used for undo operation.</dd>
<dt><b>convertHTMLColorToDec</b></dt> <dt><b>convertHTMLColorToDec</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd>
<dt><b>CoonsPatchMesh</b></dt> <dt><b>CoonsPatchMesh</b></dt>
@ -406,7 +406,7 @@
<dt><b>getImageRBY</b></dt> <dt><b>getImageRBY</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageRBY">TCPDF::getImageRBY()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageRBY">TCPDF::getImageRBY()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image</dd>
<dt><b>getImageScale</b></dt> <dt><b>getImageScale</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageScale">TCPDF::getImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the image scale.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageScale">TCPDF::getImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the adjusting factor to convert pixels to user units.</dd>
<dt><b>getLastH</b></dt> <dt><b>getLastH</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetLastH">TCPDF::getLastH()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get the last cell height.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetLastH">TCPDF::getLastH()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get the last cell height.</dd>
<dt><b>GetLineWidth</b></dt> <dt><b>GetLineWidth</b></dt>
@ -802,7 +802,7 @@
<dt><b>PDF_HEADER_TITLE</b></dt> <dt><b>PDF_HEADER_TITLE</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_HEADER_TITLE">PDF_HEADER_TITLE</a><br>&nbsp;&nbsp;&nbsp;&nbsp;header title</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_HEADER_TITLE">PDF_HEADER_TITLE</a><br>&nbsp;&nbsp;&nbsp;&nbsp;header title</dd>
<dt><b>PDF_IMAGE_SCALE_RATIO</b></dt> <dt><b>PDF_IMAGE_SCALE_RATIO</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_IMAGE_SCALE_RATIO">PDF_IMAGE_SCALE_RATIO</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Ratio used to scale the images</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_IMAGE_SCALE_RATIO">PDF_IMAGE_SCALE_RATIO</a><br>&nbsp;&nbsp;&nbsp;&nbsp;ratio used to adjust the conversion of pixels to user units</dd>
<dt><b>PDF_MARGIN_BOTTOM</b></dt> <dt><b>PDF_MARGIN_BOTTOM</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_MARGIN_BOTTOM">PDF_MARGIN_BOTTOM</a><br>&nbsp;&nbsp;&nbsp;&nbsp;bottom margin</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_MARGIN_BOTTOM">PDF_MARGIN_BOTTOM</a><br>&nbsp;&nbsp;&nbsp;&nbsp;bottom margin</dd>
<dt><b>PDF_MARGIN_FOOTER</b></dt> <dt><b>PDF_MARGIN_FOOTER</b></dt>
@ -860,7 +860,7 @@
<dt><b>rfread</b></dt> <dt><b>rfread</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrfread">TCPDF::rfread()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Binary-safe and URL-safe file read.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrfread">TCPDF::rfread()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Binary-safe and URL-safe file read.</dd>
<dt><b>rollbackTransaction</b></dt> <dt><b>rollbackTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrollbackTransaction">TCPDF::rollbackTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method allows to encapsulate some TCPDF commands to be later commited or deleted.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrollbackTransaction">TCPDF::rollbackTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().</dd>
<dt><b>Rotate</b></dt> <dt><b>Rotate</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodRotate">TCPDF::Rotate()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Rotate object.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodRotate">TCPDF::Rotate()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Rotate object.</dd>
<dt><b>RoundedRect</b></dt> <dt><b>RoundedRect</b></dt>
@ -960,7 +960,7 @@
<dt><b>setImageBuffer</b></dt> <dt><b>setImageBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageBuffer">TCPDF::setImageBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageBuffer">TCPDF::setImageBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd>
<dt><b>setImageScale</b></dt> <dt><b>setImageScale</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageScale">TCPDF::setImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the image scale.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageScale">TCPDF::setImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the adjusting factor to convert pixels to user units.</dd>
<dt><b>setImageSubBuffer</b></dt> <dt><b>setImageSubBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageSubBuffer">TCPDF::setImageSubBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageSubBuffer">TCPDF::setImageSubBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd>
<dt><b>setJPEGQuality</b></dt> <dt><b>setJPEGQuality</b></dt>
@ -1052,7 +1052,7 @@
<dt><b>startPageGroup</b></dt> <dt><b>startPageGroup</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartPageGroup">TCPDF::startPageGroup()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartPageGroup">TCPDF::startPageGroup()</a></dd>
<dt><b>startTransaction</b></dt> <dt><b>startTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartTransaction">TCPDF::startTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Stores a copy of the current TCPDF object.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartTransaction">TCPDF::startTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Stores a copy of the current TCPDF object used for undo operation.</dd>
<dt><b>StartTransform</b></dt> <dt><b>StartTransform</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodStartTransform">TCPDF::StartTransform()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Starts a 2D tranformation saving current graphic state.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodStartTransform">TCPDF::StartTransform()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Starts a 2D tranformation saving current graphic state.</dd>
<dt><b>StopTransform</b></dt> <dt><b>StopTransform</b></dt>
@ -1350,7 +1350,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, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -365,7 +365,7 @@
<dt><b>ComboBox</b></dt> <dt><b>ComboBox</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodComboBox">TCPDF::ComboBox()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodComboBox">TCPDF::ComboBox()</a></dd>
<dt><b>commitTransaction</b></dt> <dt><b>commitTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodcommitTransaction">TCPDF::commitTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Delete the copy of the current TCPDF object</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodcommitTransaction">TCPDF::commitTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Delete the copy of the current TCPDF object used for undo operation.</dd>
<dt><b>convertHTMLColorToDec</b></dt> <dt><b>convertHTMLColorToDec</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd>
<dt><b>CoonsPatchMesh</b></dt> <dt><b>CoonsPatchMesh</b></dt>
@ -555,7 +555,7 @@
<dt><b>getImageRBY</b></dt> <dt><b>getImageRBY</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageRBY">TCPDF::getImageRBY()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageRBY">TCPDF::getImageRBY()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image</dd>
<dt><b>getImageScale</b></dt> <dt><b>getImageScale</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageScale">TCPDF::getImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the image scale.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetImageScale">TCPDF::getImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the adjusting factor to convert pixels to user units.</dd>
<dt><b>getLastH</b></dt> <dt><b>getLastH</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetLastH">TCPDF::getLastH()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get the last cell height.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetLastH">TCPDF::getLastH()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get the last cell height.</dd>
<dt><b>GetLineWidth</b></dt> <dt><b>GetLineWidth</b></dt>
@ -951,7 +951,7 @@
<dt><b>PDF_HEADER_TITLE</b></dt> <dt><b>PDF_HEADER_TITLE</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_HEADER_TITLE">PDF_HEADER_TITLE</a><br>&nbsp;&nbsp;&nbsp;&nbsp;header title</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_HEADER_TITLE">PDF_HEADER_TITLE</a><br>&nbsp;&nbsp;&nbsp;&nbsp;header title</dd>
<dt><b>PDF_IMAGE_SCALE_RATIO</b></dt> <dt><b>PDF_IMAGE_SCALE_RATIO</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_IMAGE_SCALE_RATIO">PDF_IMAGE_SCALE_RATIO</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Ratio used to scale the images</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_IMAGE_SCALE_RATIO">PDF_IMAGE_SCALE_RATIO</a><br>&nbsp;&nbsp;&nbsp;&nbsp;ratio used to adjust the conversion of pixels to user units</dd>
<dt><b>PDF_MARGIN_BOTTOM</b></dt> <dt><b>PDF_MARGIN_BOTTOM</b></dt>
<dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_MARGIN_BOTTOM">PDF_MARGIN_BOTTOM</a><br>&nbsp;&nbsp;&nbsp;&nbsp;bottom margin</dd> <dd>in file tcpdf_config.php, constant <a href="com-tecnick-tcpdf/_config---tcpdf_config.php.html#definePDF_MARGIN_BOTTOM">PDF_MARGIN_BOTTOM</a><br>&nbsp;&nbsp;&nbsp;&nbsp;bottom margin</dd>
<dt><b>PDF_MARGIN_FOOTER</b></dt> <dt><b>PDF_MARGIN_FOOTER</b></dt>
@ -1009,7 +1009,7 @@
<dt><b>rfread</b></dt> <dt><b>rfread</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrfread">TCPDF::rfread()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Binary-safe and URL-safe file read.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrfread">TCPDF::rfread()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Binary-safe and URL-safe file read.</dd>
<dt><b>rollbackTransaction</b></dt> <dt><b>rollbackTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrollbackTransaction">TCPDF::rollbackTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method allows to encapsulate some TCPDF commands to be later commited or deleted.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodrollbackTransaction">TCPDF::rollbackTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().</dd>
<dt><b>Rotate</b></dt> <dt><b>Rotate</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodRotate">TCPDF::Rotate()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Rotate object.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodRotate">TCPDF::Rotate()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Rotate object.</dd>
<dt><b>RoundedRect</b></dt> <dt><b>RoundedRect</b></dt>
@ -1109,7 +1109,7 @@
<dt><b>setImageBuffer</b></dt> <dt><b>setImageBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageBuffer">TCPDF::setImageBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageBuffer">TCPDF::setImageBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd>
<dt><b>setImageScale</b></dt> <dt><b>setImageScale</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageScale">TCPDF::setImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the image scale.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageScale">TCPDF::setImageScale()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the adjusting factor to convert pixels to user units.</dd>
<dt><b>setImageSubBuffer</b></dt> <dt><b>setImageSubBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageSubBuffer">TCPDF::setImageSubBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetImageSubBuffer">TCPDF::setImageSubBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set image buffer content.</dd>
<dt><b>setJPEGQuality</b></dt> <dt><b>setJPEGQuality</b></dt>
@ -1201,7 +1201,7 @@
<dt><b>startPageGroup</b></dt> <dt><b>startPageGroup</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartPageGroup">TCPDF::startPageGroup()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartPageGroup">TCPDF::startPageGroup()</a></dd>
<dt><b>startTransaction</b></dt> <dt><b>startTransaction</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartTransaction">TCPDF::startTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Stores a copy of the current TCPDF object.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodstartTransaction">TCPDF::startTransaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Stores a copy of the current TCPDF object used for undo operation.</dd>
<dt><b>StartTransform</b></dt> <dt><b>StartTransform</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodStartTransform">TCPDF::StartTransform()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Starts a 2D tranformation saving current graphic state.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodStartTransform">TCPDF::StartTransform()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Starts a 2D tranformation saving current graphic state.</dd>
<dt><b>StopTransform</b></dt> <dt><b>StopTransform</b></dt>
@ -1373,7 +1373,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, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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.1</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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.1</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</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 : 2009-04-17 // Last Update : 2009-04-20
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.6.001 // Version : 4.6.002
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
@ -122,7 +122,7 @@
* @copyright 2002-2009 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-2009 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.6.001 * @version 4.6.002
*/ */
/** /**
@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 4.6.001 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.6.002 (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.6.001 * @version 4.6.002
* @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
@ -524,7 +524,7 @@ if (!class_exists('TCPDF', false)) {
protected $img_rb_y; protected $img_rb_y;
/** /**
* @var image scale factor * @var adjusting factor to convert pixels to user units.
* @since 2004-06-14 * @since 2004-06-14
* @author Nicola Asuni * @author Nicola Asuni
* @access protected * @access protected
@ -1612,8 +1612,8 @@ if (!class_exists('TCPDF', false)) {
} }
/** /**
* Set the image scale. * Set the adjusting factor to convert pixels to user units.
* @param float $scale image scale. * @param float $scale adjusting factor to convert pixels to user units.
* @author Nicola Asuni * @author Nicola Asuni
* @access public * @access public
* @since 1.5.2 * @since 1.5.2
@ -1623,8 +1623,8 @@ if (!class_exists('TCPDF', false)) {
} }
/** /**
* Returns the image scale. * Returns the adjusting factor to convert pixels to user units.
* @return float image scale. * @return float adjusting factor to convert pixels to user units.
* @author Nicola Asuni * @author Nicola Asuni
* @access public * @access public
* @since 1.5.2 * @since 1.5.2
@ -4330,8 +4330,8 @@ if (!class_exists('TCPDF', false)) {
// calculate image width and height on document // calculate image width and height on document
if (($w <= 0) AND ($h <= 0)) { if (($w <= 0) AND ($h <= 0)) {
// convert image size to document unit // convert image size to document unit
$w = $pixw / ($this->imgscale * $this->k); $w = $this->pixelsToUnits($pixw);
$h = $pixh / ($this->imgscale * $this->k); $h = $this->pixelsToUnits($pixh);
} elseif ($w <= 0) { } elseif ($w <= 0) {
$w = $h * $pixw / $pixh; $w = $h * $pixw / $pixh;
} elseif ($h <= 0) { } elseif ($h <= 0) {
@ -6842,9 +6842,10 @@ if (!class_exists('TCPDF', false)) {
* @param int $px pixels * @param int $px pixels
* @return float value in user's unit * @return float value in user's unit
* @access public * @access public
* @see setImageScale(), getImageScale()
*/ */
public function pixelsToUnits($px) { public function pixelsToUnits($px) {
return ($px / $this->k); return ($px / ($this->imgscale * $this->k));
} }
/** /**
@ -11976,10 +11977,16 @@ if (!class_exists('TCPDF', false)) {
// currently only support 1 (frame) or a combination of 'LTRB' // currently only support 1 (frame) or a combination of 'LTRB'
$border = $tag['attribute']['border']; $border = $tag['attribute']['border'];
} }
if (isset($tag['attribute']['width'])) {
$iw = $this->getHTMLUnitToUnits($tag['attribute']['width'], 1, 'px', false);
}
if (isset($tag['attribute']['height'])) {
$ih = $this->getHTMLUnitToUnits($tag['attribute']['height'], 1, 'px', false);
}
if (($type == 'eps') OR ($type == 'ai')) { if (($type == 'eps') OR ($type == 'ai')) {
$this->ImageEps($tag['attribute']['src'], $xpos, $this->GetY(), $this->pixelsToUnits($tag['attribute']['width']), $this->pixelsToUnits($tag['attribute']['height']), $imglink, true, $align, '', $border); $this->ImageEps($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, $imglink, true, $align, '', $border);
} else { } else {
$this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $this->pixelsToUnits($tag['attribute']['width']), $this->pixelsToUnits($tag['attribute']['height']), '', $imglink, $align, false, 300, '', false, false, $border); $this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border);
} }
switch($align) { switch($align) {
case 'T': { case 'T': {
@ -12678,7 +12685,7 @@ if (!class_exists('TCPDF', false)) {
} }
case 'px': case 'px':
case 'pt': { case 'pt': {
$retval = $value / $k; $retval = $this->pixelsToUnits($value);
break; break;
} }
} }
@ -13487,7 +13494,7 @@ if (!class_exists('TCPDF', false)) {
} }
/** /**
* Stores a copy of the current TCPDF object. * Stores a copy of the current TCPDF object used for undo operation.
* @access public * @access public
* @since 4.5.029 (2009-03-19) * @since 4.5.029 (2009-03-19)
*/ */
@ -13501,7 +13508,7 @@ if (!class_exists('TCPDF', false)) {
} }
/** /**
* Delete the copy of the current TCPDF object * Delete the copy of the current TCPDF object used for undo operation.
* @access public * @access public
* @since 4.5.029 (2009-03-19) * @since 4.5.029 (2009-03-19)
*/ */
@ -13513,8 +13520,8 @@ if (!class_exists('TCPDF', false)) {
} }
/** /**
* This method allows to encapsulate some TCPDF commands to be later commited or deleted. * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
* @param string $action the action to be taken. Legal values are 'start' = starts a new transaction; 'commit' = commit the latest transaction; 'rollback' = undo the latest transaction. * @return TCPDF object.
* @access public * @access public
* @since 4.5.029 (2009-03-19) * @since 4.5.029 (2009-03-19)
*/ */