32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-12-24 01:15:27 +00:00
This commit is contained in:
nicolaasuni 2011-02-03 10:37:34 +01:00
parent fb3e3a0591
commit 307fd09ad6
3 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,6 @@
5.9.049 (2011-02-03)
- Bug #3170777 "TCPDF creates a new page after a single line in writeHTML" was fixed.
5.9.048 (2011-02-02) 5.9.048 (2011-02-02)
- No changes. Just released to override previous release that was not uploaded correctly. - No changes. Just released to override previous release that was not uploaded correctly.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.048 Version: 5.9.049
Release date: 2011-02-02 Release date: 2011-02-03
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2011: Copyright (c) 2002-2011:

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.048 // Version : 5.9.049
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-02-02 // Last Update : 2011-02-03
// 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.
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -134,7 +134,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.048 * @version 5.9.049
*/ */
// 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.
@ -146,7 +146,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.048 * @version 5.9.049
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -157,7 +157,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.048'; private $tcpdf_version = '5.9.049';
// Protected properties // Protected properties
@ -21207,7 +21207,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$n = 1; $n = 1;
} }
$hb = ($n * $pre_h); $hb = ($n * $pre_h);
if ($this->y < $maxbottomliney) { if ($maxbottomliney > $this->PageBreakTrigger) {
$hbz = ($this->FontSize * $this->cell_height_ratio);
} elseif ($this->y < $maxbottomliney) {
$hbz = ($maxbottomliney - $this->y); $hbz = ($maxbottomliney - $this->y);
} }
} }