joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-26 06:17:33 +00:00
Code Issues Releases Activity

4.8.035

Browse Source
This commit is contained in:
nicolaasuni 2010-02-23 20:41:01 +01:00
parent 263315ae94
commit dd2421a4db
18 changed files with 158 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,3 +1,7 @@
4.8.035 (2010-02-23)
- Automatic page break for HTML images was added.
- Support for multicolumn HTML was added (example 10 was updated).
4.8.034 (2010-02-17) 4.8.034 (2010-02-17)
- Language files were updated. - Language files were updated.

4
README.TXT
View File

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

2
cache/chapter_demo_2.txt vendored
View File

@ -20,4 +20,4 @@ I complied. Since I could no longer hold my tongue, I let it wag. I discussed th
"In essence, the narwhale is armed with a sort of ivory sword, or lance, as certain naturalists have expressed it. It's a king-sized tooth as hard as steel. Some of these teeth have been found buried in the bodies of baleen whales, which the narwhale attacks with invariable success. Others have been wrenched, not without difficulty, from the undersides of vessels that narwhales have pierced clean through, as a gimlet pierces a wine barrel. The museum at the Faculty of Medicine in Paris owns one of these tusks with a length of 2.25 meters and a width at its base of forty-eight centimeters! "In essence, the narwhale is armed with a sort of ivory sword, or lance, as certain naturalists have expressed it. It's a king-sized tooth as hard as steel. Some of these teeth have been found buried in the bodies of baleen whales, which the narwhale attacks with invariable success. Others have been wrenched, not without difficulty, from the undersides of vessels that narwhales have pierced clean through, as a gimlet pierces a wine barrel. The museum at the Faculty of Medicine in Paris owns one of these tusks with a length of 2.25 meters and a width at its base of forty-eight centimeters!
"All right then! Imagine this weapon to be ten times stronger and the animal ten times more powerful, launch it at a speed of twenty miles per hour, multiply its mass times its velocity, and you get just the collision we need to cause the specified catastrophe. "All right then! Imagine this weapon to be ten times stronger and the animal ten times more powerful, launch it at a speed of twenty miles per hour, multiply its mass times its velocity, and you get just the collision we need to cause the specified catastrophe.
"So, until information becomes more abundant, I plump for a sea unicorn of colossal dimensions, no longer armed with a mere lance but with an actual spur, like ironclad frigates or those warships called 'rams,' whose mass and motor power it would possess simultaneously. "So, until information becomes more abundant, I plump for a sea unicorn of colossal dimensions, no longer armed with a mere lance but with an actual spur, like ironclad frigates or those warships called 'rams,' whose mass and motor power it would possess simultaneously.
"This inexplicable phenomenon is thus explained away--unless it's something else entirely, which, despite everything that has been sighted, studied, explored and experienced, is still possible!" "This inexplicable phenomenon is thus explained away unless it's something else entirely, which, despite everything that has been sighted, studied, explored and experienced, is still possible!"

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

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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

