From 74bc8c030631b7dd066e1ef853c2b2ef6a6f0805 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 5 Aug 2010 18:24:13 +0200 Subject: [PATCH] 5.7.001 --- CHANGELOG.TXT | 3 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 68 +++++++++---------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_pdf417.php.html | 2 +- doc/com-tecnick-tcpdf/_qrcode.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 50 +++++++------- 22 files changed, 84 insertions(+), 81 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 04725f1..d81d405 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -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); diff --git a/README.TXT b/README.TXT index d7a2d2e..1fcd21d 100755 --- a/README.TXT +++ b/README.TXT @@ -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: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index c76b3ab..0342550 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 29edc1c..f10dd6a 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index c681520..5012f36 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 904e123..bc058d3 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

@@ -733,7 +733,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.7.000 + version:  5.7.001 link:  http://www.tcpdf.org @@ -6975,8 +6975,8 @@ $subset = 'default']) 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]) link name - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). boolean   @@ -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']) Allows to center or align the text. Possible values are: - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). mixed   @@ -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']) Allows to center or align the text. Possible values are: - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). mixed   @@ -12479,7 +12479,7 @@ $lineWidth = '']) $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]) Allows to center or align the text. Possible values are: - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). int   @@ -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]) Allows to center or align the text. Possible values are: - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). mixed   @@ -22380,8 +22380,8 @@ $setbom = true]) 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]) URL or identifier returned by AddLink() - int   + boolean   $fill   - Indicates if the background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). string   @@ -22802,7 +22802,7 @@ $file) 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 = '']) if true add a new line after text (default = true) - int   + boolean   $fill   Indicates if the background must be painted (true) or transparent (false). @@ -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]) @@ -22938,9 +22938,9 @@ $autopadding = true]) Indicates where the current position should go after the call. Possible values are: - int   + boolean   $fill   - Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + Indicates if the cell background must be painted (true) or transparent (false). boolean   @@ -26255,7 +26255,7 @@ $file)
- Documentation generated on Wed, 04 Aug 2010 01:50:14 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 661bb68..009a31d 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index e55a038..fa9f617 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 5dbc656..c05177f 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 8f11123..10f784d 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index d8de763..a7423d7 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.



- Documentation generated on Wed, 04 Aug 2010 01:50:18 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 4b4f4f3..b82fdb2 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 8e5229d..8f01c75 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index be7890b..05eadff 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index d7346d5..8c5dc9e 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - version:  5.7.000 + version:  5.7.001 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 @@ -113,7 +113,7 @@ unicode data

- PDF_PRODUCER = 'TCPDF 5.7.000 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.7.001 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Wed, 04 Aug 2010 01:50:14 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:01 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 98276a9..99c6206 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.



- Documentation generated on Wed, 04 Aug 2010 01:50:19 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 8229f5b..fd34c0e 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2028,7 +2028,7 @@ top
- Documentation generated on Wed, 04 Aug 2010 01:50:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index a89b783..c5ffd0f 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2060,7 +2060,7 @@ top
- Documentation generated on Wed, 04 Aug 2010 01:50:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:23:59 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index e0477c6..77d1280 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 04 Aug 2010 01:50:19 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/index.html b/doc/index.html index 11f0361..0212dee 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 04 Aug 2010 01:50:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index efbad92..0212dee 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 04 Aug 2010 01:50:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 05 Aug 2010 18:24:00 +0200 by phpDocumentor 1.4.3
diff --git a/tcpdf.php b/tcpdf.php index f5f456c..13a875c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * 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.
* @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: or a string containing some or all of the following characters (in any order): 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: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: - * @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: * @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: or a string containing some or all of the following characters (in any order): 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: 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: - * @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: * @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: or a string containing some or all of the following characters (in any order): 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: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: - * @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: * @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: or a string containing some or all of the following characters (in any order): 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: - * @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: * @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: * @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: @@ -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.: <a href="#23">link to page 23</a>) * @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: or a string containing some or all of the following characters (in any order): 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: 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: * @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: