32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-12-25 01:45:58 +00:00
This commit is contained in:
nicolaasuni 2009-05-05 10:25:50 +02:00
parent 00455b22a7
commit f600792206
16 changed files with 90 additions and 90 deletions

View File

@ -1,3 +1,8 @@
4.6.007 (2009-05-05)
- Bug #2786685 "writeHtmlCell and <br /> in custom footer" was fixed.
- Table header repeating bug was fixed.
- Some newlines and tabs are now automatically removed from HTML strings.
4.6.006 (2009-04-28) 4.6.006 (2009-04-28)
- Support for "<a name="...">...</a>" was added. - Support for "<a name="...">...</a>" was added.
- By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces). - By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces).

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 4.6.006 Version: 4.6.007
Release date: 2009-04-28 Release date: 2009-05-05
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2001-2009: Copyright (c) 2001-2009:
@ -56,7 +56,7 @@ Main Features:
Installation (full instructions on http://www.tcpdf.org): Installation (full instructions on http://www.tcpdf.org):
1. copy the folder on your Web server 1. copy the folder on your Web server
2. set your installation path on the config/tcpdf_config.php 2. set your installation path and other parameters on the config/tcpdf_config.php
3. call the example/example_001.php page with your browser to see an example 3. call the example/example_001.php page with your browser to see an example
Source Code Documentation: Source Code Documentation:

View File

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -74,7 +74,7 @@ Source Location: /tcpdf.php<br /><br />
<h4>Version:</h4> <h4>Version:</h4>
<ul> <ul>
<li>4.6.006</li> <li>4.6.007</li>
</ul> </ul>
@ -587,7 +587,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni - info@tecnick.com</td> <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni - info@tecnick.com</td>
</tr> </tr>
<tr> <tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.006</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.007</td>
</tr> </tr>
<tr> <tr>
<td><b>link:</b>&nbsp;&nbsp;</td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td> <td><b>link:</b>&nbsp;&nbsp;</td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
@ -5511,7 +5511,7 @@ $style = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodaddHTMLVertSpace"></a> <a name="methodaddHTMLVertSpace"></a>
<h3>method addHTMLVertSpace <span class="smalllinenumber">[line 12621]</span></h3> <h3>method addHTMLVertSpace <span class="smalllinenumber">[line 12616]</span></h3>
<div class="function"> <div class="function">
<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">
@ -5722,7 +5722,7 @@ $k)</code>
</div> </div>
<hr /> <hr />
<a name="methodaddTOC"></a> <a name="methodaddTOC"></a>
<h3>method addTOC <span class="smalllinenumber">[line 13643]</span></h3> <h3>method addTOC <span class="smalllinenumber">[line 13638]</span></h3>
<div class="function"> <div class="function">
<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">
@ -6512,7 +6512,7 @@ $h)</code>
</div> </div>
<hr /> <hr />
<a name="methodcloseHTMLTagHandler"></a> <a name="methodcloseHTMLTagHandler"></a>
<h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 12297]</span></h3> <h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 12292]</span></h3>
<div class="function"> <div class="function">
<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">
@ -6626,7 +6626,7 @@ $prop = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methodcommitTransaction"></a> <a name="methodcommitTransaction"></a>
<h3>method commitTransaction <span class="smalllinenumber">[line 13800]</span></h3> <h3>method commitTransaction <span class="smalllinenumber">[line 13795]</span></h3>
<div class="function"> <div class="function">
<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">
@ -6897,7 +6897,7 @@ $fill_color = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methoddeletePage"></a> <a name="methoddeletePage"></a>
<h3>method deletePage <span class="smalllinenumber">[line 13503]</span></h3> <h3>method deletePage <span class="smalllinenumber">[line 13498]</span></h3>
<div class="function"> <div class="function">
<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">
@ -7056,7 +7056,7 @@ $afinish:)</code>
</div> </div>
<hr /> <hr />
<a name="methodempty_string"></a> <a name="methodempty_string"></a>
<h3>method empty_string <span class="smalllinenumber">[line 13847]</span></h3> <h3>method empty_string <span class="smalllinenumber">[line 13842]</span></h3>
<div class="function"> <div class="function">
<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">
@ -7560,7 +7560,7 @@ $pagenum = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodgetBuffer"></a> <a name="methodgetBuffer"></a>
<h3>method getBuffer <span class="smalllinenumber">[line 13189]</span></h3> <h3>method getBuffer <span class="smalllinenumber">[line 13184]</span></h3>
<div class="function"> <div class="function">
<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">
@ -7757,7 +7757,7 @@ $char)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetFontBuffer"></a> <a name="methodgetFontBuffer"></a>
<h3>method getFontBuffer <span class="smalllinenumber">[line 13349]</span></h3> <h3>method getFontBuffer <span class="smalllinenumber">[line 13344]</span></h3>
<div class="function"> <div class="function">
<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">
@ -8046,7 +8046,7 @@ $v)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetGraphicVars"></a> <a name="methodgetGraphicVars"></a>
<h3>method getGraphicVars <span class="smalllinenumber">[line 13057]</span></h3> <h3>method getGraphicVars <span class="smalllinenumber">[line 13052]</span></h3>
<div class="function"> <div class="function">
<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">
@ -8256,7 +8256,7 @@ $html)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetHTMLUnitToUnits"></a> <a name="methodgetHTMLUnitToUnits"></a>
<h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 12776]</span></h3> <h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 12771]</span></h3>
<div class="function"> <div class="function">
<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">
@ -8322,7 +8322,7 @@ $point)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetImageBuffer"></a> <a name="methodgetImageBuffer"></a>
<h3>method getImageBuffer <span class="smalllinenumber">[line 13291]</span></h3> <h3>method getImageBuffer <span class="smalllinenumber">[line 13286]</span></h3>
<div class="function"> <div class="function">
<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">
@ -8668,7 +8668,7 @@ $w = 0])</code>
</div> </div>
<hr /> <hr />
<a name="methodgetObjFilename"></a> <a name="methodgetObjFilename"></a>
<h3>method getObjFilename <span class="smalllinenumber">[line 13121]</span></h3> <h3>method getObjFilename <span class="smalllinenumber">[line 13116]</span></h3>
<div class="function"> <div class="function">
<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">
@ -8778,7 +8778,7 @@ $prefix)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetPageBuffer"></a> <a name="methodgetPageBuffer"></a>
<h3>method getPageBuffer <span class="smalllinenumber">[line 13232]</span></h3> <h3>method getPageBuffer <span class="smalllinenumber">[line 13227]</span></h3>
<div class="function"> <div class="function">
<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">
@ -9693,7 +9693,7 @@ $script)</code>
</div> </div>
<hr /> <hr />
<a name="methodintToRoman"></a> <a name="methodintToRoman"></a>
<h3>method intToRoman <span class="smalllinenumber">[line 12850]</span></h3> <h3>method intToRoman <span class="smalllinenumber">[line 12845]</span></h3>
<div class="function"> <div class="function">
<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">
@ -10287,7 +10287,7 @@ $y = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodmovePage"></a> <a name="methodmovePage"></a>
<h3>method movePage <span class="smalllinenumber">[line 13366]</span></h3> <h3>method movePage <span class="smalllinenumber">[line 13361]</span></h3>
<div class="function"> <div class="function">
<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">
@ -10461,7 +10461,7 @@ $maxh = 0])</code>
</div> </div>
<hr /> <hr />
<a name="methodobjclone"></a> <a name="methodobjclone"></a>
<h3>method objclone <span class="smalllinenumber">[line 13836]</span></h3> <h3>method objclone <span class="smalllinenumber">[line 13831]</span></h3>
<div class="function"> <div class="function">
<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">
@ -10534,7 +10534,7 @@ $object)</code>
</div> </div>
<hr /> <hr />
<a name="methodopenHTMLTagHandler"></a> <a name="methodopenHTMLTagHandler"></a>
<h3>method openHTMLTagHandler <span class="smalllinenumber">[line 11973]</span></h3> <h3>method openHTMLTagHandler <span class="smalllinenumber">[line 11968]</span></h3>
<div class="function"> <div class="function">
<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">
@ -10974,7 +10974,7 @@ $fill_color = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methodputHtmlListBullet"></a> <a name="methodputHtmlListBullet"></a>
<h3>method putHtmlListBullet <span class="smalllinenumber">[line 12915]</span></h3> <h3>method putHtmlListBullet <span class="smalllinenumber">[line 12910]</span></h3>
<div class="function"> <div class="function">
<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">
@ -11151,7 +11151,7 @@ $prop = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methodreadDiskCache"></a> <a name="methodreadDiskCache"></a>
<h3>method readDiskCache <span class="smalllinenumber">[line 13161]</span></h3> <h3>method readDiskCache <span class="smalllinenumber">[line 13156]</span></h3>
<div class="function"> <div class="function">
<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">
@ -11481,7 +11481,7 @@ $length)</code>
</div> </div>
<hr /> <hr />
<a name="methodrollbackTransaction"></a> <a name="methodrollbackTransaction"></a>
<h3>method rollbackTransaction <span class="smalllinenumber">[line 13813]</span></h3> <h3>method rollbackTransaction <span class="smalllinenumber">[line 13808]</span></h3>
<div class="function"> <div class="function">
<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">
@ -12043,7 +12043,7 @@ $bc = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodSetBooklet"></a> <a name="methodSetBooklet"></a>
<h3>method SetBooklet <span class="smalllinenumber">[line 12690]</span></h3> <h3>method SetBooklet <span class="smalllinenumber">[line 12685]</span></h3>
<div class="function"> <div class="function">
<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">
@ -12094,7 +12094,7 @@ $outer = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetBuffer"></a> <a name="methodsetBuffer"></a>
<h3>method setBuffer <span class="smalllinenumber">[line 13171]</span></h3> <h3>method setBuffer <span class="smalllinenumber">[line 13166]</span></h3>
<div class="function"> <div class="function">
<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">
@ -12814,7 +12814,7 @@ $fontfile = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetFontBuffer"></a> <a name="methodsetFontBuffer"></a>
<h3>method setFontBuffer <span class="smalllinenumber">[line 13307]</span></h3> <h3>method setFontBuffer <span class="smalllinenumber">[line 13302]</span></h3>
<div class="function"> <div class="function">
<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">
@ -12901,7 +12901,7 @@ $size)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetFontSubBuffer"></a> <a name="methodsetFontSubBuffer"></a>
<h3>method setFontSubBuffer <span class="smalllinenumber">[line 13329]</span></h3> <h3>method setFontSubBuffer <span class="smalllinenumber">[line 13324]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13055,7 +13055,7 @@ $fm = 10])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetGraphicVars"></a> <a name="methodsetGraphicVars"></a>
<h3>method setGraphicVars <span class="smalllinenumber">[line 13088]</span></h3> <h3>method setGraphicVars <span class="smalllinenumber">[line 13083]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13251,7 +13251,7 @@ $hm = 10])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetHtmlLinksStyle"></a> <a name="methodsetHtmlLinksStyle"></a>
<h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 12761]</span></h3> <h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 12756]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13296,7 +13296,7 @@ $fontstyle = 'U'])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetHtmlVSpace"></a> <a name="methodsetHtmlVSpace"></a>
<h3>method setHtmlVSpace <span class="smalllinenumber">[line 12730]</span></h3> <h3>method setHtmlVSpace <span class="smalllinenumber">[line 12725]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13335,7 +13335,7 @@ $tagvs)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetImageBuffer"></a> <a name="methodsetImageBuffer"></a>
<h3>method setImageBuffer <span class="smalllinenumber">[line 13248]</span></h3> <h3>method setImageBuffer <span class="smalllinenumber">[line 13243]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13422,7 +13422,7 @@ $scale)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetImageSubBuffer"></a> <a name="methodsetImageSubBuffer"></a>
<h3>method setImageSubBuffer <span class="smalllinenumber">[line 13271]</span></h3> <h3>method setImageSubBuffer <span class="smalllinenumber">[line 13266]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13816,7 +13816,7 @@ $page = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetListIndentWidth"></a> <a name="methodsetListIndentWidth"></a>
<h3>method setListIndentWidth <span class="smalllinenumber">[line 12740]</span></h3> <h3>method setListIndentWidth <span class="smalllinenumber">[line 12735]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13855,7 +13855,7 @@ $width)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetLIsymbol"></a> <a name="methodsetLIsymbol"></a>
<h3>method setLIsymbol <span class="smalllinenumber">[line 12650]</span></h3> <h3>method setLIsymbol <span class="smalllinenumber">[line 12645]</span></h3>
<div class="function"> <div class="function">
<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">
@ -13948,7 +13948,7 @@ $right = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetOpenCell"></a> <a name="methodsetOpenCell"></a>
<h3>method setOpenCell <span class="smalllinenumber">[line 12750]</span></h3> <h3>method setOpenCell <span class="smalllinenumber">[line 12745]</span></h3>
<div class="function"> <div class="function">
<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">
@ -14035,7 +14035,7 @@ $resetmargins = false])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetPageBuffer"></a> <a name="methodsetPageBuffer"></a>
<h3>method setPageBuffer <span class="smalllinenumber">[line 13205]</span></h3> <h3>method setPageBuffer <span class="smalllinenumber">[line 13200]</span></h3>
<div class="function"> <div class="function">
<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">
@ -15541,7 +15541,7 @@ $page = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodstartTransaction"></a> <a name="methodstartTransaction"></a>
<h3>method startTransaction <span class="smalllinenumber">[line 13786]</span></h3> <h3>method startTransaction <span class="smalllinenumber">[line 13781]</span></h3>
<div class="function"> <div class="function">
<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">
@ -15631,7 +15631,7 @@ $page = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodswapMargins"></a> <a name="methodswapMargins"></a>
<h3>method swapMargins <span class="smalllinenumber">[line 12706]</span></h3> <h3>method swapMargins <span class="smalllinenumber">[line 12701]</span></h3>
<div class="function"> <div class="function">
<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">
@ -16825,7 +16825,7 @@ $code)</code>
</div> </div>
<hr /> <hr />
<a name="methodwriteDiskCache"></a> <a name="methodwriteDiskCache"></a>
<h3>method writeDiskCache <span class="smalllinenumber">[line 13133]</span></h3> <h3>method writeDiskCache <span class="smalllinenumber">[line 13128]</span></h3>
<div class="function"> <div class="function">
<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">
@ -16882,7 +16882,7 @@ $file)</code>
</div> </div>
<hr /> <hr />
<a name="methodwriteHTML"></a> <a name="methodwriteHTML"></a>
<h3>method writeHTML <span class="smalllinenumber">[line 11153]</span></h3> <h3>method writeHTML <span class="smalllinenumber">[line 11150]</span></h3>
<div class="function"> <div class="function">
<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">
@ -19113,7 +19113,7 @@ $file)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:38 +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

@ -1368,7 +1368,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -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 Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 28 Apr 2009 10:12:03 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:43 +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 Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:38 +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.006</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.007</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.006 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.6.007 (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 Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:38 +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 Tue, 28 Apr 2009 10:12:03 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:43 +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

@ -1362,7 +1362,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 Tue, 28 Apr 2009 10:11:57 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -1385,7 +1385,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 Tue, 28 Apr 2009 10:11:57 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -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 Tue, 28 Apr 2009 10:12:04 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25:43 +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 Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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 Tue, 28 Apr 2009 10:11:58 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a> Documentation generated on Tue, 05 May 2009 10:25: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

@ -2,9 +2,9 @@
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2009-04-28 // Last Update : 2009-05-05
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.6.006 // Version : 4.6.007
// 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.
@ -126,7 +126,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.006 * @version 4.6.007
*/ */
/** /**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 4.6.006 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.6.007 (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.006 * @version 4.6.007
* @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
@ -10758,28 +10758,25 @@ if (!class_exists('TCPDF', false)) {
// remove all unsupported tags (the line below lists all supported tags) // remove all unsupported tags (the line below lists all supported tags)
$html = strip_tags($html, '<marker/><a><b><blockquote><br><br/><dd><del><div><dl><dt><em><font><h1><h2><h3><h4><h5><h6><hr><i><img><li><ol><p><pre><small><span><strong><sub><sup><table><tcpdf><td><th><thead><tr><tt><u><ul>'); $html = strip_tags($html, '<marker/><a><b><blockquote><br><br/><dd><del><div><dl><dt><em><font><h1><h2><h3><h4><h5><h6><hr><i><img><li><ol><p><pre><small><span><strong><sub><sup><table><tcpdf><td><th><thead><tr><tt><u><ul>');
//replace some blank characters //replace some blank characters
$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
$html = preg_replace('/<(table|tr|td|th|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
$html = preg_replace('@(\r\n|\r)@', "\n", $html); $html = preg_replace('@(\r\n|\r)@', "\n", $html);
$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\"); $repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
$html = strtr($html, $repTable); $html = strtr($html, $repTable);
while (preg_match("'<pre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html)) { while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html)) {
// preserve newlines on <pre> tag // preserve newlines on <pre> tag
$html = preg_replace("'<pre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<pre\\1>\\2<br />\\3</pre>", $html); $html = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $html);
} }
$html = str_replace("\n", ' ', $html); $html = str_replace("\n", ' ', $html);
/*
$html = preg_replace("'<div([^\>]*)>'si", "<br /><table><tr><td\\1>", $html);
$html = preg_replace("'</div>'si", "</td></tr></table>", $html);
$html = preg_replace("'<pre([^\>]*)>'si", "<table><tr><td\\1>", $html);
$html = preg_replace("'</pre>'si", "</td></tr></table>", $html);
*/
// remove extra spaces from code // remove extra spaces from code
$html = preg_replace('/[\s]+<\/(table|tr|td|th|ul|ol|li)>/', '</\\1>', $html); $html = preg_replace('/[\s]+<\/(table|tr|td|th|ul|ol|li)>/', '</\\1>', $html);
$html = preg_replace('/[\s]+<(tr|td|th|ul|ol|li|br)/', '<\\1', $html); $html = preg_replace('/[\s]+<(tr|td|th|ul|ol|li|br)/', '<\\1', $html);
$html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|ul)>[\s]+</', '</\\1><', $html); $html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
$html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html); $html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
$html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html); $html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
$html = preg_replace('/<img/', ' <img', $html); $html = preg_replace('/<img/', ' <img', $html);
$html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span></span>', $html); $html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span></span>', $html);
$html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
// trim string // trim string
$html = preg_replace('/^[\s]+/', '', $html); $html = preg_replace('/^[\s]+/', '', $html);
$html = preg_replace('/[\s]+$/', '', $html); $html = preg_replace('/[\s]+$/', '', $html);
@ -11343,12 +11340,12 @@ if (!class_exists('TCPDF', false)) {
// the last line must be shifted to be aligned as requested // the last line must be shifted to be aligned as requested
$linew = abs($this->endlinex - $startlinex); $linew = abs($this->endlinex - $startlinex);
$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
if (isset($opentagpos) AND isset($this->footerlen[$startlinepage])) { if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
$midpos = min($opentagpos, $this->footerpos[$startlinepage]); $midpos = min($opentagpos, $this->footerpos[$startlinepage]);
} elseif (isset($opentagpos)) { } elseif (isset($opentagpos)) {
$midpos = $opentagpos; $midpos = $opentagpos;
} elseif (isset($this->footerlen[$startlinepage])) { } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
$midpos = $this->footerpos[$startlinepage]; $midpos = $this->footerpos[$startlinepage];
} else { } else {
@ -11390,7 +11387,6 @@ if (!class_exists('TCPDF', false)) {
} }
$no = 0; $no = 0;
$ns = 0; $ns = 0;
$pmidtemp = $pmid; $pmidtemp = $pmid;
// escape special characters // escape special characters
$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp); $pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
@ -11398,7 +11394,6 @@ if (!class_exists('TCPDF', false)) {
// search spaces // search spaces
if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmidtemp, $lnstring, PREG_PATTERN_ORDER)) { if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmidtemp, $lnstring, PREG_PATTERN_ORDER)) {
$maxkk = count($lnstring[1]) - 1; $maxkk = count($lnstring[1]) - 1;
//foreach ($lnstring[1] as $kk => $value) {
for ($kk=0; $kk <= $maxkk; ++$kk) { for ($kk=0; $kk <= $maxkk; ++$kk) {
// restore special characters // restore special characters
$lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]); $lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]);
@ -11791,8 +11786,8 @@ if (!class_exists('TCPDF', false)) {
} else { } else {
$this->footerpos[$this->page] = $this->pagelen[$this->page]; $this->footerpos[$this->page] = $this->pagelen[$this->page];
} }
$opentagpos = $this->footerpos[$this->page];
} }
$opentagpos = $this->footerpos[$this->page];
} }
$this->openHTMLTagHandler($dom, $key, $cell); $this->openHTMLTagHandler($dom, $key, $cell);
} }
@ -11891,12 +11886,12 @@ if (!class_exists('TCPDF', false)) {
// the last line must be shifted to be aligned as requested // the last line must be shifted to be aligned as requested
$linew = abs($this->endlinex - $startlinex); $linew = abs($this->endlinex - $startlinex);
$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
if (isset($opentagpos) AND isset($this->footerlen[$startlinepage])) { if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
$midpos = min($opentagpos, $this->footerpos[$startlinepage]); $midpos = min($opentagpos, $this->footerpos[$startlinepage]);
} elseif (isset($opentagpos)) { } elseif (isset($opentagpos)) {
$midpos = $opentagpos; $midpos = $opentagpos;
} elseif (isset($this->footerlen[$startlinepage])) { } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
$midpos = $this->footerpos[$startlinepage]; $midpos = $this->footerpos[$startlinepage];
} else { } else {
@ -12504,14 +12499,14 @@ if (!class_exists('TCPDF', false)) {
$this->cMargin = $this->oldcMargin; $this->cMargin = $this->oldcMargin;
} }
$this->lasth = $this->FontSize * $this->cell_height_ratio; $this->lasth = $this->FontSize * $this->cell_height_ratio;
if (!$this->empty_string($table_el['thead']) AND !$this->empty_string($this->theadMargin)) { if (!$this->empty_string($this->theadMargin)) {
// reset table header
$this->thead = '';
// restore top margin // restore top margin
$this->tMargin = $this->theadMargin; $this->tMargin = $this->theadMargin;
$this->pagedim[$this->page]['tm'] = $this->theadMargin; $this->pagedim[$this->page]['tm'] = $this->theadMargin;
$this->theadMargin = '';
} }
// reset table header
$this->thead = '';
$this->theadMargin = '';
break; break;
} }
case 'a': { case 'a': {