@ -74,7 +74,7 @@ Source Location: /tcpdf.php<br /><br />
<h4>Version:</h4> <h4>Version:</h4>
<ul> <ul>
<li>4.8.034</li> <li>4.8.035</li>
</ul> </ul>
@ -634,7 +634,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.8.034</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.035</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>
@ -6299,7 +6299,7 @@ $style = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodaddHTMLVertSpace"></a> <a name="methodaddHTMLVertSpace"></a>
<h3>method addHTMLVertSpace <span class="smalllinenumber">[line 15119]</span></h3> <h3>method addHTMLVertSpace <span class="smalllinenumber">[line 15145]</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">
@ -6561,7 +6561,7 @@ $k)</code>
</div> </div>
<hr /> <hr />
<a name="methodaddTOC"></a> <a name="methodaddTOC"></a>
<h3>method addTOC <span class="smalllinenumber">[line 16143]</span></h3> <h3>method addTOC <span class="smalllinenumber">[line 16169]</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">
@ -7519,7 +7519,7 @@ $h)</code>
</div> </div>
<hr /> <hr />
<a name="methodcloseHTMLTagHandler"></a> <a name="methodcloseHTMLTagHandler"></a>
<h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 14766]</span></h3> <h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 14792]</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">
@ -7663,7 +7663,7 @@ $js = false])</code>
</div> </div>
<hr /> <hr />
<a name="methodcommitTransaction"></a> <a name="methodcommitTransaction"></a>
<h3>method commitTransaction <span class="smalllinenumber">[line 16301]</span></h3> <h3>method commitTransaction <span class="smalllinenumber">[line 16327]</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">
@ -7934,7 +7934,7 @@ $fill_color = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methoddeletePage"></a> <a name="methoddeletePage"></a>
<h3>method deletePage <span class="smalllinenumber">[line 16001]</span></h3> <h3>method deletePage <span class="smalllinenumber">[line 16027]</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">
@ -8093,7 +8093,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 16355]</span></h3> <h3>method empty_string <span class="smalllinenumber">[line 16381]</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">
@ -8642,7 +8642,7 @@ $pagenum = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodgetBuffer"></a> <a name="methodgetBuffer"></a>
<h3>method getBuffer <span class="smalllinenumber">[line 15687]</span></h3> <h3>method getBuffer <span class="smalllinenumber">[line 15713]</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">
@ -8842,7 +8842,7 @@ $char)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetFontBuffer"></a> <a name="methodgetFontBuffer"></a>
<h3>method getFontBuffer <span class="smalllinenumber">[line 15847]</span></h3> <h3>method getFontBuffer <span class="smalllinenumber">[line 15873]</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">
@ -9165,7 +9165,7 @@ $v)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetGraphicVars"></a> <a name="methodgetGraphicVars"></a>
<h3>method getGraphicVars <span class="smalllinenumber">[line 15555]</span></h3> <h3>method getGraphicVars <span class="smalllinenumber">[line 15581]</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">
@ -9381,7 +9381,7 @@ $html)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetHTMLUnitToUnits"></a> <a name="methodgetHTMLUnitToUnits"></a>
<h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 15274]</span></h3> <h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 15300]</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">
@ -9447,7 +9447,7 @@ $point)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetImageBuffer"></a> <a name="methodgetImageBuffer"></a>
<h3>method getImageBuffer <span class="smalllinenumber">[line 15789]</span></h3> <h3>method getImageBuffer <span class="smalllinenumber">[line 15815]</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">
@ -9835,7 +9835,7 @@ $w = 0])</code>
</div> </div>
<hr /> <hr />
<a name="methodgetObjFilename"></a> <a name="methodgetObjFilename"></a>
<h3>method getObjFilename <span class="smalllinenumber">[line 15619]</span></h3> <h3>method getObjFilename <span class="smalllinenumber">[line 15645]</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">
@ -9945,7 +9945,7 @@ $prefix)</code>
</div> </div>
<hr /> <hr />
<a name="methodgetPageBuffer"></a> <a name="methodgetPageBuffer"></a>
<h3>method getPageBuffer <span class="smalllinenumber">[line 15730]</span></h3> <h3>method getPageBuffer <span class="smalllinenumber">[line 15756]</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">
@ -10958,7 +10958,7 @@ $script)</code>
</div> </div>
<hr /> <hr />
<a name="methodintToRoman"></a> <a name="methodintToRoman"></a>
<h3>method intToRoman <span class="smalllinenumber">[line 15348]</span></h3> <h3>method intToRoman <span class="smalllinenumber">[line 15374]</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">
@ -11610,7 +11610,7 @@ $y = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodmovePage"></a> <a name="methodmovePage"></a>
<h3>method movePage <span class="smalllinenumber">[line 15864]</span></h3> <h3>method movePage <span class="smalllinenumber">[line 15890]</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">
@ -11784,7 +11784,7 @@ $maxh = 0])</code>
</div> </div>
<hr /> <hr />
<a name="methodobjclone"></a> <a name="methodobjclone"></a>
<h3>method objclone <span class="smalllinenumber">[line 16344]</span></h3> <h3>method objclone <span class="smalllinenumber">[line 16370]</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">
@ -11857,7 +11857,7 @@ $object)</code>
</div> </div>
<hr /> <hr />
<a name="methodopenHTMLTagHandler"></a> <a name="methodopenHTMLTagHandler"></a>
<h3>method openHTMLTagHandler <span class="smalllinenumber">[line 14221]</span></h3> <h3>method openHTMLTagHandler <span class="smalllinenumber">[line 14246]</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">
@ -12366,7 +12366,7 @@ $closed)</code>
</div> </div>
<hr /> <hr />
<a name="methodputHtmlListBullet"></a> <a name="methodputHtmlListBullet"></a>
<h3>method putHtmlListBullet <span class="smalllinenumber">[line 15413]</span></h3> <h3>method putHtmlListBullet <span class="smalllinenumber">[line 15439]</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">
@ -12585,7 +12585,7 @@ $js = false])</code>
</div> </div>
<hr /> <hr />
<a name="methodreadDiskCache"></a> <a name="methodreadDiskCache"></a>
<h3>method readDiskCache <span class="smalllinenumber">[line 15659]</span></h3> <h3>method readDiskCache <span class="smalllinenumber">[line 15685]</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">
@ -12915,7 +12915,7 @@ $length)</code>
</div> </div>
<hr /> <hr />
<a name="methodrollbackTransaction"></a> <a name="methodrollbackTransaction"></a>
<h3>method rollbackTransaction <span class="smalllinenumber">[line 16315]</span></h3> <h3>method rollbackTransaction <span class="smalllinenumber">[line 16341]</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">
@ -13491,7 +13491,7 @@ $bc = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodSetBooklet"></a> <a name="methodSetBooklet"></a>
<h3>method SetBooklet <span class="smalllinenumber">[line 15188]</span></h3> <h3>method SetBooklet <span class="smalllinenumber">[line 15214]</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">
@ -13542,7 +13542,7 @@ $outer = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetBuffer"></a> <a name="methodsetBuffer"></a>
<h3>method setBuffer <span class="smalllinenumber">[line 15669]</span></h3> <h3>method setBuffer <span class="smalllinenumber">[line 15695]</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">
@ -14310,7 +14310,7 @@ $fontfile = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetFontBuffer"></a> <a name="methodsetFontBuffer"></a>
<h3>method setFontBuffer <span class="smalllinenumber">[line 15805]</span></h3> <h3>method setFontBuffer <span class="smalllinenumber">[line 15831]</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">
@ -14397,7 +14397,7 @@ $size)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetFontSubBuffer"></a> <a name="methodsetFontSubBuffer"></a>
<h3>method setFontSubBuffer <span class="smalllinenumber">[line 15827]</span></h3> <h3>method setFontSubBuffer <span class="smalllinenumber">[line 15853]</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">
@ -14593,7 +14593,7 @@ $prop = array()])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetGraphicVars"></a> <a name="methodsetGraphicVars"></a>
<h3>method setGraphicVars <span class="smalllinenumber">[line 15586]</span></h3> <h3>method setGraphicVars <span class="smalllinenumber">[line 15612]</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">
@ -14789,7 +14789,7 @@ $hm = 10])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetHtmlLinksStyle"></a> <a name="methodsetHtmlLinksStyle"></a>
<h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 15259]</span></h3> <h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 15285]</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">
@ -14834,7 +14834,7 @@ $fontstyle = 'U'])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetHtmlVSpace"></a> <a name="methodsetHtmlVSpace"></a>
<h3>method setHtmlVSpace <span class="smalllinenumber">[line 15228]</span></h3> <h3>method setHtmlVSpace <span class="smalllinenumber">[line 15254]</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">
@ -14873,7 +14873,7 @@ $tagvs)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetImageBuffer"></a> <a name="methodsetImageBuffer"></a>
<h3>method setImageBuffer <span class="smalllinenumber">[line 15746]</span></h3> <h3>method setImageBuffer <span class="smalllinenumber">[line 15772]</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">
@ -14960,7 +14960,7 @@ $scale)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetImageSubBuffer"></a> <a name="methodsetImageSubBuffer"></a>
<h3>method setImageSubBuffer <span class="smalllinenumber">[line 15769]</span></h3> <h3>method setImageSubBuffer <span class="smalllinenumber">[line 15795]</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">
@ -15357,7 +15357,7 @@ $page = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetListIndentWidth"></a> <a name="methodsetListIndentWidth"></a>
<h3>method setListIndentWidth <span class="smalllinenumber">[line 15238]</span></h3> <h3>method setListIndentWidth <span class="smalllinenumber">[line 15264]</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">
@ -15396,7 +15396,7 @@ $width)</code>
</div> </div>
<hr /> <hr />
<a name="methodsetLIsymbol"></a> <a name="methodsetLIsymbol"></a>
<h3>method setLIsymbol <span class="smalllinenumber">[line 15148]</span></h3> <h3>method setLIsymbol <span class="smalllinenumber">[line 15174]</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">
@ -15489,7 +15489,7 @@ $right = -1])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetOpenCell"></a> <a name="methodsetOpenCell"></a>
<h3>method setOpenCell <span class="smalllinenumber">[line 15248]</span></h3> <h3>method setOpenCell <span class="smalllinenumber">[line 15274]</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">
@ -15576,7 +15576,7 @@ $resetmargins = false])</code>
</div> </div>
<hr /> <hr />
<a name="methodsetPageBuffer"></a> <a name="methodsetPageBuffer"></a>
<h3>method setPageBuffer <span class="smalllinenumber">[line 15703]</span></h3> <h3>method setPageBuffer <span class="smalllinenumber">[line 15729]</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">
@ -17205,7 +17205,7 @@ $page = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodstartTransaction"></a> <a name="methodstartTransaction"></a>
<h3>method startTransaction <span class="smalllinenumber">[line 16285]</span></h3> <h3>method startTransaction <span class="smalllinenumber">[line 16311]</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">
@ -17295,7 +17295,7 @@ $page = ''])</code>
</div> </div>
<hr /> <hr />
<a name="methodswapMargins"></a> <a name="methodswapMargins"></a>
<h3>method swapMargins <span class="smalllinenumber">[line 15204]</span></h3> <h3>method swapMargins <span class="smalllinenumber">[line 15230]</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">
@ -18561,7 +18561,7 @@ $code)</code>
</div> </div>
<hr /> <hr />
<a name="methodwriteDiskCache"></a> <a name="methodwriteDiskCache"></a>
<h3>method writeDiskCache <span class="smalllinenumber">[line 15631]</span></h3> <h3>method writeDiskCache <span class="smalllinenumber">[line 15657]</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">
@ -21177,7 +21177,7 @@ $file)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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

