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-02-15 09:36:24 +01:00
parent 02f55878f9
commit e5aa76fdbe
3 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,6 @@
5.9.052 (2011-02-15)
- A bug related to HTML automatic newlines was fixed.
5.9.051 (2011-02-12) 5.9.051 (2011-02-12)
- "Commas at beginning of new lines" problem was fixed. - "Commas at beginning of new lines" problem was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.051 Version: 5.9.052
Release date: 2011-02-12 Release date: 2011-02-15
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.051 // Version : 5.9.052
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-02-12 // Last Update : 2011-02-15
// 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.051 * @version 5.9.052
*/ */
// 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.051 * @version 5.9.052
* @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.051'; private $tcpdf_version = '5.9.052';
// Protected properties // Protected properties
@ -20291,7 +20291,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} else { } else {
$cwa = $this->w - $this->rMargin - $this->x; $cwa = $this->w - $this->rMargin - $this->x;
} }
if ($strlinelen < $cwa) { if (($strlinelen < $cwa) AND (isset($dom[($key + 1)])) AND ($dom[($key + 1)]['tag']) AND (!$dom[($key + 1)]['block'])) {
// check the next text blocks for continuity // check the next text blocks for continuity
$nkey = ($key + 1); $nkey = ($key + 1);
$write_block = true; $write_block = true;
@ -20322,9 +20322,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
} }
if (($wadj > 0) AND (($strlinelen + $wadj) >= $cwa)) { if (($wadj > 0) AND (($strlinelen + $wadj) >= $cwa)) {
$nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $dom[$key]['value'], 2); $nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $dom[$key]['value']);
if (isset($nextstr[0])) { $numblks = count($nextstr);
$wadj = ($cwa - $this->GetStringWidth($nextstr[0])); if ($numblks > 1) {
$wadj = ($cwa - $strlinelen + $this->GetStringWidth($nextstr[($numblks - 1)]));
} }
} }
// check for reversed text direction // check for reversed text direction