From d9ecd77c1ebb79105a45419cd51676782c89e91f Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 3 Dec 2010 15:19:37 +0100 Subject: [PATCH] 5.9.028 --- CHANGELOG.TXT | 3 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 8 +- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.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/_pdf417.php.html | 2 +- doc/com-tecnick-tcpdf/_qrcode.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 4 +- 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 +- fonts/utils/makeallttffonts.php | 143 +++++++++--------- fonts/utils/makefont.php | 24 ++- tcpdf.php | 10 +- 25 files changed, 124 insertions(+), 108 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index cd1679c..003e355 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.028 (2010-12-03) + - Font utils makefont.php and makeallttffonts.php were updated. + 5.9.027 (2010-12-01) - Spot Colors are now better integrated with HTML mode. - Method SetDocInfoUnicode() was added to turn on/off Unicode mode for document information dictionary (meta tags) - check the example n. 19. diff --git a/README.TXT b/README.TXT index fe170dc..b317f47 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.027 -Release date: 2010-12-01 +Version: 5.9.028 +Release date: 2010-12-03 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 2d26c7e..afb735a 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -65,7 +65,7 @@
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 19ca6f1..32f1a5c 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1004,7 +1004,7 @@ $code)
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index ccc7213..0a2e16f 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5552,7 +5552,7 @@ $frame)
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index de2f7de..89c4821 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -84,7 +84,7 @@ Source Location: /tcpdf.php

Version:

@@ -786,7 +786,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.9.027 + version:  5.9.028 link:  http://www.tcpdf.org @@ -6367,7 +6367,7 @@ This is a PHP class for generating PDF documents without requiring external exte
[ Top ]

-

$tcpdf_version =  '5.9.027'

+

$tcpdf_version =  '5.9.028'

[line 167]



Tags:

@@ -28543,7 +28543,7 @@ $file)
- Documentation generated on Wed, 01 Dec 2010 17:11:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:26 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index cd67768..24cb885 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -300,7 +300,7 @@ $type)
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index a116497..a04a72e 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1378,7 +1378,7 @@ $type)
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html index 8446820..d771f77 100644 --- a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html +++ b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html @@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library


- Documentation generated on Wed, 01 Dec 2010 17:11:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3 diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index c0142bc..8ad1494 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index e63e1ac..a698d65 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 02db805..983b809 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -543,7 +543,7 @@ Configuration file for TCPDF.



- Documentation generated on Wed, 01 Dec 2010 17:11:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 1ad0d9d..0284f73 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -98,7 +98,7 @@ Array of WEB safe colors



- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 81064c1..d312e10 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -158,7 +158,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 4e3acaa..5bd983f 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -481,7 +481,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 0d2cfa0..9e6fe9c 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -83,7 +83,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - version:  5.9.027 + version:  5.9.028 copyright:  2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com @@ -110,7 +110,7 @@ main configuration file