@ -1368,7 +1368,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_barcodes.php.html
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 Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
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 Wed, 17 Feb 2010 18:29:54 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_htmlcolors.php.html
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 Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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

@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td> <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr> </tr>
<tr> <tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.034</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.035</td>
</tr> </tr>
<tr> <tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td> <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@ -104,7 +104,7 @@ unicode data<br /><br /></div>
<div class="tags"> <div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border"> <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code"> <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 4.8.034 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.8.035 (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 Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_unicode_data.php.html
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 Wed, 17 Feb 2010 18:29:54 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/elementindex.html
View File

@ -1456,7 +1456,7 @@
<a href="elementindex.html#top">top</a><br> <a href="elementindex.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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

@ -1479,7 +1479,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br> <a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/errors.html
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 Wed, 17 Feb 2010 18:29:54 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/index.html
View File

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Wed, 17 Feb 2010 18:29:51 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

22
examples/example_010.php
View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : example_010.php // File name : example_010.php
// Begin : 2008-03-04 // Begin : 2008-03-04
// Last Update : 2009-09-30 // Last Update : 2010-02-23
// //
// Description : Example 010 for TCPDF class // Description : Example 010 for TCPDF class
// Text on multiple columns // Text on multiple columns
@ -68,10 +68,10 @@ class MYPDF extends TCPDF {
$this->SetRightMargin($this->w - $x - $this->colwidth); $this->SetRightMargin($this->w - $x - $this->colwidth);
} }
$this->x = $x; $this->x = $x;
//$this->x = $x + $this->cMargin; // use this for html mode
if ($col > 0) { if ($col > 0) {
$this->y = $this->y0; $this->y = $this->y0;
} }
$this->newline = true;
} }
//Method accepting or not automatic page break //Method accepting or not automatic page break
@ -105,12 +105,24 @@ class MYPDF extends TCPDF {
// store current margin values // store current margin values
$lMargin = $this->lMargin; $lMargin = $this->lMargin;
$rMargin = $this->rMargin; $rMargin = $this->rMargin;
// get esternal file content // get esternal file content
$txt = file_get_contents($file, false); $txt = file_get_contents($file, false);
// Font
// set font
$this->SetFont('times', '', 9); $this->SetFont('times', '', 9);
// Output text in a column
$this->MultiCell($this->colwidth, 5, $txt, 0, 'J', 0, 1, '', '', true, 0, false); // set first column
$this->SetCol(0);
// ------ HTML MODE ------
//$this->writeHTML($txt, true, false, true, false, 'J');
// ------ HTML MODE ------
// ------ TEXT MODE ------
$this->Write(0, $txt, '', 0, 'J', true, 0, false, false, 0);
// ------ TEXT MODE ------
$this->Ln(); $this->Ln();
// Go back to first column // Go back to first column
$this->SetCol(0); $this->SetCol(0);

132
tcpdf.php
View File

@ -2,9 +2,9 @@
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-02-17 // Last Update : 2010-02-23
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.8.034 // Version : 4.8.035
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. // Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l.
@ -128,7 +128,7 @@
* @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://www.tcpdf.org * @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL * @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 4.8.034 * @version 4.8.035
*/ */
/** /**
@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 4.8.034 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.8.035 (http://www.tcpdf.org)');
/** /**
* This is a PHP class for generating PDF documents without requiring external extensions.<br> * This is a PHP class for generating PDF documents without requiring external extensions.<br>
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br> * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
* @name TCPDF * @name TCPDF
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @version 4.8.034 * @version 4.8.035
* @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
@ -13354,56 +13354,76 @@ if (!class_exists('TCPDF', false)) {
AND ($dom[$key]['value'] == 'img') AND ($dom[$key]['value'] == 'img')
AND (isset($dom[$key]['attribute']['height'])) AND (isset($dom[$key]['attribute']['height']))
AND ($dom[$key]['attribute']['height'] > 0)) { AND ($dom[$key]['attribute']['height'] > 0)) {
// get image height // get image height
$imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px'); $imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px');
if (!$this->InFooter) { // check for automatic line break
// check for page break $autolinebreak = false;
$this->checkPageBreak($imgh); if (isset($dom[$key]['attribute']['width']) AND ($dom[$key]['attribute']['width'] > 0)) {
$imgw = $this->getHTMLUnitToUnits($dom[$key]['attribute']['width'], 1, 'px', false);
if (($this->rtl AND (($this->x - $imgw) < $this->lMargin))
OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin)))) {
// add automatic line break
$autolinebreak = true;
$this->Ln('', $cell);
// go back to evaluate this line break
--$key;
}
} }
if ($this->page > $startlinepage) { if (!$autolinebreak) {
// fix line splitted over two pages if (!$this->InFooter) {
if (isset($this->footerlen[$startlinepage])) { $pre_y = $this->y;
$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; // check for page break
} $this->checkPageBreak($imgh);
// line to be moved one page forward $post_y = $this->y;
$pagebuff = $this->getPageBuffer($startlinepage); // check for multicolumn mode
$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos)); if ($post_y < $pre_y) {
$tstart = substr($pagebuff, 0, $startlinepos); $startliney = $post_y;
$tend = substr($this->getPageBuffer($startlinepage), $curpos);
// remove line from previous page
$this->setPageBuffer($startlinepage, $tstart.''.$tend);
$pagebuff = $this->getPageBuffer($this->page);
$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;
$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
if (isset($this->PageAnnots[$this->page])) {
$next_pask = count($this->PageAnnots[$this->page]);
} else {
$next_pask = 0;
}
if (isset($this->PageAnnots[$startlinepage])) {
foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
if ($pak >= $pask) {
$this->PageAnnots[$this->page][] = $pac;
unset($this->PageAnnots[$startlinepage][$pak]);
$npak = count($this->PageAnnots[$this->page]) - 1;
$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
}
} }
} }
$pask = $next_pask; if ($this->page > $startlinepage) {
$startlinepos = $this->cntmrk[$this->page]; // fix line splitted over two pages
$startlinepage = $this->page; if (isset($this->footerlen[$startlinepage])) {
$startliney = $this->y; $curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
}
// line to be moved one page forward
$pagebuff = $this->getPageBuffer($startlinepage);
$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
$tstart = substr($pagebuff, 0, $startlinepos);
$tend = substr($this->getPageBuffer($startlinepage), $curpos);
// remove line from previous page
$this->setPageBuffer($startlinepage, $tstart.''.$tend);
$pagebuff = $this->getPageBuffer($this->page);
$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;
$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
if (isset($this->PageAnnots[$this->page])) {
$next_pask = count($this->PageAnnots[$this->page]);
} else {
$next_pask = 0;
}
if (isset($this->PageAnnots[$startlinepage])) {
foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
if ($pak >= $pask) {
$this->PageAnnots[$this->page][] = $pac;
unset($this->PageAnnots[$startlinepage][$pak]);
$npak = count($this->PageAnnots[$this->page]) - 1;
$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
}
}
}
$pask = $next_pask;
$startlinepos = $this->cntmrk[$this->page];
$startlinepage = $this->page;
$startliney = $this->y;
}
$this->y += (($curfontsize / $this->k) - $imgh);
$minstartliney = min($this->y, $minstartliney);
} }
$this->y += (($curfontsize / $this->k) - $imgh);
$minstartliney = min($this->y, $minstartliney);
} elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize'])) { } elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize'])) {
// account for different font size // account for different font size
$pfontname = $curfontname; $pfontname = $curfontname;
@ -14051,11 +14071,16 @@ if (!class_exists('TCPDF', false)) {
} }
if ($newline) { if ($newline) {
if (!$this->premode) { if (!$this->premode) {
$prelen = strlen($dom[$key]['value']);
if ($this->isRTLTextDir()) { if ($this->isRTLTextDir()) {
$dom[$key]['value'] = rtrim($dom[$key]['value']); $dom[$key]['value'] = rtrim($dom[$key]['value']);
} else { } else {
$dom[$key]['value'] = ltrim($dom[$key]['value']); $dom[$key]['value'] = ltrim($dom[$key]['value']);
} }
$postlen = strlen($dom[$key]['value']);
if (($postlen == 0) AND ($prelen > 0)) {
$dom[$key]['trimmed_space'] = true;
}
} }
$newline = false; $newline = false;
$firstblock = true; $firstblock = true;
@ -14349,11 +14374,12 @@ if (!class_exists('TCPDF', false)) {
$type = $this->getImageFileType($tag['attribute']['src']); $type = $this->getImageFileType($tag['attribute']['src']);
$prevy = $this->y; $prevy = $this->y;
$xpos = $this->GetX(); $xpos = $this->GetX();
if (isset($dom[($key - 1)]) AND ($dom[($key - 1)]['value'] == ' ')) { // eliminate marker spaces
if ($this->rtl) { if (isset($dom[($key - 1)])) {
$xpos += $this->GetStringWidth(chr(32)); if (($dom[($key - 1)]['value'] == ' ') OR (isset($dom[($key - 1)]['trimmed_space']))) {
} else {
$xpos -= $this->GetStringWidth(chr(32)); $xpos -= $this->GetStringWidth(chr(32));
} elseif ($this->rtl AND $dom[($key - 1)]['value'] == ' ') {
$xpos -= (2 * $this->GetStringWidth(chr(32)));
} }
} }
$imglink = ''; $imglink = '';