joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-22 21:05:10 +00:00
Code Issues Releases Activity

5.9.109

Browse Source
This commit is contained in:
Nick 2011-08-12 19:26:14 +02:00
parent 85d7684869
commit 6845c1be68
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,3 +1,7 @@
5.9.109 (2011-08-12)
- Method getNumLines() was fixed.
- A bug related to page break in multi-column mode was fixed.
5.9.108 (2011-08-09) 5.9.108 (2011-08-09)
- A bug on PHP4 version was fixed. - A bug on PHP4 version was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.108 Version: 5.9.109
Release date: 2011-08-09 Release date: 2011-08-12
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2011: Copyright (c) 2002-2011:

21
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.108 // Version : 5.9.109
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-08-09 // Last Update : 2011-08-12
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS. // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -136,7 +136,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p> * Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @author Nicola Asuni * @author Nicola Asuni
* @version 5.9.108 * @version 5.9.109
*/ */
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@ -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> * 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>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions. * @brief PHP class for generating PDF documents without requiring external extensions.
* @version 5.9.108 * @version 5.9.109
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -159,7 +159,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.108'; private $tcpdf_version = '5.9.109';
// Protected properties // Protected properties
@ -6174,10 +6174,10 @@ class TCPDF {
$y = $this->GetY(); $y = $this->GetY();
} }
$resth = 0; $resth = 0;
if (($this->inPageBody()) AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) { if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
// spit cell in more pages/columns // spit cell in more pages/columns
$newh = $this->PageBreakTrigger - $y; $newh = ($this->PageBreakTrigger - $y);
$resth = $h - $newh; // cell to be printed on the next page/column $resth = ($h - $newh); // cell to be printed on the next page/column
$h = $newh; $h = $newh;
} }
// get current page number // get current page number
@ -6589,7 +6589,10 @@ class TCPDF {
} }
if ((($sum + $charWidth) > $wmax) OR ($chars[$i] == 10)) { if ((($sum + $charWidth) > $wmax) OR ($chars[$i] == 10)) {
++$lines; ++$lines;
if ($lastSeparator != -1) { if ($chars[$i] == 10) {
$lastSeparator = -1;
$sum = 0;
} elseif ($lastSeparator != -1) {
$i = $lastSeparator; $i = $lastSeparator;
$lastSeparator = -1; $lastSeparator = -1;
$sum = 0; $sum = 0;