(define the K_TCPDF_EXTERNAL_CONFIG consta

- Documentation generated on Wed, 01 Dec 2010 17:11:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:26 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index ad1ee3e..0573c6a 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -103,7 +103,7 @@ Unicode data class for TCPDF library.



- Documentation generated on Wed, 01 Dec 2010 17:11:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 779fc50..6692d37 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2144,7 +2144,7 @@ top
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 40f2b7d..56345f0 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2177,7 +2177,7 @@ top
- Documentation generated on Wed, 01 Dec 2010 17:11:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index d3a473a..8bfeb3f 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 01 Dec 2010 17:11:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/index.html b/doc/index.html index 0f17de7..337be6f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 0f17de7..337be6f 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 01 Dec 2010 17:11:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3
diff --git a/fonts/utils/makeallttffonts.php b/fonts/utils/makeallttffonts.php index e841642..8bcc4cd 100755 --- a/fonts/utils/makeallttffonts.php +++ b/fonts/utils/makeallttffonts.php @@ -1,69 +1,74 @@ -. -// -// See LICENSE.TXT file for more information. -//============================================================+ - -/** - * Process all TTF files on current directory to build TCPDF compatible font files. - * @package com.tecnick.tcpdf - * @author Nicola Asuni - * @copyright Copyright © 2004-2009, Nicola Asuni - Tecnick.com S.r.l. - ITALY - www.tecnick.com - info@tecnick.com - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License - * @link www.tecnick.com - * @since 2008-12-07 - */ - -/** - */ - -// read directory for files (only graphics files). -$handle = opendir('.'); -while($file = readdir($handle)) { - $path_parts = pathinfo($file); - $file_ext = strtolower($path_parts['extension']); - if ($file_ext == 'ttf') { - exec('./ttf2ufm -a -F '.$path_parts['basename'].''); - exec('php -q makefont.php '.$path_parts['basename'].' '.$path_parts['filename'].'.ufm'); - } -} -closedir($handle); - -//============================================================+ -// END OF FILE -//============================================================+ +. +// +// See LICENSE.TXT file for more information. +//============================================================+ + +/** + * Process all TTF files on current directory to build TCPDF compatible font files. + * @package com.tecnick.tcpdf + * @author Nicola Asuni + * @copyright Copyright © 2004-2009, Nicola Asuni - Tecnick.com S.r.l. - ITALY - www.tecnick.com - info@tecnick.com + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @link www.tecnick.com + * @since 2008-12-07 + */ + +/** + */ + +// read directory for files (only TTF files). +$handle = opendir('.'); +while ($file = readdir($handle)) { + $path_parts = pathinfo($file); + if (isset($path_parts['extension']) AND (strtoupper($path_parts['extension']) === 'TTF')) { + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + // windows + exec('ttf2ufm.exe -a -F '.$path_parts['basename']); + } else { + // linux + exec('./ttf2ufm -a -F '.$path_parts['basename']); + } + exec('php -q makefont.php '.$path_parts['basename'].' '.$path_parts['filename'].'.ufm'); + } +} +closedir($handle); + +//============================================================+ +// END OF FILE +//============================================================+ diff --git a/fonts/utils/makefont.php b/fonts/utils/makefont.php index 608ec04..7b88540 100755 --- a/fonts/utils/makefont.php +++ b/fonts/utils/makefont.php @@ -2,12 +2,12 @@ //============================================================+ // File name : makefont.php // Begin : 2004-12-31 -// Last Update : 2010-08-08 -// Version : 1.2.006 +// Last Update : 2010-12-03 +// Version : 1.2.007 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2008-2010 Nicola Asuni - Tecnick.com S.r.l. -// +// // This file is part of TCPDF software library. // // TCPDF is free software: you can redistribute it and/or modify it @@ -50,7 +50,7 @@ */ /** - * + * * @param string $fontfile path to font file (TTF, OTF or PFB). * @param string $fmfile font metrics file (UFM or AFM). * @param boolean $embedded Set to false to not embed the font, true otherwise (default). @@ -59,7 +59,13 @@ */ function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=array()) { //Generate a font definition file - set_magic_quotes_runtime(0); + if(!defined('PHP_VERSION_ID')) { + $version = PHP_VERSION; + define('PHP_VERSION_ID', (($version{0} * 10000) + ($version{2} * 100) + $version{4})); + } + if (PHP_VERSION_ID < 50300) { + @set_magic_quotes_runtime(0); + } ini_set('auto_detect_line_endings', '1'); if (!file_exists($fontfile)) { die('Error: file not found: '.$fontfile); @@ -581,10 +587,12 @@ function CheckTTF($file) { $e = ($fsType & 0x08) != 0; fclose($f); if($rl AND (!$pp) AND (!$e)) { - print "Warning: font license does not allow embedding\n"; + print 'Warning: font license does not allow embedding.'."\n"; } } +// ------------------------------------------------------------------- + $arg = $GLOBALS['argv']; if (count($arg) >= 3) { ob_start(); @@ -607,9 +615,9 @@ if (count($arg) >= 3) { $t = ob_get_clean(); print preg_replace('!!i', "\n", $t); } else { - print "Usage: makefont.php \n"; + print 'Usage: makefont.php '."\n"; } //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/tcpdf.php b/tcpdf.php index f088348..82fcc24 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @name TCPDF * @package com.tecnick.tcpdf -* @version 5.9.027 +* @version 5.9.028 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @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. @@ -164,7 +164,7 @@ class TCPDF { * @var current TCPDF version * @access private */ - private $tcpdf_version = '5.9.027'; + private $tcpdf_version = '5.9.028'; // Protected properties