30
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-06-06 07:40:48 +00:00
This commit is contained in:
nicolaasuni 2010-11-16 10:47:41 +01:00
parent 52d009ebb0
commit ea9927a2e1
24 changed files with 538 additions and 480 deletions

View File

@ -1,3 +1,9 @@
5.9.015 (2010-11-16)
- Bug item affecting QRCode was fixed.
- Some bugs affecting HTML lists were fixed.
- ImageSVG() and fitBlock() methods were improved to handle some SVG problems.
- Some problems with PHP4 compatibility were fixed.
5.9.014 (2010-11-15)
- Bug item #3109464 "QRCode error" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 5.9.014
Release date: 2010-11-15
Version: 5.9.015
Release date: 2010-11-16
Author: Nicola Asuni
Copyright (c) 2002-2010:

View File

@ -65,7 +65,7 @@
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1004,7 +1004,7 @@ $code)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1331,7 +1331,7 @@ $eclevel = 'L'])</code>
</div>
<hr />
<a name="methodallocate"></a>
<h3>method allocate <span class="smalllinenumber">[line 2139]</span></h3>
<h3>method allocate <span class="smalllinenumber">[line 2138]</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">
@ -1367,7 +1367,7 @@ $setLength)</code>
</div>
<hr />
<a name="methodappendBitstream"></a>
<h3>method appendBitstream <span class="smalllinenumber">[line 2193]</span></h3>
<h3>method appendBitstream <span class="smalllinenumber">[line 2192]</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">
@ -1412,7 +1412,7 @@ $append)</code>
</div>
<hr />
<a name="methodappendBytes"></a>
<h3>method appendBytes <span class="smalllinenumber">[line 2225]</span></h3>
<h3>method appendBytes <span class="smalllinenumber">[line 2224]</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">
@ -1517,7 +1517,7 @@ $data)</code>
</div>
<hr />
<a name="methodappendNum"></a>
<h3>method appendNum <span class="smalllinenumber">[line 2210]</span></h3>
<h3>method appendNum <span class="smalllinenumber">[line 2209]</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">
@ -1568,7 +1568,7 @@ $num)</code>
</div>
<hr />
<a name="methodappendPaddingBit"></a>
<h3>method appendPaddingBit <span class="smalllinenumber">[line 2065]</span></h3>
<h3>method appendPaddingBit <span class="smalllinenumber">[line 2064]</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">
@ -1646,7 +1646,7 @@ $frame)</code>
</div>
<hr />
<a name="methodbitstreamToByte"></a>
<h3>method bitstreamToByte <span class="smalllinenumber">[line 2238]</span></h3>
<h3>method bitstreamToByte <span class="smalllinenumber">[line 2237]</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">
@ -1730,7 +1730,7 @@ $length)</code>
</div>
<hr />
<a name="methodcalcParity"></a>
<h3>method calcParity <span class="smalllinenumber">[line 1736]</span></h3>
<h3>method calcParity <span class="smalllinenumber">[line 1739]</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">
@ -1769,7 +1769,7 @@ $items)</code>
</div>
<hr />
<a name="methodcheck"></a>
<h3>method check <span class="smalllinenumber">[line 1869]</span></h3>
<h3>method check <span class="smalllinenumber">[line 1868]</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">
@ -1820,7 +1820,7 @@ $data)</code>
</div>
<hr />
<a name="methodcheckModeAn"></a>
<h3>method checkModeAn <span class="smalllinenumber">[line 1802]</span></h3>
<h3>method checkModeAn <span class="smalllinenumber">[line 1781]</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">
@ -1865,7 +1865,7 @@ $data)</code>
</div>
<hr />
<a name="methodcheckModeKanji"></a>
<h3>method checkModeKanji <span class="smalllinenumber">[line 1849]</span></h3>
<h3>method checkModeKanji <span class="smalllinenumber">[line 1848]</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">
@ -1910,7 +1910,7 @@ $data)</code>
</div>
<hr />
<a name="methodcheckModeNum"></a>
<h3>method checkModeNum <span class="smalllinenumber">[line 1754]</span></h3>
<h3>method checkModeNum <span class="smalllinenumber">[line 1757]</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">
@ -1955,7 +1955,7 @@ $data)</code>
</div>
<hr />
<a name="methodconvertData"></a>
<h3>method convertData <span class="smalllinenumber">[line 2036]</span></h3>
<h3>method convertData <span class="smalllinenumber">[line 2035]</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">
@ -1994,7 +1994,7 @@ $items)</code>
</div>
<hr />
<a name="methodcreateBitStream"></a>
<h3>method createBitStream <span class="smalllinenumber">[line 2021]</span></h3>
<h3>method createBitStream <span class="smalllinenumber">[line 2020]</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">
@ -2033,7 +2033,7 @@ $items)</code>
</div>
<hr />
<a name="methodcreateFrame"></a>
<h3>method createFrame <span class="smalllinenumber">[line 2541]</span></h3>
<h3>method createFrame <span class="smalllinenumber">[line 2540]</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">
@ -2520,7 +2520,7 @@ $string)</code>
</div>
<hr />
<a name="methodencode_rs_char"></a>
<h3>method encode_rs_char <span class="smalllinenumber">[line 2839]</span></h3>
<h3>method encode_rs_char <span class="smalllinenumber">[line 2838]</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">
@ -2571,7 +2571,7 @@ $parity)</code>
</div>
<hr />
<a name="methodestimateBitsMode8"></a>
<h3>method estimateBitsMode8 <span class="smalllinenumber">[line 1830]</span></h3>
<h3>method estimateBitsMode8 <span class="smalllinenumber">[line 1829]</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">
@ -2649,7 +2649,7 @@ $size)</code>
</div>
<hr />
<a name="methodestimateBitsModeKanji"></a>
<h3>method estimateBitsModeKanji <span class="smalllinenumber">[line 1839]</span></h3>
<h3>method estimateBitsModeKanji <span class="smalllinenumber">[line 1838]</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">
@ -2688,7 +2688,7 @@ $size)</code>
</div>
<hr />
<a name="methodestimateBitsModeNum"></a>
<h3>method estimateBitsModeNum <span class="smalllinenumber">[line 1768]</span></h3>
<h3>method estimateBitsModeNum <span class="smalllinenumber">[line 1795]</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">
@ -2727,7 +2727,7 @@ $size)</code>
</div>
<hr />
<a name="methodestimateBitStreamSize"></a>
<h3>method estimateBitStreamSize <span class="smalllinenumber">[line 1902]</span></h3>
<h3>method estimateBitStreamSize <span class="smalllinenumber">[line 1901]</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">
@ -2772,7 +2772,7 @@ $version)</code>
</div>
<hr />
<a name="methodestimateVersion"></a>
<h3>method estimateVersion <span class="smalllinenumber">[line 1945]</span></h3>
<h3>method estimateVersion <span class="smalllinenumber">[line 1944]</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">
@ -2935,7 +2935,7 @@ $frame)</code>
</div>
<hr />
<a name="methodgetBitStream"></a>
<h3>method getBitStream <span class="smalllinenumber">[line 2115]</span></h3>
<h3>method getBitStream <span class="smalllinenumber">[line 2114]</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">
@ -2974,7 +2974,7 @@ $items)</code>
</div>
<hr />
<a name="methodgetByteStream"></a>
<h3>method getByteStream <span class="smalllinenumber">[line 2125]</span></h3>
<h3>method getByteStream <span class="smalllinenumber">[line 2124]</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">
@ -3041,7 +3041,7 @@ $items)</code>
</div>
<hr />
<a name="methodgetDataLength"></a>
<h3>method getDataLength <span class="smalllinenumber">[line 2294]</span></h3>
<h3>method getDataLength <span class="smalllinenumber">[line 2293]</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">
@ -3086,7 +3086,7 @@ $level)</code>
</div>
<hr />
<a name="methodgetECCLength"></a>
<h3>method getECCLength <span class="smalllinenumber">[line 2304]</span></h3>
<h3>method getECCLength <span class="smalllinenumber">[line 2303]</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">
@ -3131,7 +3131,7 @@ $level)</code>
</div>
<hr />
<a name="methodgetEccSpec"></a>
<h3>method getEccSpec <span class="smalllinenumber">[line 2394]</span></h3>
<h3>method getEccSpec <span class="smalllinenumber">[line 2393]</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">
@ -3182,7 +3182,7 @@ $spec)</code>
</div>
<hr />
<a name="methodgetFormatInfo"></a>
<h3>method getFormatInfo <span class="smalllinenumber">[line 2502]</span></h3>
<h3>method getFormatInfo <span class="smalllinenumber">[line 2501]</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">
@ -3266,7 +3266,7 @@ $at)</code>
</div>
<hr />
<a name="methodgetMinimumVersion"></a>
<h3>method getMinimumVersion <span class="smalllinenumber">[line 2332]</span></h3>
<h3>method getMinimumVersion <span class="smalllinenumber">[line 2331]</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">
@ -3339,7 +3339,7 @@ $level)</code>
</div>
<hr />
<a name="methodgetRemainder"></a>
<h3>method getRemainder <span class="smalllinenumber">[line 2322]</span></h3>
<h3>method getRemainder <span class="smalllinenumber">[line 2321]</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">
@ -3378,7 +3378,7 @@ $version)</code>
</div>
<hr />
<a name="methodgetVersionPattern"></a>
<h3>method getVersionPattern <span class="smalllinenumber">[line 2489]</span></h3>
<h3>method getVersionPattern <span class="smalllinenumber">[line 2488]</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">
@ -3417,7 +3417,7 @@ $version)</code>
</div>
<hr />
<a name="methodgetWidth"></a>
<h3>method getWidth <span class="smalllinenumber">[line 2313]</span></h3>
<h3>method getWidth <span class="smalllinenumber">[line 2312]</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">
@ -3534,7 +3534,7 @@ $spec)</code>
</div>
<hr />
<a name="methodinit_rs"></a>
<h3>method init_rs <span class="smalllinenumber">[line 2714]</span></h3>
<h3>method init_rs <span class="smalllinenumber">[line 2713]</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">
@ -3603,7 +3603,7 @@ $pad)</code>
</div>
<hr />
<a name="methodinit_rs_char"></a>
<h3>method init_rs_char <span class="smalllinenumber">[line 2755]</span></h3>
<h3>method init_rs_char <span class="smalllinenumber">[line 2754]</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">
@ -3672,7 +3672,7 @@ $pad)</code>
</div>
<hr />
<a name="methodinsertStructuredAppendHeader"></a>
<h3>method insertStructuredAppendHeader <span class="smalllinenumber">[line 1718]</span></h3>
<h3>method insertStructuredAppendHeader <span class="smalllinenumber">[line 1721]</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">
@ -3819,7 +3819,7 @@ $pos)</code>
</div>
<hr />
<a name="methodlengthIndicator"></a>
<h3>method lengthIndicator <span class="smalllinenumber">[line 2348]</span></h3>
<h3>method lengthIndicator <span class="smalllinenumber">[line 2347]</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">
@ -3864,7 +3864,7 @@ $version)</code>
</div>
<hr />
<a name="methodlengthOfCode"></a>
<h3>method lengthOfCode <span class="smalllinenumber">[line 1966]</span></h3>
<h3>method lengthOfCode <span class="smalllinenumber">[line 1965]</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">
@ -3915,7 +3915,7 @@ $bits)</code>
</div>
<hr />
<a name="methodlookAnTable"></a>
<h3>method lookAnTable <span class="smalllinenumber">[line 1792]</span></h3>
<h3>method lookAnTable <span class="smalllinenumber">[line 1771]</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">
@ -4488,7 +4488,7 @@ $y)</code>
</div>
<hr />
<a name="methodmaximumWords"></a>
<h3>method maximumWords <span class="smalllinenumber">[line 2368]</span></h3>
<h3>method maximumWords <span class="smalllinenumber">[line 2367]</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">
@ -4533,7 +4533,7 @@ $version)</code>
</div>
<hr />
<a name="methodmergeBitStream"></a>
<h3>method mergeBitStream <span class="smalllinenumber">[line 2098]</span></h3>
<h3>method mergeBitStream <span class="smalllinenumber">[line 2097]</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">
@ -4578,7 +4578,7 @@ $bstream)</code>
</div>
<hr />
<a name="methodmodnn"></a>
<h3>method modnn <span class="smalllinenumber">[line 2737]</span></h3>
<h3>method modnn <span class="smalllinenumber">[line 2736]</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">
@ -4623,7 +4623,7 @@ $x)</code>
</div>
<hr />
<a name="methodnewFrame"></a>
<h3>method newFrame <span class="smalllinenumber">[line 2606]</span></h3>
<h3>method newFrame <span class="smalllinenumber">[line 2605]</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">
@ -4662,7 +4662,7 @@ $version)</code>
</div>
<hr />
<a name="methodnewFromBytes"></a>
<h3>method newFromBytes <span class="smalllinenumber">[line 2169]</span></h3>
<h3>method newFromBytes <span class="smalllinenumber">[line 2168]</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">
@ -4707,7 +4707,7 @@ $data)</code>
</div>
<hr />
<a name="methodnewFromNum"></a>
<h3>method newFromNum <span class="smalllinenumber">[line 2149]</span></h3>
<h3>method newFromNum <span class="smalllinenumber">[line 2148]</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">
@ -4809,7 +4809,7 @@ $bstream = null])</code>
</div>
<hr />
<a name="methodputAlignmentMarker"></a>
<h3>method putAlignmentMarker <span class="smalllinenumber">[line 2426]</span></h3>
<h3>method putAlignmentMarker <span class="smalllinenumber">[line 2425]</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">
@ -4866,7 +4866,7 @@ $width)</code>
</div>
<hr />
<a name="methodputAlignmentPattern"></a>
<h3>method putAlignmentPattern <span class="smalllinenumber">[line 2449]</span></h3>
<h3>method putAlignmentPattern <span class="smalllinenumber">[line 2448]</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">
@ -4923,7 +4923,7 @@ $fram)</code>
</div>
<hr />
<a name="methodputFinderPattern"></a>
<h3>method putFinderPattern <span class="smalllinenumber">[line 2520]</span></h3>
<h3>method putFinderPattern <span class="smalllinenumber">[line 2519]</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">
@ -4980,7 +4980,7 @@ $width)</code>
</div>
<hr />
<a name="methodqrstrset"></a>
<h3>method qrstrset <span class="smalllinenumber">[line 2283]</span></h3>
<h3>method qrstrset <span class="smalllinenumber">[line 2282]</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">
@ -5043,7 +5043,7 @@ $replLen = false])</code>
</div>
<hr />
<a name="methodrsBlockNum"></a>
<h3>method rsBlockNum <span class="smalllinenumber">[line 2624]</span></h3>
<h3>method rsBlockNum <span class="smalllinenumber">[line 2623]</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">
@ -5082,7 +5082,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsBlockNum1"></a>
<h3>method rsBlockNum1 <span class="smalllinenumber">[line 2633]</span></h3>
<h3>method rsBlockNum1 <span class="smalllinenumber">[line 2632]</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">
@ -5121,7 +5121,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsBlockNum2"></a>
<h3>method rsBlockNum2 <span class="smalllinenumber">[line 2660]</span></h3>
<h3>method rsBlockNum2 <span class="smalllinenumber">[line 2659]</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">
@ -5160,7 +5160,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsDataCodes1"></a>
<h3>method rsDataCodes1 <span class="smalllinenumber">[line 2642]</span></h3>
<h3>method rsDataCodes1 <span class="smalllinenumber">[line 2641]</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">
@ -5199,7 +5199,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsDataCodes2"></a>
<h3>method rsDataCodes2 <span class="smalllinenumber">[line 2669]</span></h3>
<h3>method rsDataCodes2 <span class="smalllinenumber">[line 2668]</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">
@ -5238,7 +5238,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsDataLength"></a>
<h3>method rsDataLength <span class="smalllinenumber">[line 2687]</span></h3>
<h3>method rsDataLength <span class="smalllinenumber">[line 2686]</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">
@ -5277,7 +5277,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsEccCodes1"></a>
<h3>method rsEccCodes1 <span class="smalllinenumber">[line 2651]</span></h3>
<h3>method rsEccCodes1 <span class="smalllinenumber">[line 2650]</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">
@ -5316,7 +5316,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsEccCodes2"></a>
<h3>method rsEccCodes2 <span class="smalllinenumber">[line 2678]</span></h3>
<h3>method rsEccCodes2 <span class="smalllinenumber">[line 2677]</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">
@ -5355,7 +5355,7 @@ $spec)</code>
</div>
<hr />
<a name="methodrsEccLength"></a>
<h3>method rsEccLength <span class="smalllinenumber">[line 2696]</span></h3>
<h3>method rsEccLength <span class="smalllinenumber">[line 2695]</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">
@ -5552,7 +5552,7 @@ $frame)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

