32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-22 21:05:10 +00:00
This commit is contained in:
nicolaasuni 2011-05-27 16:35:24 +02:00
parent f990826a4f
commit 9b9e0bf157
3 changed files with 18 additions and 16 deletions

View File

@ -1,3 +1,6 @@
5.9.083 (2011-05-24)
- Bug item #3308387 "line height & SetCellHeightRatio" was fixed.
5.9.082 (2011-05-22) 5.9.082 (2011-05-22)
- Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed. - Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.082 Version: 5.9.083
Release date: 2011-05-22 Release date: 2011-05-27
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.082 // Version : 5.9.083
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-05-22 // Last Update : 2011-05-27
// 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.082 * @version 5.9.083
*/ */
// 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.082 * @version 5.9.083
* @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.082'; private $tcpdf_version = '5.9.083';
// Protected properties // Protected properties
@ -571,7 +571,7 @@ class TCPDF {
* @protected * @protected
*/ */
protected $header_xobjid = -1; protected $header_xobjid = -1;
/** /**
* If true reset the Header Xobject template at each page * If true reset the Header Xobject template at each page
* @protected * @protected
@ -19698,10 +19698,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if ( ($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize) if ( ($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize)
OR ($this->cell_height_ratio != $dom[$key]['line-height']) OR ($this->cell_height_ratio != $dom[$key]['line-height'])
OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) { OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) {
if ((!$this->newline) AND ($key < ($maxel - 1)) if (($key < ($maxel - 1)) AND (
AND ( (is_numeric($fontsize) AND ($fontsize >= 0) AND is_numeric($curfontsize) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize)) ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li'))
OR ($this->cell_height_ratio != $dom[$key]['line-height'])) OR ($this->cell_height_ratio != $dom[$key]['line-height'])
OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) { OR (!$this->newline AND is_numeric($fontsize) AND is_numeric($curfontsize) AND ($fontsize >= 0) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize))
)) {
if ($this->page > $startlinepage) { if ($this->page > $startlinepage) {
// fix lines splitted over two pages // fix lines splitted over two pages
if (isset($this->footerlen[$startlinepage])) { if (isset($this->footerlen[$startlinepage])) {
@ -24903,9 +24904,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
return array($x, $y); return array($x, $y);
} }
// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- // --- SVG METHODS ---------------------------------------------------------
// SVG METHODS
// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
/** /**
* Embedd a Scalable Vector Graphics (SVG) image. * Embedd a Scalable Vector Graphics (SVG) image.
@ -26569,7 +26568,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->svgtext .= $data; $this->svgtext .= $data;
} }
// --- END SVG METHODS ----------------------------- // --- END SVG METHODS -----------------------------------------------------
} // END OF TCPDF CLASS } // END OF TCPDF CLASS