joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-12-23 00:48:55 +00:00
Code Issues Releases Activity

4.9.003

Browse Source
This commit is contained in:
nicolaasuni 2010-03-31 00:10:43 +02:00
parent f3886fb2a5
commit f75961b0b0
22 changed files with 570 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.TXT
View File

@ -1,3 +1,8 @@
4.9.003 (2010-03-30)
- Problem of first <br /> on multiple columns was fixed.
- HTML line alignment was fixed.
- A QR-code bug was fixed.
4.9.002 (2010-03-29)
- Patch #2978349 "$ignore_min_height is ignored in function Cell()" was applied.
- Bug #2978607 "2D Barcodes are wrong" was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 4.9.002
Release date: 2010-03-29
Version: 4.9.003
Release date: 2010-03-30
Author: Nicola Asuni
Copyright (c) 2001-2010:

75
config/tcpdf_config.php
View File

@ -2,7 +2,7 @@
//============================================================+
// File name : tcpdf_config.php
// Begin : 2004-06-11
// Last Update : 2009-09-30
// Last Update : 2010-03-30
//
// Description : Configuration file for TCPDF.
//
@ -32,7 +32,7 @@
// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
// DOCUMENT_ROOT fix for IIS Webserver
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
if(isset($_SERVER['SCRIPT_FILENAME'])) {
@ -44,20 +44,21 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
$_SERVER['DOCUMENT_ROOT'] = '/var/www';
}
}
// Automatic calculation for the following K_PATH_MAIN constant
$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
if (substr($k_path_main, -1) != '/') {
$k_path_main .= '/';
}
/**
* Installation path (/var/www/tcpdf/).
* By default it is automatically calculated but you can also set it as a fixed string to improve performances.
*/
define ('K_PATH_MAIN', $k_path_main);
// Automatic calculation for the following K_PATH_URL constant
$k_path_url = $k_path_main; // default value for console mode
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
$k_path_url = 'https://';
@ -67,159 +68,159 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
$k_path_url .= $_SERVER['HTTP_HOST'];
$k_path_url .= str_replace( '\\', '/', substr($_SERVER['PHP_SELF'], 0, -24));
}
/**
* URL path to tcpdf installation folder (http://localhost/tcpdf/).
* By default it is automatically calculated but you can also set it as a fixed string to improve performances.
*/
define ('K_PATH_URL', $k_path_url);
/**
* path for PDF fonts
* use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
*/
define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
/**
* cache directory for temporary files (full path)
*/
define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
/**
* cache directory for temporary files (url path)
*/
define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
/**
*images directory
*/
define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
/**
* blank image
*/
define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
/**
* page format
*/
define ('PDF_PAGE_FORMAT', 'A4');
/**
* page orientation (P=portrait, L=landscape)
*/
define ('PDF_PAGE_ORIENTATION', 'P');
/**
* document creator
*/
define ('PDF_CREATOR', 'TCPDF');
/**
* document author
*/
define ('PDF_AUTHOR', 'TCPDF');
/**
* header title
*/
define ('PDF_HEADER_TITLE', 'TCPDF Example');
/**
* header description string
*/
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
/**
* image logo
*/
define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
/**
* header logo image width [mm]
*/
define ('PDF_HEADER_LOGO_WIDTH', 30);
/**
* document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
*/
define ('PDF_UNIT', 'mm');
/**
* header margin
*/
define ('PDF_MARGIN_HEADER', 5);
/**
* footer margin
*/
define ('PDF_MARGIN_FOOTER', 10);
/**
* top margin
*/
define ('PDF_MARGIN_TOP', 27);
/**
* bottom margin
*/
define ('PDF_MARGIN_BOTTOM', 25);
/**
* left margin
*/
define ('PDF_MARGIN_LEFT', 15);
/**
* right margin
*/
define ('PDF_MARGIN_RIGHT', 15);
/**
* default main font name
*/
define ('PDF_FONT_NAME_MAIN', 'helvetica');
/**
* default main font size
*/
define ('PDF_FONT_SIZE_MAIN', 10);
/**
* default data font name
*/
define ('PDF_FONT_NAME_DATA', 'helvetica');
/**
* default data font size
*/
define ('PDF_FONT_SIZE_DATA', 8);
/**
* default monospaced font name
*/
define ('PDF_FONT_MONOSPACED', 'courier');
/**
* ratio used to adjust the conversion of pixels to user units
*/
define ('PDF_IMAGE_SCALE_RATIO', 1);
/**
* magnification factor for titles
*/
define('HEAD_MAGNIFICATION', 1.1);
/**
* height of cell repect font height
*/
define('K_CELL_HEIGHT_RATIO', 1.25);
/**
* title magnification respect main font size
*/
define('K_TITLE_MAGNIFICATION', 1.3);
/**
* reduction factor for small font
*/
@ -227,6 +228,6 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
}
//============================================================+
// END OF FILE
// END OF FILE
//============================================================+
?>

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