File diff suppressed because it is too large Load Diff

View File

@ -300,7 +300,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1378,7 +1378,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library<br /><br /><br /><b
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:35 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -106,7 +106,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -106,7 +106,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -543,7 +543,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:35 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -98,7 +98,7 @@ Array of WEB safe colors<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -158,7 +158,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -83,7 +83,7 @@ Class to create QR-code arrays for TCPDF class.<br /><br /><p>QR Code symbol is
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.007</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.008</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2010-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>
@ -481,7 +481,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -83,7 +83,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.9.014</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.9.015</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@ -110,7 +110,7 @@ main configuration file<br /><br /><p>(define the K_TCPDF_EXTERNAL_CONFIG consta
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:22 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:31 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -103,7 +103,7 @@ Unicode data class for TCPDF library.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:35 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -2138,7 +2138,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -2171,7 +2171,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:20 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br>
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:36 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -68,7 +68,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -68,7 +68,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Tue, 16 Nov 2010 10:47:29 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1,7 +1,7 @@
<?php
//============================================================+
// File name : qrcode.php
// Version : 1.0.007
// Version : 1.0.008
// Begin : 2010-03-22
// Last Update : 2010-11-15
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
@ -79,7 +79,7 @@
* @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 1.0.007
* @version 1.0.008
*/
// definitions
@ -1352,7 +1352,7 @@ if (!class_exists('QRcode', false)) {
protected function eatAn() {
$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
$p = 0;
$p =1 ;
while($this->isalnumat($this->dataStr, $p)) {
if ($this->isdigitat($this->dataStr, $p)) {
$q = $p;
@ -1703,7 +1703,10 @@ if (!class_exists('QRcode', false)) {
*
*/
protected function appendNewInputItem($items, $mode, $size, $data) {
$items[] = $this->newInputItem($mode, $size, $data);
$newitem = $this->newInputItem($mode, $size, $data);
if (!empty($newitem)) {
$items[] = $newitem;
}
return $items;
}
@ -1760,30 +1763,6 @@ if (!class_exists('QRcode', false)) {
return true;
}
/**
* estimateBitsModeNum
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeNum($size) {
$w = (int)ceil($size / 3);
$bits = $w * 10;
switch($size - $w * 3) {
case 1: {
$bits += 4;
break;
}
case 2: {
$bits += 7;
break;
}
default: {
break;
}
}
return $bits;
}
/**
* Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
* @param int $c character value
@ -1808,14 +1787,34 @@ if (!class_exists('QRcode', false)) {
return true;
}
/**
* estimateBitsModeNum
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeNum($size) {
$w = (int)($size / 3);
$bits = ($w * 10);
switch($size - ($w * 3)) {
case 1: {
$bits += 4;
break;
}
case 2: {
$bits += 7;
break;
}
}
return $bits;
}
/**
* estimateBitsModeAn
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeAn($size) {
$w = (int)ceil($size / 2);
$bits = $w * 11;
$bits = (int)($size * 5.5); // (size / 2 ) * 11
if ($size & 1) {
$bits += 6;
}
@ -1828,7 +1827,7 @@ if (!class_exists('QRcode', false)) {
* @return int number of bits
*/
protected function estimateBitsMode8($size) {
return (int)ceil($size * 8);
return (int)($size * 8);
}
/**
@ -1837,7 +1836,7 @@ if (!class_exists('QRcode', false)) {
* @return int number of bits
*/
protected function estimateBitsModeKanji($size) {
return (int)ceil(($size / 2) * 13);
return (int)($size * 6.5); // (size / 2 ) * 13
}
/**

123
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 5.9.014
// Version : 5.9.015
// Begin : 2002-08-03
// Last Update : 2010-11-15
// Last Update : 2010-11-16
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
@ -134,7 +134,7 @@
* @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 5.9.014
* @version 5.9.015
*/
/**
@ -148,7 +148,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
* 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 5.9.014
* @version 5.9.015
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -161,7 +161,7 @@ class TCPDF {
* @var current TCPDF version
* @access private
*/
private $tcpdf_version = '5.9.014';
private $tcpdf_version = '5.9.015';
// Protected properties
@ -5295,12 +5295,10 @@ class TCPDF {
}
}
}
$this->newline = true;
return true;
}
if ($current_page != $this->page) {
// account for columns mode
$this->newline = true;
return true;
}
return false;
@ -5397,9 +5395,9 @@ class TCPDF {
$h = $min_cell_height;
}
}
// check page for no-write regions and adapt page margins if necessary
$this->checkPageRegions($h);
$k = $this->k;
// check page for no-write regions and adapt page margins if necessary
$this->checkPageRegions($h, $this->x, $this->y);
if ($this->rtl) {
$x = $this->x - $this->cell_margin['R'];
} else {
@ -6532,7 +6530,7 @@ class TCPDF {
*/
public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
// check page for no-write regions and adapt page margins if necessary
$this->checkPageRegions($h);
$this->checkPageRegions($h, $this->x, $this->y);
if (strlen($txt) == 0) {
// fix empty text
$txt = ' ';
@ -6896,7 +6894,7 @@ class TCPDF {
* @access protected
*/
protected function getRemainingWidth() {
$this->checkPageRegions();
$this->checkPageRegions(0, $this->x, $this->y);
if ($this->rtl) {
return ($this->x - $this->lMargin);
} else {
@ -7026,6 +7024,14 @@ class TCPDF {
* @since 5.5.009 (2010-07-05)
*/
protected function fitBlock(&$w, &$h, &$x, &$y, $fitonpage=false) {
if ($w <= 0) {
// set maximum width
$w = ($this->w - $this->lMargin - $this->rMargin);
}
if ($h <= 0) {
// set maximum height
$h = ($this->PageBreakTrigger - $this->tMargin);
}
// resize the block to be vertically contained on a single page or single column
if ($fitonpage OR $this->AutoPageBreak) {
$ratio_wh = ($w / $h);
@ -7693,12 +7699,12 @@ class TCPDF {
// clone image object
$imga = $img->clone();
// extract alpha channel
$img->separateImageChannel(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE);
$img->separateImageChannel(8); // 8 = (imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE);
$img->negateImage(true);
$img->setImageFormat('png');
$img->writeImage($tempfile_alpha);
// remove alpha channel
$imga->separateImageChannel(imagick::CHANNEL_ALL & ~(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE));
$imga->separateImageChannel(39); // 39 = (imagick::CHANNEL_ALL & ~(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE));
$imga->setImageFormat('png');
$imga->writeImage($tempfile_plain);
} else { // GD library
@ -16546,8 +16552,20 @@ class TCPDF {
continue;
}
$len = strlen($line);
// check for spot color names
$color_name = '';
if (strcasecmp('x', substr(trim($line), -1)) == 0) {
if (preg_match('/\([^\)]*\)/', $line, $matches) > 0) {
// extract spot color name
$color_name = $matches[0];
// remove color name from string
$line = str_replace(' '.$color_name, '', $line);
// remove pharentesis from color name
$color_name = substr($color_name, 1, -1);
}
}
$chunks = explode(' ', $line);
$cmd = array_pop($chunks);
$cmd = trim(array_pop($chunks));
// RGB
if (($cmd == 'Xa') OR ($cmd == 'XA')) {
$b = array_pop($chunks);
@ -16578,13 +16596,31 @@ class TCPDF {
break;
}
case 'x': {// custom fill color
list($c,$m,$y,$k) = $chunks;
$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' k');
if (empty($color_name)) {
// CMYK color
list($col_c, $col_m, $col_y, $col_k) = $chunks;
$this->_out(''.$col_c.' '.$col_m.' '.$col_y.' '.$col_k.' k');
} else {
// Spot Color (CMYK + tint)
list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
$color_cmd = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$color_name]['i'], (1 - $col_t));
$this->_out($color_cmd);
}
break;
}
case 'X': { // custom stroke color
list($c,$m,$y,$k) = $chunks;
$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' K');
if (empty($color_name)) {
// CMYK color
list($col_c, $col_m, $col_y, $col_k) = $chunks;
$this->_out(''.$col_c.' '.$col_m.' '.$col_y.' '.$col_k.' K');
} else {
// Spot Color (CMYK + tint)
list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
$color_cmd = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$color_name]['i'], (1 - $col_t));
$this->_out($color_cmd);
}
break;
}
case 'Y':
@ -16605,8 +16641,8 @@ class TCPDF {
case 'F': {
if ($u > 0) {
$isU = false;
$max = min($i+5, $cnt);
for ($j=$i+1; $j < $max; ++$j) {
$max = min(($i + 5), $cnt);
for ($j = ($i + 1); $j < $max; ++$j) {
$isU = ($isU OR (($lines[$j] == 'U') OR ($lines[$j] == '*U')));
}
if ($isU) {
@ -22051,6 +22087,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
}
if (!$this->empty_string($textitem)) {
// Check whether we need a new page or new column
$prev_y = $this->y;
$h = ($this->FontSize * $this->cell_height_ratio) + $this->cell_padding['T'] + $this->cell_padding['B'];
if ($this->checkPageBreak($h) OR ($this->y < $prev_y)) {
$tmpx = $this->x;
}
// print ordered item
if ($this->rtl) {
$textitem = '.'.$textitem;
@ -24122,7 +24164,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @access protected
* @since 5.9.003 (2010-10-13)
*/
protected function checkPageRegions($h=0, &$x='', &$y='') {
protected function checkPageRegions($h, &$x, &$y) {
// set default values
if ($x === '') {
$x = &$this->x;
@ -24225,7 +24267,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$y = $this->y;
}
// check page for no-write regions and adapt page margins if necessary
$this->checkPageRegions($x, $y);
$this->checkPageRegions($h, $x, $y);
$k = $this->k;
$ox = 0;
$oy = 0;
@ -24338,6 +24380,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (isset($view_box[2]) AND ($view_box[2] > 0) AND ($view_box[3] > 0)) {
$ow = $view_box[2];
$oh = $view_box[3];
} else {
if ($ow <= 0) {
$ow = $w;
}
if ($oh <= 0) {
$oh = $h;
}
}
$svgscale_x = $w / $ow;
$svgscale_y = $h / $oh;
@ -24763,28 +24812,32 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (isset($gradient['coords'][4])) {
$gradient['coords'][4] /= $w;
}
// fix values
} elseif ($gradient['mode'] == 'percentage') {
foreach($gradient['coords'] as $key => $val) {
if ($val < 0) {
$gradient['coords'][$key] = 0;
} elseif ($val > 1) {
$gradient['coords'][$key] = 1;
}
$gradient['coords'][$key] = (intval($val) / 100);
}
if (($gradient['type'] == 2) AND ($gradient['coords'][0] == $gradient['coords'][2]) AND ($gradient['coords'][1] == $gradient['coords'][3])) {
// single color (no shading)
$gradient['coords'][0] = 1;
$gradient['coords'][1] = 0;
$gradient['coords'][2] = 0.999;
$gradient['coords'][3] = 0;
}
// fix values
foreach($gradient['coords'] as $key => $val) {
if ($val < 0) {
$gradient['coords'][$key] = 0;
} elseif ($val > 1) {
$gradient['coords'][$key] = 1;
}
}
if (($gradient['type'] == 2) AND ($gradient['coords'][0] == $gradient['coords'][2]) AND ($gradient['coords'][1] == $gradient['coords'][3])) {
// single color (no shading)
$gradient['coords'][0] = 1;
$gradient['coords'][1] = 0;
$gradient['coords'][2] = 0.999;
$gradient['coords'][3] = 0;
}
// swap Y coordinates
$tmp = $gradient['coords'][1];
$gradient['coords'][1] = $gradient['coords'][3];
$gradient['coords'][3] = $tmp;
// set transformation map for gradient
if (($gradient['type'] == 3) AND ($gradient['mode'] == 'measure')) {
if ($gradient['type'] == 3) {
// gradient is always circular
$cy = $this->h - $y - ($gradient['coords'][1] * ($w + $h));
$this->_out(sprintf('%.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $w*$this->k, $x*$this->k, $cy*$this->k));