joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2025-01-22 20:08:25 +00:00
Code Issues Releases Activity

4.8.036

Browse Source
This commit is contained in:
nicolaasuni 2010-02-24 10:08:52 +01:00
parent dd2421a4db
commit afcb6dd6f1
19 changed files with 158 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.TXT
View File

@ -1,3 +1,8 @@
4.8.036 (2010-02-24)
- Automatic page break for HTML images was improved.
- Example 10 was updated.
- Japanese was removed from example 8 because the freeserif font doesn't contain japanese (you can display it using arialunicid0 font).
4.8.035 (2010-02-23) 4.8.035 (2010-02-23)
- Automatic page break for HTML images was added. - Automatic page break for HTML images was added.
- Support for multicolumn HTML was added (example 10 was updated). - Support for multicolumn HTML was added (example 10 was 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.035 Version: 4.8.036
Release date: 2010-02-23 Release date: 2010-02-24
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2001-2010: Copyright (c) 2001-2010:

15
cache/utf8test.txt vendored
View File

@ -86,21 +86,6 @@ Greek (el)
Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία
(= I uncover the soul-destroying abhorrence) (= I uncover the soul-destroying abhorrence)
Japanese (jp)
-------------
Hiragana: (Iroha)
いろはにほへとちりぬるを
わかよたれそつねならむ
うゐのおくやまけふこえて
あさきゆめみしゑひもせす
Katakana:
イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム
ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン
Hebrew (iw) Hebrew (iw)
----------- -----------

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

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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.035</li> <li>4.8.036</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.035</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.036</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 15145]</span></h3> <h3>method addHTMLVertSpace <span class="smalllinenumber">[line 15144]</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 16169]</span></h3> <h3>method addTOC <span class="smalllinenumber">[line 16168]</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 14792]</span></h3> <h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 14791]</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 16327]</span></h3> <h3>method commitTransaction <span class="smalllinenumber">[line 16326]</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 16027]</span></h3> <h3>method deletePage <span class="smalllinenumber">[line 16026]</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 16381]</span></h3> <h3>method empty_string <span class="smalllinenumber">[line 16380]</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 15713]</span></h3> <h3>method getBuffer <span class="smalllinenumber">[line 15712]</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 15873]</span></h3> <h3>method getFontBuffer <span class="smalllinenumber">[line 15872]</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 15581]</span></h3> <h3>method getGraphicVars <span class="smalllinenumber">[line 15580]</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 15300]</span></h3> <h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 15299]</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 15815]</span></h3> <h3>method getImageBuffer <span class="smalllinenumber">[line 15814]</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 15645]</span></h3> <h3>method getObjFilename <span class="smalllinenumber">[line 15644]</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 15756]</span></h3> <h3>method getPageBuffer <span class="smalllinenumber">[line 15755]</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 15374]</span></h3> <h3>method intToRoman <span class="smalllinenumber">[line 15373]</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 15890]</span></h3> <h3>method movePage <span class="smalllinenumber">[line 15889]</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 16370]</span></h3> <h3>method objclone <span class="smalllinenumber">[line 16369]</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 14246]</span></h3> <h3>method openHTMLTagHandler <span class="smalllinenumber">[line 14245]</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 15439]</span></h3> <h3>method putHtmlListBullet <span class="smalllinenumber">[line 15438]</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 15685]</span></h3> <h3>method readDiskCache <span class="smalllinenumber">[line 15684]</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 16341]</span></h3> <h3>method rollbackTransaction <span class="smalllinenumber">[line 16340]</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 15214]</span></h3> <h3>method SetBooklet <span class="smalllinenumber">[line 15213]</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 15695]</span></h3> <h3>method setBuffer <span class="smalllinenumber">[line 15694]</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 15831]</span></h3> <h3>method setFontBuffer <span class="smalllinenumber">[line 15830]</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 15853]</span></h3> <h3>method setFontSubBuffer <span class="smalllinenumber">[line 15852]</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 15612]</span></h3> <h3>method setGraphicVars <span class="smalllinenumber">[line 15611]</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 15285]</span></h3> <h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 15284]</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 15254]</span></h3> <h3>method setHtmlVSpace <span class="smalllinenumber">[line 15253]</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 15772]</span></h3> <h3>method setImageBuffer <span class="smalllinenumber">[line 15771]</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 15795]</span></h3> <h3>method setImageSubBuffer <span class="smalllinenumber">[line 15794]</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 15264]</span></h3> <h3>method setListIndentWidth <span class="smalllinenumber">[line 15263]</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 15174]</span></h3> <h3>method setLIsymbol <span class="smalllinenumber">[line 15173]</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 15274]</span></h3> <h3>method setOpenCell <span class="smalllinenumber">[line 15273]</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 15729]</span></h3> <h3>method setPageBuffer <span class="smalllinenumber">[line 15728]</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 16311]</span></h3> <h3>method startTransaction <span class="smalllinenumber">[line 16310]</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 15230]</span></h3> <h3>method swapMargins <span class="smalllinenumber">[line 15229]</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 15657]</span></h3> <h3>method writeDiskCache <span class="smalllinenumber">[line 15656]</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 Tue, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:41 +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 Tue, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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.035</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.036</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.035 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.8.036 (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, 23 Feb 2010 20:40:48 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:41 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:50 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:41 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +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 Tue, 23 Feb 2010 20:40:47 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 24 Feb 2010 10:08:38 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

4
examples/example_008.php
View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : example_008.php // File name : example_008.php
// Begin : 2008-03-04 // Begin : 2008-03-04
// Last Update : 2009-09-30 // Last Update : 2010-02-24
// //
// Description : Example 008 for TCPDF class // Description : Example 008 for TCPDF class
// Include external UTF-8 text file // Include external UTF-8 text file
@ -82,7 +82,7 @@ $utf8text = file_get_contents('../cache/utf8test.txt', false);
$pdf->SetFillColor(230, 240, 255, true); $pdf->SetFillColor(230, 240, 255, true);
// write the text // write the text
$pdf->Write(5,$utf8text, '', 1); $pdf->Write(5, $utf8text, '', 1);
// --------------------------------------------------------- // ---------------------------------------------------------

133
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 : 2010-02-23 // Last Update : 2010-02-24
// //
// Description : Example 010 for TCPDF class // Description : Example 010 for TCPDF class
// Text on multiple columns // Text on multiple columns
@ -33,31 +33,50 @@
require_once('../config/lang/eng.php'); require_once('../config/lang/eng.php');
require_once('../tcpdf.php'); require_once('../tcpdf.php');
// extend TCPF with custom functions
class MYPDF extends TCPDF { /**
* Extend TCPDF to work with multiple columns
*/
class MC_TCPDF extends TCPDF {
//number of colums /**
* @var number of colums
* @access protected
*/
protected $ncols = 3; protected $ncols = 3;
// columns width /**
* @var columns width
* @access protected
*/
protected $colwidth = 57; protected $colwidth = 57;
//Current column /**
* @var current column
* @access protected
*/
protected $col = 0; protected $col = 0;
//Ordinate of column start /**
protected $y0; * @var y position of the beginning of column
* @access protected
//Set position at a given column */
protected $col_start_y;
/**
* Set position at a given column
* @param $col column number (from 0 to $ncols-1)
* @access public
*/
public function SetCol($col) { public function SetCol($col) {
$this->col = $col; $this->col = $col;
// space between columns // set space between columns
if ($this->ncols > 1) { if ($this->ncols > 1) {
$column_space = round((float)($this->w - $this->original_lMargin - $this->original_rMargin - ($this->ncols * $this->colwidth)) / ($this->ncols - 1)); $column_space = round((float)($this->w - $this->original_lMargin - $this->original_rMargin - ($this->ncols * $this->colwidth)) / ($this->ncols - 1));
} else { } else {
$column_space = 0; $column_space = 0;
} }
// X position of the current column // set X position of the current column by case
if ($this->rtl) { if ($this->rtl) {
$x = $this->w - $this->original_rMargin - ($col * ($this->colwidth + $column_space)); $x = $this->w - $this->original_rMargin - ($col * ($this->colwidth + $column_space));
$this->SetRightMargin($this->w - $x); $this->SetRightMargin($this->w - $x);
@ -69,60 +88,69 @@ class MYPDF extends TCPDF {
} }
$this->x = $x; $this->x = $x;
if ($col > 0) { if ($col > 0) {
$this->y = $this->y0; // set Y position for the column
$this->y = $this->col_start_y;
} }
// fix for HTML mode
$this->newline = true; $this->newline = true;
} }
//Method accepting or not automatic page break /**
* Overwrites the AcceptPageBreak() method to switch between columns
* @return boolean false
* @access public
*/
public function AcceptPageBreak() { public function AcceptPageBreak() {
if($this->col < ($this->ncols - 1)) { if($this->col < ($this->ncols - 1)) {
//Go to next column // go to next column
$this->SetCol($this->col + 1); $this->SetCol($this->col + 1);
//Keep on page
return false;
} else { } else {
// go back to first column on the new page
$this->AddPage(); $this->AddPage();
//Go back to first column
$this->SetCol(0); $this->SetCol(0);
//Page break
return false;
} }
// avoid page breaking from checkPageBreak()
return false;
} }
// Set chapter title /**
public function ChapterTitle($num, $label) { * Set chapter title
* @param int $num chapter number
* @param string $title chapter title
* @access public
*/
public function ChapterTitle($num, $title) {
$this->SetFont('helvetica', '', 14); $this->SetFont('helvetica', '', 14);
$this->SetFillColor(200, 220, 255); $this->SetFillColor(200, 220, 255);
$this->Cell(0, 6, 'Chapter '.$num.' : '.$label, 0, 1, '', 1); $this->Cell(0, 6, 'Chapter '.$num.' : '.$title, 0, 1, '', 1);
$this->Ln(4); $this->Ln(4);
// Save ordinate // save current Y position
$this->y0 = $this->GetY(); $this->col_start_y = $this->GetY();
} }
// Print chapter body /**
public function ChapterBody($file) { * Print chapter body
* @param string $file name of the file containing the chapter body
* @param boolean $mode if true the chapter body is in HTML, otherwise in simple text.
* @access public
*/
public function ChapterBody($file, $mode=false) {
// 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);
// set font // set font
$this->SetFont('times', '', 9); $this->SetFont('times', '', 9);
// set first column // set first column
$this->SetCol(0); $this->SetCol(0);
if ($mode) {
// ------ HTML MODE ------ // ------ HTML MODE ------
//$this->writeHTML($txt, true, false, true, false, 'J'); $this->writeHTML($txt, true, false, true, false, 'J');
// ------ HTML MODE ------ } else {
// ------ TEXT MODE ------
// ------ TEXT MODE ------ $this->Write(0, $txt, '', 0, 'J', true, 0, false, false, 0);
$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);
@ -131,16 +159,26 @@ class MYPDF extends TCPDF {
$this->SetRightMargin($rMargin); $this->SetRightMargin($rMargin);
} }
//Add chapter /**
public function PrintChapter($num,$title,$file) { * Print chapter
* @param int $num chapter number
* @param string $title chapter title
* @param string $file name of the file containing the chapter body
* @param boolean $mode if true the chapter body is in HTML, otherwise in simple text.
* @access public
*/
public function PrintChapter($num, $title, $file, $mode=false) {
$this->AddPage(); $this->AddPage();
$this->ChapterTitle($num,$title); $this->ChapterTitle($num, $title);
$this->ChapterBody($file); $this->ChapterBody($file, $mode);
} }
} }
// ---------------------------------------------------------
// EXAMPLE
// ---------------------------------------------------------
// create new PDF document // create new PDF document
$pdf = new MYPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); $pdf = new MC_TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
// set document information // set document information
$pdf->SetCreator(PDF_CREATOR); $pdf->SetCreator(PDF_CREATOR);
@ -175,8 +213,11 @@ $pdf->setLanguageArray($l);
// --------------------------------------------------------- // ---------------------------------------------------------
$pdf->PrintChapter(1, 'A RUNAWAY REEF', '../cache/chapter_demo_1.txt'); // print a text
$pdf->PrintChapter(2, 'THE PROS AND CONS', '../cache/chapter_demo_2.txt'); $pdf->PrintChapter(1, 'A RUNAWAY REEF', '../cache/chapter_demo_1.txt', false);
// print an html text
$pdf->PrintChapter(2, 'THE PROS AND CONS', '../cache/chapter_demo_2.txt', true);
// --------------------------------------------------------- // ---------------------------------------------------------

19
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-23 // Last Update : 2010-02-24
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.8.035 // Version : 4.8.036
// 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.035 * @version 4.8.036
*/ */
/** /**
@ -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.035 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.8.036 (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.035 * @version 4.8.036
* @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
@ -13374,10 +13374,9 @@ if (!class_exists('TCPDF', false)) {
$pre_y = $this->y; $pre_y = $this->y;
// check for page break // check for page break
$this->checkPageBreak($imgh); $this->checkPageBreak($imgh);
$post_y = $this->y; if ($this->y < $pre_y) {
// check for multicolumn mode // fix for multicolumn mode
if ($post_y < $pre_y) { $startliney = $this->y;
$startliney = $post_y;
} }
} }
if ($this->page > $startlinepage) { if ($this->page > $startlinepage) {
@ -13396,7 +13395,7 @@ if (!class_exists('TCPDF', false)) {
$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]); $tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
$tend = substr($pagebuff, $this->cntmrk[$this->page]); $tend = substr($pagebuff, $this->cntmrk[$this->page]);
// add line start to current page // add line start to current page
$yshift = $minstartliney - $this->y; $yshift = $minstartliney - $this->y + ($curfontsize / $this->k);
$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k)); $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); $this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
// shift the annotations and links // shift the annotations and links