mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-12-26 10:07:29 +00:00
4.6.001
This commit is contained in:
parent
0188f37c00
commit
594b05ec61
@ -1,3 +1,7 @@
|
||||
4.6.001 (2009-04-17)
|
||||
- Spaces between HTML block tags are now automatically removed.
|
||||
- The bug related to cMargin changes between tables was fixed.
|
||||
|
||||
4.6.000 (2009-04-16)
|
||||
- WARNING: THIS VERSION CHANGES THE BEHAVIOUR OF $x and $y parameters for several TCPDF methods:
|
||||
zero coordinates for $x and $y are now valid coordinates;
|
||||
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 4.6.000
|
||||
Release date: 2009-04-16
|
||||
Version: 4.6.001
|
||||
Release date: 2009-04-17
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2001-2009:
|
||||
|
@ -45,7 +45,7 @@
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -74,7 +74,7 @@ Source Location: /tcpdf.php<br /><br />
|
||||
|
||||
<h4>Version:</h4>
|
||||
<ul>
|
||||
<li>4.6.000</li>
|
||||
<li>4.6.001</li>
|
||||
</ul>
|
||||
|
||||
|
||||
@ -581,7 +581,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
||||
<td><b>author:</b> </td><td>Nicola Asuni - info@tecnick.com</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>version:</b> </td><td>4.6.000</td>
|
||||
<td><b>version:</b> </td><td>4.6.001</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>link:</b> </td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
|
||||
@ -5397,7 +5397,7 @@ $style = -1])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodaddHTMLVertSpace"></a>
|
||||
<h3>method addHTMLVertSpace <span class="smalllinenumber">[line 12477]</span></h3>
|
||||
<h3>method addHTMLVertSpace <span class="smalllinenumber">[line 12469]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -5608,7 +5608,7 @@ $k)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodaddTOC"></a>
|
||||
<h3>method addTOC <span class="smalllinenumber">[line 13359]</span></h3>
|
||||
<h3>method addTOC <span class="smalllinenumber">[line 13351]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -6398,7 +6398,7 @@ $h)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodcloseHTMLTagHandler"></a>
|
||||
<h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 12153]</span></h3>
|
||||
<h3>method closeHTMLTagHandler <span class="smalllinenumber">[line 12145]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -6512,7 +6512,7 @@ $prop = array()])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodcommitTransaction"></a>
|
||||
<h3>method commitTransaction <span class="smalllinenumber">[line 13516]</span></h3>
|
||||
<h3>method commitTransaction <span class="smalllinenumber">[line 13508]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -6900,7 +6900,7 @@ $afinish:)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodempty_string"></a>
|
||||
<h3>method empty_string <span class="smalllinenumber">[line 13562]</span></h3>
|
||||
<h3>method empty_string <span class="smalllinenumber">[line 13554]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -7404,7 +7404,7 @@ $pagenum = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetBuffer"></a>
|
||||
<h3>method getBuffer <span class="smalllinenumber">[line 13042]</span></h3>
|
||||
<h3>method getBuffer <span class="smalllinenumber">[line 13034]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -7601,7 +7601,7 @@ $char)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetFontBuffer"></a>
|
||||
<h3>method getFontBuffer <span class="smalllinenumber">[line 13202]</span></h3>
|
||||
<h3>method getFontBuffer <span class="smalllinenumber">[line 13194]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -7890,7 +7890,7 @@ $v)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetGraphicVars"></a>
|
||||
<h3>method getGraphicVars <span class="smalllinenumber">[line 12910]</span></h3>
|
||||
<h3>method getGraphicVars <span class="smalllinenumber">[line 12902]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -8100,7 +8100,7 @@ $html)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetHTMLUnitToUnits"></a>
|
||||
<h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 12632]</span></h3>
|
||||
<h3>method getHTMLUnitToUnits <span class="smalllinenumber">[line 12624]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -8166,7 +8166,7 @@ $point)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetImageBuffer"></a>
|
||||
<h3>method getImageBuffer <span class="smalllinenumber">[line 13144]</span></h3>
|
||||
<h3>method getImageBuffer <span class="smalllinenumber">[line 13136]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -8512,7 +8512,7 @@ $w = 0])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetObjFilename"></a>
|
||||
<h3>method getObjFilename <span class="smalllinenumber">[line 12974]</span></h3>
|
||||
<h3>method getObjFilename <span class="smalllinenumber">[line 12966]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -8622,7 +8622,7 @@ $prefix)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodgetPageBuffer"></a>
|
||||
<h3>method getPageBuffer <span class="smalllinenumber">[line 13085]</span></h3>
|
||||
<h3>method getPageBuffer <span class="smalllinenumber">[line 13077]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -9537,7 +9537,7 @@ $script)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodintToRoman"></a>
|
||||
<h3>method intToRoman <span class="smalllinenumber">[line 12703]</span></h3>
|
||||
<h3>method intToRoman <span class="smalllinenumber">[line 12695]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -10131,7 +10131,7 @@ $y = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodmovePage"></a>
|
||||
<h3>method movePage <span class="smalllinenumber">[line 13220]</span></h3>
|
||||
<h3>method movePage <span class="smalllinenumber">[line 13212]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -10305,7 +10305,7 @@ $maxh = 0])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodobjclone"></a>
|
||||
<h3>method objclone <span class="smalllinenumber">[line 13551]</span></h3>
|
||||
<h3>method objclone <span class="smalllinenumber">[line 13543]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -10378,7 +10378,7 @@ $object)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodopenHTMLTagHandler"></a>
|
||||
<h3>method openHTMLTagHandler <span class="smalllinenumber">[line 11835]</span></h3>
|
||||
<h3>method openHTMLTagHandler <span class="smalllinenumber">[line 11827]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -10815,7 +10815,7 @@ $fill_color = array()])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodputHtmlListBullet"></a>
|
||||
<h3>method putHtmlListBullet <span class="smalllinenumber">[line 12768]</span></h3>
|
||||
<h3>method putHtmlListBullet <span class="smalllinenumber">[line 12760]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -10992,7 +10992,7 @@ $prop = array()])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodreadDiskCache"></a>
|
||||
<h3>method readDiskCache <span class="smalllinenumber">[line 13014]</span></h3>
|
||||
<h3>method readDiskCache <span class="smalllinenumber">[line 13006]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -11322,7 +11322,7 @@ $length)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodrollbackTransaction"></a>
|
||||
<h3>method rollbackTransaction <span class="smalllinenumber">[line 13529]</span></h3>
|
||||
<h3>method rollbackTransaction <span class="smalllinenumber">[line 13521]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -11892,7 +11892,7 @@ $bc = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodSetBooklet"></a>
|
||||
<h3>method SetBooklet <span class="smalllinenumber">[line 12546]</span></h3>
|
||||
<h3>method SetBooklet <span class="smalllinenumber">[line 12538]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -11943,7 +11943,7 @@ $outer = -1])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetBuffer"></a>
|
||||
<h3>method setBuffer <span class="smalllinenumber">[line 13024]</span></h3>
|
||||
<h3>method setBuffer <span class="smalllinenumber">[line 13016]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -12663,7 +12663,7 @@ $fontfile = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetFontBuffer"></a>
|
||||
<h3>method setFontBuffer <span class="smalllinenumber">[line 13160]</span></h3>
|
||||
<h3>method setFontBuffer <span class="smalllinenumber">[line 13152]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -12750,7 +12750,7 @@ $size)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetFontSubBuffer"></a>
|
||||
<h3>method setFontSubBuffer <span class="smalllinenumber">[line 13182]</span></h3>
|
||||
<h3>method setFontSubBuffer <span class="smalllinenumber">[line 13174]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -12904,7 +12904,7 @@ $fm = 10])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetGraphicVars"></a>
|
||||
<h3>method setGraphicVars <span class="smalllinenumber">[line 12941]</span></h3>
|
||||
<h3>method setGraphicVars <span class="smalllinenumber">[line 12933]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13100,7 +13100,7 @@ $hm = 10])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetHtmlLinksStyle"></a>
|
||||
<h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 12617]</span></h3>
|
||||
<h3>method setHtmlLinksStyle <span class="smalllinenumber">[line 12609]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13145,7 +13145,7 @@ $fontstyle = 'U'])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetHtmlVSpace"></a>
|
||||
<h3>method setHtmlVSpace <span class="smalllinenumber">[line 12586]</span></h3>
|
||||
<h3>method setHtmlVSpace <span class="smalllinenumber">[line 12578]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13184,7 +13184,7 @@ $tagvs)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetImageBuffer"></a>
|
||||
<h3>method setImageBuffer <span class="smalllinenumber">[line 13101]</span></h3>
|
||||
<h3>method setImageBuffer <span class="smalllinenumber">[line 13093]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13271,7 +13271,7 @@ $scale)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetImageSubBuffer"></a>
|
||||
<h3>method setImageSubBuffer <span class="smalllinenumber">[line 13124]</span></h3>
|
||||
<h3>method setImageSubBuffer <span class="smalllinenumber">[line 13116]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13665,7 +13665,7 @@ $page = -1])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetListIndentWidth"></a>
|
||||
<h3>method setListIndentWidth <span class="smalllinenumber">[line 12596]</span></h3>
|
||||
<h3>method setListIndentWidth <span class="smalllinenumber">[line 12588]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13704,7 +13704,7 @@ $width)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetLIsymbol"></a>
|
||||
<h3>method setLIsymbol <span class="smalllinenumber">[line 12506]</span></h3>
|
||||
<h3>method setLIsymbol <span class="smalllinenumber">[line 12498]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13797,7 +13797,7 @@ $right = -1])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetOpenCell"></a>
|
||||
<h3>method setOpenCell <span class="smalllinenumber">[line 12606]</span></h3>
|
||||
<h3>method setOpenCell <span class="smalllinenumber">[line 12598]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -13884,7 +13884,7 @@ $resetmargins = false])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodsetPageBuffer"></a>
|
||||
<h3>method setPageBuffer <span class="smalllinenumber">[line 13058]</span></h3>
|
||||
<h3>method setPageBuffer <span class="smalllinenumber">[line 13050]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -15336,7 +15336,7 @@ $page = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodstartTransaction"></a>
|
||||
<h3>method startTransaction <span class="smalllinenumber">[line 13502]</span></h3>
|
||||
<h3>method startTransaction <span class="smalllinenumber">[line 13494]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -15426,7 +15426,7 @@ $page = ''])</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodswapMargins"></a>
|
||||
<h3>method swapMargins <span class="smalllinenumber">[line 12562]</span></h3>
|
||||
<h3>method swapMargins <span class="smalllinenumber">[line 12554]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -16620,7 +16620,7 @@ $code)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodwriteDiskCache"></a>
|
||||
<h3>method writeDiskCache <span class="smalllinenumber">[line 12986]</span></h3>
|
||||
<h3>method writeDiskCache <span class="smalllinenumber">[line 12978]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -16677,7 +16677,7 @@ $file)</code>
|
||||
</div>
|
||||
<hr />
|
||||
<a name="methodwriteHTML"></a>
|
||||
<h3>method writeHTML <span class="smalllinenumber">[line 11016]</span></h3>
|
||||
<h3>method writeHTML <span class="smalllinenumber">[line 11007]</span></h3>
|
||||
<div class="function">
|
||||
<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">
|
||||
@ -18908,7 +18908,7 @@ $file)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -1368,7 +1368,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>version:</b> </td><td>4.6.000</td>
|
||||
<td><b>version:</b> </td><td>4.6.001</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>copyright:</b> </td><td>2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
|
||||
@ -104,7 +104,7 @@ unicode data<br /><br /></div>
|
||||
<div class="tags">
|
||||
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
|
||||
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
|
||||
<code>PDF_PRODUCER = 'TCPDF 4.6.000 (http://www.tcpdf.org)'</code>
|
||||
<code>PDF_PRODUCER = 'TCPDF 4.6.001 (http://www.tcpdf.org)'</code>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
|
||||
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -1350,7 +1350,7 @@
|
||||
<a href="elementindex.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:26 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -1373,7 +1373,7 @@
|
||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:26 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -35,7 +35,7 @@
|
||||
<a href="#Post-parsing">Post-parsing</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 16 Apr 2009 18:13:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
42
tcpdf.php
42
tcpdf.php
@ -2,9 +2,9 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2009-04-16
|
||||
// Last Update : 2009-04-17
|
||||
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
|
||||
// Version : 4.6.000
|
||||
// Version : 4.6.001
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
|
||||
@ -122,7 +122,7 @@
|
||||
* @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
* @version 4.6.000
|
||||
* @version 4.6.001
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) {
|
||||
/**
|
||||
* define default PDF document producer
|
||||
*/
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.000 (http://www.tcpdf.org)');
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.001 (http://www.tcpdf.org)');
|
||||
|
||||
/**
|
||||
* This is a PHP class for generating PDF documents without requiring external extensions.<br>
|
||||
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
|
||||
* @name TCPDF
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 4.6.000
|
||||
* @version 4.6.001
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
@ -10610,7 +10610,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
*/
|
||||
protected function getHtmlDomArray($html) {
|
||||
// remove all unsupported tags (the line below lists all supported tags)
|
||||
$html = strip_tags($html, '<marker/><a><b><blockquote><br><br/><dd><del><div><dl><dt><em><font><h1><h2><h3><h4><h5><h6><hr><i><img><li><ol><p><pre><small><span><strong><sub><sup><table><tcpdf><td><th><thead><tr><tt><u><ul>');
|
||||
$html = strip_tags($html, '<marker/><a><b><blockquote><br><br/><dd><del><div><dl><dt><em><font><h1><h2><h3><h4><h5><h6><hr><i><img><li><ol><p><pre><small><span><strong><sub><sup><table><tcpdf><td><th><thead><tr><tt><u><ul>');
|
||||
//replace some blank characters
|
||||
$html = preg_replace('@(\r\n|\r)@', "\n", $html);
|
||||
$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
|
||||
@ -10627,25 +10627,16 @@ if (!class_exists('TCPDF', false)) {
|
||||
$html = preg_replace("'</pre>'si", "</td></tr></table>", $html);
|
||||
*/
|
||||
// remove extra spaces from code
|
||||
$html = preg_replace('/[\s]*<\/table>[\s]*/', '</table>', $html);
|
||||
$html = preg_replace('/[\s]*<\/tr>[\s]*/', '</tr>', $html);
|
||||
$html = preg_replace('/[\s]*<tr/', '<tr', $html);
|
||||
$html = preg_replace('/[\s]*<\/th>[\s]*/', '</th>', $html);
|
||||
$html = preg_replace('/[\s]*<th/', '<th', $html);
|
||||
$html = preg_replace('/[\s]*<\/td>[\s]*/', '</td>', $html);
|
||||
$html = preg_replace('/[\s]*<td/', '<td', $html);
|
||||
$html = preg_replace('/<\/th>/', '<marker style="font-size:0"/></th>', $html);
|
||||
$html = preg_replace('/<\/td>/', '<marker style="font-size:0"/></td>', $html);
|
||||
$html = preg_replace('/[\s]+<\/(table|tr|td|th|ul|ol|li)>/', '</\\1>', $html);
|
||||
$html = preg_replace('/[\s]+<(tr|td|th|ul|ol|li|br)/', '<\\1', $html);
|
||||
$html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|ul)>[\s]+</', '</\\1><', $html);
|
||||
$html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
|
||||
$html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
|
||||
$html = preg_replace('/<img/', ' <img', $html);
|
||||
$html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span></span>', $html);
|
||||
$html = preg_replace('/[\s]+<ul/', '<ul', $html);
|
||||
$html = preg_replace('/[\s]+<ol/', '<ol', $html);
|
||||
$html = preg_replace('/[\s]+<li/', '<li', $html);
|
||||
$html = preg_replace('/[\s]*<\/li>[\s]*/', '</li>', $html);
|
||||
$html = preg_replace('/[\s]*<\/ul>[\s]*/', '</ul>', $html);
|
||||
$html = preg_replace('/[\s]*<\/ol>[\s]*/', '</ol>', $html);
|
||||
$html = preg_replace('/[\s]+<br/', '<br', $html);
|
||||
// trim string
|
||||
$html = preg_replace('/^[\s]+/', '', $html);
|
||||
$html = preg_replace('/[\s]+$/', '', $html);
|
||||
// pattern for generic tag
|
||||
$tagpattern = '/(<[^>]+>)/';
|
||||
// explodes the string
|
||||
@ -11479,7 +11470,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
$table_el = $dom[$trid]['parent'];
|
||||
if (!isset($dom[$table_el]['cols'])) {
|
||||
$dom[$table_el]['cols'] = $trid['cols'];
|
||||
}
|
||||
}
|
||||
$oldmargin = $this->cMargin;
|
||||
if (isset($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'])) {
|
||||
$currentcmargin = $this->getHTMLUnitToUnits($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'], 1, 'px');
|
||||
} else {
|
||||
@ -11601,8 +11593,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
$prevLastH = $this->lasth;
|
||||
// ****** write the cell content ******
|
||||
$this->MultiCell($cellw, $cellh, $cell_content, false, $lalign, false, 2, '', '', true, 0, true);
|
||||
$this->lasth = $prevLastH;
|
||||
$this->cMargin = $currentcmargin;
|
||||
$this->lasth = $prevLastH;
|
||||
$this->cMargin = $oldmargin;
|
||||
$dom[$trid]['cellpos'][($cellid - 1)]['endx'] = $this->x;
|
||||
// update the end of row position
|
||||
if ($rowspan <= 1) {
|
||||
|
Loading…
Reference in New Issue
Block a user