@ -55,7 +55,7 @@
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -5548,7 +5548,7 @@ $frame)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

File diff suppressed because it is too large Load Diff

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

@ -296,7 +296,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -1374,7 +1374,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -95,7 +95,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<br /><br />
<hr />
<a name="defineHEAD_MAGNIFICATION"></a>
<h3>HEAD_MAGNIFICATION <span class="smalllinenumber">[line 211]</span></h3>
<h3>HEAD_MAGNIFICATION <span class="smalllinenumber">[line 212]</span></h3>
<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">
@ -108,7 +108,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_BLANK_IMAGE"></a>
<h3>K_BLANK_IMAGE <span class="smalllinenumber">[line 101]</span></h3>
<h3>K_BLANK_IMAGE <span class="smalllinenumber">[line 102]</span></h3>
<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">
@ -121,7 +121,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_CELL_HEIGHT_RATIO"></a>
<h3>K_CELL_HEIGHT_RATIO <span class="smalllinenumber">[line 216]</span></h3>
<h3>K_CELL_HEIGHT_RATIO <span class="smalllinenumber">[line 217]</span></h3>
<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">
@ -134,7 +134,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_PATH_CACHE"></a>
<h3>K_PATH_CACHE <span class="smalllinenumber">[line 86]</span></h3>
<h3>K_PATH_CACHE <span class="smalllinenumber">[line 87]</span></h3>
<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">
@ -147,7 +147,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_PATH_FONTS"></a>
<h3>K_PATH_FONTS <span class="smalllinenumber">[line 81]</span></h3>
<h3>K_PATH_FONTS <span class="smalllinenumber">[line 82]</span></h3>
<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">
@ -160,7 +160,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_PATH_IMAGES"></a>
<h3>K_PATH_IMAGES <span class="smalllinenumber">[line 96]</span></h3>
<h3>K_PATH_IMAGES <span class="smalllinenumber">[line 97]</span></h3>
<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">
@ -186,7 +186,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_PATH_URL"></a>
<h3>K_PATH_URL <span class="smalllinenumber">[line 75]</span></h3>
<h3>K_PATH_URL <span class="smalllinenumber">[line 76]</span></h3>
<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">
@ -199,7 +199,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_PATH_URL_CACHE"></a>
<h3>K_PATH_URL_CACHE <span class="smalllinenumber">[line 91]</span></h3>
<h3>K_PATH_URL_CACHE <span class="smalllinenumber">[line 92]</span></h3>
<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">
@ -212,7 +212,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_SMALL_RATIO"></a>
<h3>K_SMALL_RATIO <span class="smalllinenumber">[line 226]</span></h3>
<h3>K_SMALL_RATIO <span class="smalllinenumber">[line 227]</span></h3>
<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">
@ -225,7 +225,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="defineK_TITLE_MAGNIFICATION"></a>
<h3>K_TITLE_MAGNIFICATION <span class="smalllinenumber">[line 221]</span></h3>
<h3>K_TITLE_MAGNIFICATION <span class="smalllinenumber">[line 222]</span></h3>
<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">
@ -238,7 +238,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_AUTHOR"></a>
<h3>PDF_AUTHOR <span class="smalllinenumber">[line 121]</span></h3>
<h3>PDF_AUTHOR <span class="smalllinenumber">[line 122]</span></h3>
<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">
@ -251,7 +251,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_CREATOR"></a>
<h3>PDF_CREATOR <span class="smalllinenumber">[line 116]</span></h3>
<h3>PDF_CREATOR <span class="smalllinenumber">[line 117]</span></h3>
<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">
@ -264,7 +264,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_FONT_MONOSPACED"></a>
<h3>PDF_FONT_MONOSPACED <span class="smalllinenumber">[line 201]</span></h3>
<h3>PDF_FONT_MONOSPACED <span class="smalllinenumber">[line 202]</span></h3>
<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">
@ -277,7 +277,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_FONT_NAME_DATA"></a>
<h3>PDF_FONT_NAME_DATA <span class="smalllinenumber">[line 191]</span></h3>
<h3>PDF_FONT_NAME_DATA <span class="smalllinenumber">[line 192]</span></h3>
<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">
@ -290,7 +290,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_FONT_NAME_MAIN"></a>
<h3>PDF_FONT_NAME_MAIN <span class="smalllinenumber">[line 181]</span></h3>
<h3>PDF_FONT_NAME_MAIN <span class="smalllinenumber">[line 182]</span></h3>
<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">
@ -303,7 +303,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_FONT_SIZE_DATA"></a>
<h3>PDF_FONT_SIZE_DATA <span class="smalllinenumber">[line 196]</span></h3>
<h3>PDF_FONT_SIZE_DATA <span class="smalllinenumber">[line 197]</span></h3>
<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">
@ -316,7 +316,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_FONT_SIZE_MAIN"></a>
<h3>PDF_FONT_SIZE_MAIN <span class="smalllinenumber">[line 186]</span></h3>
<h3>PDF_FONT_SIZE_MAIN <span class="smalllinenumber">[line 187]</span></h3>
<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">
@ -329,7 +329,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_HEADER_LOGO"></a>
<h3>PDF_HEADER_LOGO <span class="smalllinenumber">[line 136]</span></h3>
<h3>PDF_HEADER_LOGO <span class="smalllinenumber">[line 137]</span></h3>
<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">
@ -342,7 +342,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_HEADER_LOGO_WIDTH"></a>
<h3>PDF_HEADER_LOGO_WIDTH <span class="smalllinenumber">[line 141]</span></h3>
<h3>PDF_HEADER_LOGO_WIDTH <span class="smalllinenumber">[line 142]</span></h3>
<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">
@ -355,7 +355,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_HEADER_STRING"></a>
<h3>PDF_HEADER_STRING <span class="smalllinenumber">[line 131]</span></h3>
<h3>PDF_HEADER_STRING <span class="smalllinenumber">[line 132]</span></h3>
<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">
@ -368,7 +368,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_HEADER_TITLE"></a>
<h3>PDF_HEADER_TITLE <span class="smalllinenumber">[line 126]</span></h3>
<h3>PDF_HEADER_TITLE <span class="smalllinenumber">[line 127]</span></h3>
<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">
@ -381,7 +381,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_IMAGE_SCALE_RATIO"></a>
<h3>PDF_IMAGE_SCALE_RATIO <span class="smalllinenumber">[line 206]</span></h3>
<h3>PDF_IMAGE_SCALE_RATIO <span class="smalllinenumber">[line 207]</span></h3>
<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">
@ -394,7 +394,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_BOTTOM"></a>
<h3>PDF_MARGIN_BOTTOM <span class="smalllinenumber">[line 166]</span></h3>
<h3>PDF_MARGIN_BOTTOM <span class="smalllinenumber">[line 167]</span></h3>
<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">
@ -407,7 +407,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_FOOTER"></a>
<h3>PDF_MARGIN_FOOTER <span class="smalllinenumber">[line 156]</span></h3>
<h3>PDF_MARGIN_FOOTER <span class="smalllinenumber">[line 157]</span></h3>
<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">
@ -420,7 +420,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_HEADER"></a>
<h3>PDF_MARGIN_HEADER <span class="smalllinenumber">[line 151]</span></h3>
<h3>PDF_MARGIN_HEADER <span class="smalllinenumber">[line 152]</span></h3>
<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">
@ -433,7 +433,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_LEFT"></a>
<h3>PDF_MARGIN_LEFT <span class="smalllinenumber">[line 171]</span></h3>
<h3>PDF_MARGIN_LEFT <span class="smalllinenumber">[line 172]</span></h3>
<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">
@ -446,7 +446,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_RIGHT"></a>
<h3>PDF_MARGIN_RIGHT <span class="smalllinenumber">[line 176]</span></h3>
<h3>PDF_MARGIN_RIGHT <span class="smalllinenumber">[line 177]</span></h3>
<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">
@ -459,7 +459,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_MARGIN_TOP"></a>
<h3>PDF_MARGIN_TOP <span class="smalllinenumber">[line 161]</span></h3>
<h3>PDF_MARGIN_TOP <span class="smalllinenumber">[line 162]</span></h3>
<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">
@ -472,7 +472,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_PAGE_FORMAT"></a>
<h3>PDF_PAGE_FORMAT <span class="smalllinenumber">[line 106]</span></h3>
<h3>PDF_PAGE_FORMAT <span class="smalllinenumber">[line 107]</span></h3>
<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">
@ -485,7 +485,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_PAGE_ORIENTATION"></a>
<h3>PDF_PAGE_ORIENTATION <span class="smalllinenumber">[line 111]</span></h3>
<h3>PDF_PAGE_ORIENTATION <span class="smalllinenumber">[line 112]</span></h3>
<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">
@ -498,7 +498,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />
<hr />
<a name="definePDF_UNIT"></a>
<h3>PDF_UNIT <span class="smalllinenumber">[line 146]</span></h3>
<h3>PDF_UNIT <span class="smalllinenumber">[line 147]</span></h3>
<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">
@ -513,7 +513,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -94,7 +94,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -79,7 +79,7 @@ Class to create QR-code arrays for TCPDF class.<br /><br /><p>QR Code symbol is
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.002</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.003</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>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>
@ -477,7 +477,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -79,7 +79,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>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.9.002</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.9.003</td>
</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>
@ -110,7 +110,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 4.9.002 (http://www.tcpdf.org)'</code>
<code>PDF_PRODUCER = 'TCPDF 4.9.003 (http://www.tcpdf.org)'</code>
</td></tr></table>
</td></tr></table>
@ -121,7 +121,7 @@ unicode data<br /><br /></div>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:06 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:36 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -243,7 +243,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

6
doc/elementindex.html
View File

@ -559,8 +559,12 @@
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetECCLength">QRcode::getECCLength()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return maximum error correction code length (bytes) for the version.</dd>
<dt><b>getEccSpec</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetEccSpec">QRcode::getEccSpec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return an array of ECC specification.</dd>
<dt><b>getFontAscent</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontAscent">TCPDF::getFontAscent()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the font ascent value</dd>
<dt><b>getFontBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontBuffer">TCPDF::getFontBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get font buffer content.</dd>
<dt><b>getFontDescent</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontDescent">TCPDF::getFontDescent()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the font descent value</dd>
<dt><b>getFontFamily</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontFamily">TCPDF::getFontFamily()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the current font family name.</dd>
<dt><b>getFontSize</b></dt>
@ -1832,7 +1836,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -720,8 +720,12 @@
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetECCLength">QRcode::getECCLength()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return maximum error correction code length (bytes) for the version.</dd>
<dt><b>getEccSpec</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetEccSpec">QRcode::getEccSpec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return an array of ECC specification.</dd>
<dt><b>getFontAscent</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontAscent">TCPDF::getFontAscent()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the font ascent value</dd>
<dt><b>getFontBuffer</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontBuffer">TCPDF::getFontBuffer()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Get font buffer content.</dd>
<dt><b>getFontDescent</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontDescent">TCPDF::getFontDescent()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the font descent value</dd>
<dt><b>getFontFamily</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetFontFamily">TCPDF::getFontFamily()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the current font family name.</dd>
<dt><b>getFontSize</b></dt>
@ -1861,7 +1865,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

2
doc/errors.html
View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 29 Mar 2010 18:47:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:38 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

2
doc/index.html
View File

@ -64,7 +64,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 Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

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

@ -64,7 +64,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 Mon, 29 Mar 2010 18:47:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Wed, 31 Mar 2010 00:10:35 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

8
qrcode.php
View File

@ -2,8 +2,8 @@
//============================================================+
// File name : qrcode.php
// Begin : 2010-03-22
// Last Update : 2010-03-29
// Version : 1.0.002
// Last Update : 2010-03-30
// Version : 1.0.003
// License : GNU LGPL v.3 (http://www.gnu.org/copyleft/lesser.html)
// ----------------------------------------------------------------------------
//
@ -87,7 +87,7 @@
* @copyright 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 1.0.002
* @version 1.0.003
*/
// definitions
@ -1579,7 +1579,7 @@ if (!class_exists('QRcode', false)) {
$words = (int)($inputitem['size'] / 2);
$inputitem['bstream'] = array();
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
$inputitem['bstream'] = $this->appendNum(v, $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']); //DEBUG
for ($i=0; $i < $words; ++$i) {
$val = (int)$this->lookAnTable(ord($inputitem['data'][$i*2 ])) * 45;
$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));

119
tcpdf.php
View File

@ -2,9 +2,9 @@
//============================================================+
// File name : tcpdf.php
// Begin : 2002-08-03
// Last Update : 2010-03-29
// Last Update : 2010-03-30
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.9.002
// Version : 4.9.003
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ----------------------------------------------------------------------------
// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l.
@ -131,7 +131,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 4.9.002
* @version 4.9.003
*/
/**
@ -155,14 +155,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
define('PDF_PRODUCER', 'TCPDF 4.9.002 (http://www.tcpdf.org)');
define('PDF_PRODUCER', 'TCPDF 4.9.003 (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 4.9.002
* @version 4.9.003
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -3472,6 +3472,48 @@ if (!class_exists('TCPDF', false)) {
}
}
/**
* Return the font descent value
* @param string $font font name
* @param string $style font style
* @param float $size The size (in points)
* @return int font descent
* @access public
* @since 4.9.003 (2010-03-30)
*/
public function getFontDescent($font, $style='', $size=0) {
//Set font size in points
$sizek = $size / $this->k;
$fontdata = $this->AddFont($font, $style);
if (isset($fontdata['desc']['Descent']) AND ($fontdata['desc']['Descent'] > 0)) {
$descent = - $fontdata['desc']['Descent'] * $sizek / 1000;
} else {
$descent = 0.15 * $sizek;
}
return $descent;
}
/**
* Return the font ascent value
* @param string $font font name
* @param string $style font style
* @param float $size The size (in points)
* @return int font ascent
* @access public
* @since 4.9.003 (2010-03-30)
*/
public function getFontAscent($font, $style='', $size=0) {
//Set font size in points
$sizek = $size / $this->k;
$fontdata = $this->AddFont($font, $style);
if (isset($fontdata['desc']['Ascent']) AND ($fontdata['desc']['Ascent'] > 0)) {
$ascent = $fontdata['desc']['Ascent'] * $sizek / 1000;
} else {
$ascent = 0.85 * $sizek;
}
return $ascent;
}
/**
* Defines the default monospaced font.
* @param string $font Font name.
@ -5404,7 +5446,7 @@ if (!class_exists('TCPDF', false)) {
* @see Cell()
*/
public function Ln($h='', $cell=false) {
if (($this->num_columns > 0) AND (($this->current_column > 0) OR ($this->page > $this->column_start_page)) AND ($this->y == $this->columns[$this->current_column]['y'])) {
if (($this->num_columns > 0) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
// revove vertical space from the top of the column
return;
}
@ -13175,6 +13217,8 @@ if (!class_exists('TCPDF', false)) {
* @since 3.2.000 (2008-06-20)
*/
protected function getHtmlDomArray($html) {
// define block tags
$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf');
// remove all unsupported tags (the line below lists all supported tags)
$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><i><img><input><label><li><ol><option><p><pre><select><small><span><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
//replace some blank characters
@ -13251,6 +13295,7 @@ if (!class_exists('TCPDF', false)) {
$dom[$key] = array();
// set first void element
$dom[$key]['tag'] = false;
$dom[$key]['block'] = false;
$dom[$key]['value'] = '';
$dom[$key]['parent'] = 0;
$dom[$key]['fontname'] = $this->FontFamily;
@ -13288,6 +13333,11 @@ if (!class_exists('TCPDF', false)) {
}
$dom[$key]['tag'] = true;
$dom[$key]['value'] = $tagname;
if (in_array($dom[$key]['value'], $blocktags)) {
$dom[$key]['block'] = true;
} else {
$dom[$key]['block'] = false;
}
if ($element{0} == '/') {
// *** closing html tag
$dom[$key]['opening'] = false;
@ -13650,6 +13700,7 @@ if (!class_exists('TCPDF', false)) {
} else {
// text
$dom[$key]['tag'] = false;
$dom[$key]['block'] = false;
$dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
$dom[$key]['parent'] = end($level);
}
@ -13707,7 +13758,6 @@ if (!class_exists('TCPDF', false)) {
$this_method_vars = array();
$undo = false;
$fontaligned = false;
$blocktags = array('blockquote','br','dd','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf');
$this->premode = false;
if (isset($this->PageAnnots[$this->page])) {
$pask = count($this->PageAnnots[$this->page]);
@ -13958,7 +14008,7 @@ if (!class_exists('TCPDF', false)) {
$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
$tend = substr($pagebuff, $this->cntmrk[$this->page]);
// add line start to current page
$yshift = $minstartliney - $this->y;
$yshift = $minstartliney - $this->y;
$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k));
$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
// shift the annotations and links
@ -13982,10 +14032,12 @@ if (!class_exists('TCPDF', false)) {
$startlinepage = $this->page;
$startliney = $this->y;
}
if (($dom[$key]['value'] != 'tr') AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
if ((!$dom[$key]['block']) AND ($dom[$key]['value'] != 'tr') AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
$this->y += (($curfontsize - $fontsize) / $this->k);
}
$minstartliney = min($this->y, $minstartliney);
if (!$dom[$key]['block']) {
$minstartliney = min($this->y, $minstartliney);
}
$fontaligned = true;
}
$this->SetFont($fontname, $fontstyle, $fontsize);
@ -13995,7 +14047,7 @@ if (!class_exists('TCPDF', false)) {
$curfontsize = $fontsize;
}
}
if (($plalign == 'J') AND (in_array($dom[$key]['value'], $blocktags))) {
if (($plalign == 'J') AND $dom[$key]['block']) {
$plalign = '';
}
// get current position on page buffer
@ -14809,6 +14861,25 @@ if (!class_exists('TCPDF', false)) {
} else {
$this->tmprtl = false;
}
if ($tag['block']) {
// calculate vertical space for block tags
$hb = '';
if (isset($tag['fontsize'])) {
$cur_h = ($tag['fontsize'] / $this->k) * $this->cell_height_ratio;
if (isset($parent['fontsize'])) {
$pre_h = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
} else {
$pre_h = $this->FontSize * $this->cell_height_ratio;
}
if ($this->htmlvspace == 0) {
$hb = $cur_h + $pre_h;
} elseif ($cur_h > $this->htmlvspace) {
$hb = $cur_h + ($this->htmlvspace / 2);
} else {
$hb = $cur_h + $pre_h;
}
}
}
//Opening tag
switch($tag['value']) {
case 'table': {
@ -15069,7 +15140,7 @@ if (!class_exists('TCPDF', false)) {
} else {
$this->lMargin += $this->listindent;
}
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], false);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], false);
break;
}
case 'br': {
@ -15081,7 +15152,7 @@ if (!class_exists('TCPDF', false)) {
break;
}
case 'p': {
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], false);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], false);
break;
}
case 'pre': {
@ -15103,7 +15174,7 @@ if (!class_exists('TCPDF', false)) {
case 'h4':
case 'h5':
case 'h6': {
$this->addHTMLVertSpace(1, $cell, ($tag['fontsize'] * 1.5) / $this->k, $firstorlast, $tag['value'], false);
$this->addHTMLVertSpace(1, $cell, 3*$hb/4, $firstorlast, $tag['value'], false);
break;
}
// Form fields (since 4.8.000 - 2009-09-07)
@ -15359,6 +15430,15 @@ if (!class_exists('TCPDF', false)) {
$parent = $dom[($dom[$key]['parent'])];
$firstorlast = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
$in_table_head = false;
if ($tag['block']) {
// calculate vertical space for block tags
if (isset($parent['fontsize'])) {
$pre_h = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
} else {
$pre_h = $this->FontSize * $this->cell_height_ratio;
}
$hb = 2 * $pre_h;
}
//Closing tag
switch($tag['value']) {
case 'tr': {
@ -15614,11 +15694,11 @@ if (!class_exists('TCPDF', false)) {
} else {
$this->lMargin -= $this->listindent;
}
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], true);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], true);
break;
}
case 'p': {
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], true);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], true);
break;
}
case 'pre': {
@ -15630,7 +15710,7 @@ if (!class_exists('TCPDF', false)) {
--$this->listnum;
if ($this->listnum <= 0) {
$this->listnum = 0;
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], true);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], true);
}
break;
}
@ -15660,7 +15740,7 @@ if (!class_exists('TCPDF', false)) {
}
if ($this->listnum <= 0) {
$this->listnum = 0;
$this->addHTMLVertSpace(2, $cell, '', $firstorlast, $tag['value'], true);
$this->addHTMLVertSpace(1, $cell, $hb, $firstorlast, $tag['value'], true);
}
$this->lasth = $this->FontSize * $this->cell_height_ratio;
break;
@ -15676,7 +15756,7 @@ if (!class_exists('TCPDF', false)) {
case 'h4':
case 'h5':
case 'h6': {
$this->addHTMLVertSpace(1, $cell, ($parent['fontsize'] * 1.5) / $this->k, $firstorlast, $tag['value'], true);
$this->addHTMLVertSpace(1, $cell, 3*$hb/4, $firstorlast, $tag['value'], true);
break;
}
// Form fields (since 4.8.000 - 2009-09-07)
@ -17051,6 +17131,7 @@ if (!class_exists('TCPDF', false)) {
$this->SetLeftMargin($x);
$this->SetRightMargin($this->w - $x - $this->columns[$col]['w']);
}
$this->columns[$col]['x'] = $x;
$this->x = $x;
}
$this->current_column = $col;