30
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-06-30 10:53:30 +00:00
This commit is contained in:
nicolaasuni 2010-08-05 18:24:13 +02:00
parent a845719a9f
commit 74bc8c0306
22 changed files with 84 additions and 81 deletions

View File

@ -1,3 +1,6 @@
5.7.001 (2010-08-05)
- Bug #3040105 "Broken PDF when using TOC (example 45)" was fixed.
5.7.000 (2010-08-03)
- CSS borders are now supported for HTML tables and other block tags (see example n. 61);
- Cell borders were improved (see example n. 57);

View File

@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 5.7.000
Release date: 2010-08-03
Version: 5.7.001
Release date: 2010-08-05
Author: Nicola Asuni
Copyright (c) 2002-2010:

View File

@ -60,7 +60,7 @@
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1003,7 +1003,7 @@ $code)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -5551,7 +5551,7 @@ $frame)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -83,7 +83,7 @@ Source Location: /tcpdf.php<br /><br />
<h4>Version:</h4>
<ul>
<li>5.7.000</li>
<li>5.7.001</li>
</ul>
@ -733,7 +733,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>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.7.000</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.7.001</td>
</tr>
<tr>
<td><b>link:</b>&nbsp;&nbsp;</td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
@ -6975,8 +6975,8 @@ $subset = 'default'])</code>
<code>the addHtmlLink(
string
$url, string
$name, [int
$fill = 0], [boolean
$name, [boolean
$fill = false], [boolean
$firstline = false], [array
$color = ''], [string
$style = -1], [boolean
@ -7013,9 +7013,9 @@ $firstblock = false])</code>
<td>link name</td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">boolean&nbsp;&nbsp;</td>
@ -7964,8 +7964,8 @@ $h = 0], [string
$txt = ''], [mixed
$border = 0], [int
$ln = 0], [string
$align = ''], [int
$fill = 0], [mixed
$align = ''], [boolean
$fill = false], [mixed
$link = ''], [int
$stretch = 0], [boolean
$ignore_min_height = false], [string
@ -8026,9 +8026,9 @@ $valign = 'M'])</code>
<td>Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul></td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">mixed&nbsp;&nbsp;</td>
@ -10269,8 +10269,8 @@ $h = 0], [string
$txt = ''], [mixed
$border = 0], [int
$ln = 0], [string
$align = ''], [int
$fill = 0], [mixed
$align = ''], [boolean
$fill = false], [mixed
$link = ''], [int
$stretch = 0], [boolean
$ignore_min_height = false], [string
@ -10334,9 +10334,9 @@ $valign = 'M'])</code>
<td>Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul></td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">mixed&nbsp;&nbsp;</td>
@ -12479,7 +12479,7 @@ $lineWidth = ''])</code>
$start_page = $pdf->getPage();
// call your printing functions with your parameters
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
$pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// get the new Y
$end_y = $pdf->GetY();
@ -14492,8 +14492,8 @@ $w, float
$h, string
$txt, [mixed
$border = 0], [string
$align = 'J'], [int
$fill = 0], [int
$align = 'J'], [boolean
$fill = false], [int
$ln = 1], [float
$x = ''], [float
$y = ''], [boolean
@ -14560,9 +14560,9 @@ $fitcell = false])</code>
<td>Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul></td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
@ -21393,8 +21393,8 @@ $fclip = false], [boolean
$ffill = true], [mixed
$border = 0], [int
$ln = 0], [string
$align = ''], [int
$fill = 0], [mixed
$align = ''], [boolean
$fill = false], [mixed
$link = ''], [int
$stretch = 0], [boolean
$ignore_min_height = false], [string
@ -21471,9 +21471,9 @@ $rtloff = false])</code>
<td>Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul></td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">mixed&nbsp;&nbsp;</td>
@ -22380,8 +22380,8 @@ $setbom = true])</code>
float
$h, string
$txt, [mixed
$link = ''], [int
$fill = 0], [string
$link = ''], [boolean
$fill = false], [string
$align = ''], [boolean
$ln = false], [int
$stretch = 0], [boolean
@ -22428,9 +22428,9 @@ $maxh = 0])</code>
<td>URL or identifier returned by AddLink()</td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">string&nbsp;&nbsp;</td>
@ -22802,7 +22802,7 @@ $file)</code>
<code>void writeHTML(
string
$html, [boolean
$ln = true], [int
$ln = true], [boolean
$fill = false], [boolean
$reseth = false], [boolean
$cell = false], [string
@ -22836,7 +22836,7 @@ $align = ''])</code>
<td>if true add a new line after text (default = true)</td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the background must be painted (true) or transparent (false).</td>
</tr>
@ -22873,8 +22873,8 @@ $x, float
$y, [string
$html = ''], [mixed
$border = 0], [int
$ln = 0], [int
$fill = 0], [boolean
$ln = 0], [boolean
$fill = false], [boolean
$reseth = true], [string
$align = ''], [boolean
$autopadding = true])</code>
@ -22938,9 +22938,9 @@ $autopadding = true])</code>
<td>Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul></td>
</tr>
<tr>
<td class="type">int&nbsp;&nbsp;</td>
<td class="type">boolean&nbsp;&nbsp;</td>
<td><b>$fill</b>&nbsp;&nbsp;</td>
<td>Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.</td>
<td>Indicates if the cell background must be painted (true) or transparent (false).</td>
</tr>
<tr>
<td class="type">boolean&nbsp;&nbsp;</td>
@ -26255,7 +26255,7 @@ $file)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -299,7 +299,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1377,7 +1377,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -82,7 +82,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.7.000</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.7.001</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>
@ -113,7 +113,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 5.7.000 (http://www.tcpdf.org)'</code>
<code>PDF_PRODUCER = 'TCPDF 5.7.001 (http://www.tcpdf.org)'</code>
</td></tr></table>
</td></tr></table>
@ -124,7 +124,7 @@ unicode data<br /><br /></div>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -2028,7 +2028,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -2060,7 +2060,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Wed, 04 Aug 2010 01:50:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 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 Wed, 04 Aug 2010 01:50:19 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -67,7 +67,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 Wed, 04 Aug 2010 01:50:13 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -67,7 +67,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 Wed, 04 Aug 2010 01:50:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 5.7.000
// Version : 5.7.001
// Begin : 2002-08-03
// Last Update : 2010-08-03
// Last Update : 2010-08-05
// 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)
// -------------------------------------------------------------------
@ -126,7 +126,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.7.000
* @version 5.7.001
*/
/**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
define('PDF_PRODUCER', 'TCPDF 5.7.000 (http://www.tcpdf.org)');
define('PDF_PRODUCER', 'TCPDF 5.7.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 5.7.000
* @version 5.7.001
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -3322,7 +3322,7 @@ if (!class_exists('TCPDF', false)) {
}
// save current graphic settings
$gvars = $this->getGraphicVars();
$this->lastpage();
$this->lastpage(true);
$this->SetAutoPageBreak(false);
$this->x = 0;
$this->y = $this->h - (1 / $this->k);
@ -3355,7 +3355,7 @@ if (!class_exists('TCPDF', false)) {
* @see getPage(), lastpage(), getNumPages()
*/
public function setPage($pnum, $resetmargins=false) {
if ($pnum == $this->page) {
if (($pnum == $this->page) AND (!$resetmargins)) {
return;
}
if (($pnum > 0) AND ($pnum <= $this->numpages)) {
@ -4791,7 +4791,7 @@ if (!class_exists('TCPDF', false)) {
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param mixed $link URL or identifier returned by AddLink().
* @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
* @param boolean $ignore_min_height if true ignore automatic minimum height value.
@ -4802,7 +4802,7 @@ if (!class_exists('TCPDF', false)) {
* @since 1.0
* @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
*/
public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
$textrendermode = $this->textrendermode;
$textstrokewidth = $this->textstrokewidth;
$this->setTextRenderingMode($fstroke, $ffill, $fclip);
@ -4919,7 +4919,7 @@ if (!class_exists('TCPDF', false)) {
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param mixed $link URL or identifier returned by AddLink().
* @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
* @param boolean $ignore_min_height if true ignore automatic minimum height value.
@ -4929,7 +4929,7 @@ if (!class_exists('TCPDF', false)) {
* @since 1.0
* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
*/
public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
if (!$ignore_min_height) {
$min_cell_height = $this->FontSize * $this->cell_height_ratio;
if ($h < $min_cell_height) {
@ -4949,7 +4949,7 @@ if (!class_exists('TCPDF', false)) {
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param mixed $link URL or identifier returned by AddLink().
* @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
* @param boolean $ignore_min_height if true ignore automatic minimum height value.
@ -4960,7 +4960,7 @@ if (!class_exists('TCPDF', false)) {
* @since 1.0
* @see Cell()
*/
protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
$txt = $this->removeSHY($txt);
$rs = ''; //string to be returned
if (!$ignore_min_height) {
@ -5088,8 +5088,8 @@ if (!class_exists('TCPDF', false)) {
// full border
$border = 1;
}
if (($fill == 1) OR ($border == 1)) {
if ($fill == 1) {
if ($fill OR ($border == 1)) {
if ($fill) {
$op = ($border == 1) ? 'B' : 'f';
} else {
$op = 'S';
@ -5514,7 +5514,7 @@ if (!class_exists('TCPDF', false)) {
* @param string $txt String to print
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
* @param float $x x position in user units
* @param float $y y position in user units
@ -5530,7 +5530,7 @@ if (!class_exists('TCPDF', false)) {
* @since 1.3
* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
*/
public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
if ($this->empty_string($this->lasth) OR $reseth) {
//set row height
$this->lasth = $this->FontSize * $this->cell_height_ratio;
@ -5943,7 +5943,7 @@ if (!class_exists('TCPDF', false)) {
* $start_page = $pdf->getPage();
* // call your printing functions with your parameters
* // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
* $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
* // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* // get the new Y
* $end_y = $pdf->GetY();
@ -6008,7 +6008,7 @@ if (!class_exists('TCPDF', false)) {
* @param float $h Line height
* @param string $txt String to print
* @param mixed $link URL or identifier returned by AddLink()
* @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
* @param boolean $ln if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
* @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
@ -6019,7 +6019,7 @@ if (!class_exists('TCPDF', false)) {
* @access public
* @since 1.5
*/
public function Write($h, $txt, $link='', $fill=0, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0) {
public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0) {
if (strlen($txt) == 0) {
$txt = ' ';
}
@ -10685,7 +10685,7 @@ if (!class_exists('TCPDF', false)) {
* Output anchor link.
* @param string $url link URL or internal link (i.e.: &lt;a href="#23"&gt;link to page 23&lt;/a&gt;)
* @param string $name link name
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param boolean $firstline if true prints only the first line and return the remaining string.
* @param array $color array of RGB text color
* @param string $style font style (U, D, B, I)
@ -10693,7 +10693,7 @@ if (!class_exists('TCPDF', false)) {
* @return the number of cells used or the remaining text if $firstline = true;
* @access public
*/
public function addHtmlLink($url, $name, $fill=0, $firstline=false, $color='', $style=-1, $firstblock=false) {
public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
if (!$this->empty_string($url) AND ($url{0} == '#')) {
// convert url to internal link
$page = intval(substr($url, 1));
@ -17409,7 +17409,7 @@ if (!class_exists('TCPDF', false)) {
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
* @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
* @param boolean $reseth if true reset the last cell height (default true).
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
* @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
@ -17417,7 +17417,7 @@ if (!class_exists('TCPDF', false)) {
* @uses MultiCell()
* @see Multicell(), writeHTML()
*/
public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=0, $reseth=true, $align='', $autopadding=true) {
public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0);
}
@ -17427,7 +17427,7 @@ if (!class_exists('TCPDF', false)) {
* Supported tags are: a, b, blockquote, 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
* @param string $html text to display
* @param boolean $ln if true add a new line after text (default = true)
* @param int $fill Indicates if the background must be painted (true) or transparent (false).
* @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
* @param boolean $reseth if true reset the last cell height (default false).
* @param boolean $cell if true add the default cMargin space to each Write (default false).
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>