From 075d25d56e5d352155fc3a643c9fc69565d712bb Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 7 Aug 2009 14:13:40 +0200 Subject: [PATCH] 4.6.024 --- CHANGELOG.TXT | 4 ++++ README.TXT | 4 ++-- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 18 ++++++----------- doc/com-tecnick-tcpdf/TCPDFBarcode.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/_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 | 20 +++++++++---------- 16 files changed, 36 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 3e7967e..ae9e1c0 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.6.024 (2009-08-07) + - Bug item #2833556 "justification using other units than mm" was fixed. + - Documentation was fixed/updated. + 4.6.023 (2009-08-02) - Bug item #2830537 "MirrorH can show mask for transparent PNGs" was fixed. diff --git a/README.TXT b/README.TXT index a370b6f..e2f5a6f 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.6.023 -Release date: 2009-08-02 +Version: 4.6.024 +Release date: 2009-08-07 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index e9397c9..85b6e66 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index bfb4767..915b8a6 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -593,7 +593,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.023 + version:  4.6.024 link:  http://www.tcpdf.org @@ -7522,12 +7522,11 @@ $num)
int GetArrStringWidth( - +string $sa, [string $fontname = ''], [string $fontstyle = ''], [float -$fontsize = 0], string -$arr) +$fontsize = 0])

@@ -7557,7 +7556,7 @@ $arr) - + @@ -7574,11 +7573,6 @@ $arr) - - - - -
string  $arr  $sa   The array of chars whose total length is to be computed
float   $fontsize   Font size in points. The default value is the current size.
  $sa  

@@ -19393,7 +19387,7 @@ $file)
- Documentation generated on Sun, 02 Aug 2009 19:18:36 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:26 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index de67ca7..b318a40 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index ba9ca9b..bf846a9 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index cc8f7ac..0219462 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -507,7 +507,7 @@ Configuration file for TCPDF.



- Documentation generated on Sun, 02 Aug 2009 19:18:41 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index ff83126..3b6588b 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.



- Documentation generated on Sun, 02 Aug 2009 19:18:36 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:26 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index be9735b..ddc7509 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - version:  4.6.023 + version:  4.6.024 copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com @@ -104,7 +104,7 @@ unicode data

- PDF_PRODUCER = 'TCPDF 4.6.023 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.024 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Sun, 02 Aug 2009 19:18:36 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:26 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 4cfd44f..b963476 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.



- Documentation generated on Sun, 02 Aug 2009 19:18:41 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by phpDocumentor 1.4.1
diff --git a/doc/elementindex.html b/doc/elementindex.html index a7b7e9d..d1c0f29 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1374,7 +1374,7 @@ top
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 53130d7..3044a8a 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1397,7 +1397,7 @@ top
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/errors.html b/doc/errors.html index 3352c52..71d777f 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Sun, 02 Aug 2009 19:18:41 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by phpDocumentor 1.4.1
diff --git a/doc/index.html b/doc/index.html index e8988cb..72c6ec1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index e8988cb..72c6ec1 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1
- Documentation generated on Sun, 02 Aug 2009 19:18:35 +0200 by phpDocumentor 1.4.1 + Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by phpDocumentor 1.4.1
diff --git a/tcpdf.php b/tcpdf.php index 867a411..18244e6 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-08-02 +// Last Update : 2009-08-07 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.023 +// Version : 4.6.024 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -126,7 +126,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.6.023 + * @version 4.6.024 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.023 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.024 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
* 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 4.6.023 + * @version 4.6.024 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -2859,7 +2859,7 @@ if (!class_exists('TCPDF', false)) { /** * Returns the string length of an array of chars in user unit. A font must be selected.
- * @param string $arr The array of chars whose total length is to be computed + * @param string $sa The array of chars whose total length is to be computed * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained. * @param string $fontstyle Font style. Possible values are (case insensitive): or any combination. The default value is regular. * @param float $fontsize Font size in points. The default value is the current size. @@ -3614,9 +3614,9 @@ if (!class_exists('TCPDF', false)) { // get string width without spaces $width = $this->GetStringWidth(str_replace(' ', '', $txt)); // calculate average space width - $spacewidth = ($w - $width - (2 * $this->cMargin)) / ($ns?$ns:1) / $this->FontSize / $this->k; + $spacewidth = -1000 * ($w - $width - (2 * $this->cMargin)) / ($ns?$ns:1) / $this->FontSize; // set word position to be used with TJ operator - $txt2 = str_replace(chr(0).' ', ') '.(-2830 * $spacewidth).' (', $txt2); + $txt2 = str_replace(chr(0).' ', ') '.($spacewidth).' (', $txt2); } else { // get string width $width = $this->GetStringWidth($txt); @@ -11657,7 +11657,7 @@ if (!class_exists('TCPDF', false)) { } // calculate additional space to add to each space $spacewidth = (($tw - $linew + (($no - $ns) * $this->GetStringWidth(chr(32)))) / ($ns?$ns:1)) * $this->k; - $spacewidthu = ($tw - $linew + ($no * $this->GetStringWidth(chr(32)))) / ($ns?$ns:1) / $this->FontSize / $this->k; + $spacewidthu = -1000 * ($tw - $linew + ($no * $this->GetStringWidth(chr(32)))) / ($ns?$ns:1) / $this->FontSize; $nsmax = $ns; $ns = 0; reset($lnstring); @@ -11769,7 +11769,7 @@ if (!class_exists('TCPDF', false)) { create_function('$matches', 'global $spacew; $matches[1] = str_replace("#!#OP#!#", "(", $matches[1]); $matches[1] = str_replace("#!#CP#!#", ")", $matches[1]); - return "[(".str_replace(chr(0).chr(32), ") ".(-2830 * $spacew)." (", $matches[1]).")]";'), $pmidtemp); + return "[(".str_replace(chr(0).chr(32), ") ".($spacew)." (", $matches[1]).")]";'), $pmidtemp); $this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\n".$pend); $endlinepos = strlen($pstart."\n".$pmid."\n"); } else {