6.0.015 (2013-04-14)

- Some unused vars were removed from AddFont() method.
- Some directories were moved inside the examples directory.
- All examples were updated to reflect the new default structure.
- Source code were clean-up up to be more compatible with system packaging.
- Files encodings and permissions were reset.
- The command line tool tcpdf_addfont.php was added on the tools directory.

CHANGELOG.TXT

@@ -1,3 +1,11 @@
+6.0.015 (2013-04-14)
+	- Some unused vars were removed from AddFont() method.
+	- Some directories were moved inside the examples directory.
+	- All examples were updated to reflect the new default structure.
+	- Source code were clean-up up to be more compatible with system packaging.
+	- Files encodings and permissions were reset.
+	- The command line tool tcpdf_addfont.php was added on the tools directory.
+
 6.0.014 (2013-04-13)
 	- The signature of addTTFfont() method includes a new parameter to link existing fonts instead of copying and compressing them.
 

README.TXT

@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.0.014
-Release date: 2013-05-13
+Version: 6.0.015
+Release date: 2013-05-14
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2013:
@@ -86,7 +86,7 @@ License
 	See LICENSE.TXT file for more information.
 
 Third party fonts
-	This library includes third party font files released with different licenses.
+	This library may include third party font files released with different licenses.
 	These fonts are not required by TCPDF but have been included as you convenience.
 	The original TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
 	To get the original distribution archives please check the information on fonts subfolders:

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.014",
+	"version": "6.0.015",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents.",
@@ -19,7 +19,6 @@
 	"autoload": {
 		"classmap": [
 		"fonts",
-		"config/lang",
 		"config",
 		"include",
 		"tcpdf.php",

config/tcpdf_config.php

@@ -2,7 +2,7 @@
 //============================================================+
 // File name   : tcpdf_config.php
 // Begin       : 2004-06-11
-// Last Update : 2013-02-06
+// Last Update : 2013-05-14
 //
 // Description : Configuration file for TCPDF.
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - [email protected]
@@ -51,204 +51,217 @@
 			$_SERVER['DOCUMENT_ROOT'] = '/';
 		}
 	}
-
 	// be sure that the end slash is present
 	$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT'].'/');
 
-	// Automatic calculation for the following K_PATH_MAIN constant
-	$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
-	if (substr($k_path_main, -1) != '/') {
-		$k_path_main .= '/';
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// Try to automatically set the value for the following K_PATH_MAIN constant.
+	// NOTE: delete this section and manually set the K_PATH_MAIN constant below for better performances.
+	$tcpdf_install_dirs = array();
+	if (strpos(dirname(__FILE__), '/config') !== false) {
+		// default config file
+		$k_path_main_default = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
+		if (substr($k_path_main_default, -1) != '/') {
+			$k_path_main_default .= '/';
+		}
+		$tcpdf_install_dirs[] = $k_path_main_default;
+	}
+	$tcpdf_install_dirs += array('/usr/share/php/tcpdf/', '/usr/share/tcpdf/', '/usr/share/php-tcpdf/', '/var/www/tcpdf/', '/var/www/html/tcpdf/', '/usr/local/apache2/htdocs/tcpdf/');
+	foreach ($tcpdf_install_dirs as $k_path_main) {
+		if (file_exists($k_path_main.'tcpdf.php')) {
+			break;
+		}
+	}
+	if (!file_exists($k_path_main)) {
+		die('TCPDF ERROR: please set the correct path to TCPDF on the configuration file');
 	}
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	/**
 	 * Installation path (/var/www/tcpdf/).
 	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
 	 */
 	define ('K_PATH_MAIN', $k_path_main);
-
-	// Automatic calculation for the following K_PATH_URL constant
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// Try to automatically set the value for the following K_PATH_URL constant.
+	// NOTE: delete this section and manually set the K_PATH_URL constant below for better performances.
 	$k_path_url = $k_path_main; // default value for console mode
 	if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-		if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
+		if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
 			$k_path_url = 'https://';
 		} else {
 			$k_path_url = 'http://';
 		}
 		$k_path_url .= $_SERVER['HTTP_HOST'];
 		$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
 	}
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	/**
 	 * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
+	 * By default it is automatically set but you can also set it as a fixed string to improve performances.
 	 */
 	define ('K_PATH_URL', $k_path_url);
 
 	/**
-	 * path for PDF fonts
-	 * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-	 */
-	define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-	/**
-	 * cache directory for temporary files (full path)
+	 * Cache directory for temporary files (full path).
 	 */
-	define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
+	define ('K_PATH_CACHE', sys_get_temp_dir().'/');
 
 	/**
-	 * cache directory for temporary files (url path)
+	 * Path for PDF fonts.
 	 */
-	define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
+	define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
 
 	/**
-	 *images directory
+	 * Default images directory.
 	 */
-	define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
+	define ('K_PATH_IMAGES', K_PATH_MAIN.'examples/images/');
 
 	/**
-	 * blank image
+	 * Blank image.
 	 */
 	define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
 
 	/**
-	 * page format
+	 * Page format.
 	 */
 	define ('PDF_PAGE_FORMAT', 'A4');
 
 	/**
-	 * page orientation (P=portrait, L=landscape)
+	 * Page orientation (P=portrait, L=landscape).
 	 */
 	define ('PDF_PAGE_ORIENTATION', 'P');
 
 	/**
-	 * document creator
+	 * Document creator.
 	 */
 	define ('PDF_CREATOR', 'TCPDF');
 
 	/**
-	 * document author
+	 * Document author.
 	 */
 	define ('PDF_AUTHOR', 'TCPDF');
 
 	/**
-	 * header title
+	 * Header title.
 	 */
 	define ('PDF_HEADER_TITLE', 'TCPDF Example');
 
 	/**
-	 * header description string
+	 * Header description string.
 	 */
 	define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
 
 	/**
-	 * image logo
+	 * Image logo.
 	 */
 	define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
 
 	/**
-	 * header logo image width [mm]
+	 * Header logo image width [mm].
 	 */
 	define ('PDF_HEADER_LOGO_WIDTH', 30);
 
 	/**
-	 *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
+	 * Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
 	 */
 	define ('PDF_UNIT', 'mm');
 
 	/**
-	 * header margin
+	 * Header margin.
 	 */
 	define ('PDF_MARGIN_HEADER', 5);
 
 	/**
-	 * footer margin
+	 * Footer margin.
 	 */
 	define ('PDF_MARGIN_FOOTER', 10);
 
 	/**
-	 * top margin
+	 * Top margin.
 	 */
 	define ('PDF_MARGIN_TOP', 27);
 
 	/**
-	 * bottom margin
+	 * Bottom margin.
 	 */
 	define ('PDF_MARGIN_BOTTOM', 25);
 
 	/**
-	 * left margin
+	 * Left margin.
 	 */
 	define ('PDF_MARGIN_LEFT', 15);
 
 	/**
-	 * right margin
+	 * Right margin.
 	 */
 	define ('PDF_MARGIN_RIGHT', 15);
 
 	/**
-	 * default main font name
+	 * Default main font name.
 	 */
 	define ('PDF_FONT_NAME_MAIN', 'helvetica');
 
 	/**
-	 * default main font size
+	 * Default main font size.
 	 */
 	define ('PDF_FONT_SIZE_MAIN', 10);
 
 	/**
-	 * default data font name
+	 * Default data font name.
 	 */
 	define ('PDF_FONT_NAME_DATA', 'helvetica');
 
 	/**
-	 * default data font size
+	 * Default data font size.
 	 */
 	define ('PDF_FONT_SIZE_DATA', 8);
 
 	/**
-	 * default monospaced font name
+	 * Default monospaced font name.
 	 */
 	define ('PDF_FONT_MONOSPACED', 'courier');
 
 	/**
-	 * ratio used to adjust the conversion of pixels to user units
+	 * Ratio used to adjust the conversion of pixels to user units.
 	 */
 	define ('PDF_IMAGE_SCALE_RATIO', 1.25);
 
 	/**
-	 * magnification factor for titles
+	 * Magnification factor for titles.
 	 */
 	define('HEAD_MAGNIFICATION', 1.1);
 
 	/**
-	 * height of cell respect font height
+	 * Height of cell respect font height.
 	 */
 	define('K_CELL_HEIGHT_RATIO', 1.25);
 
 	/**
-	 * title magnification respect main font size
+	 * Title magnification respect main font size.
 	 */
 	define('K_TITLE_MAGNIFICATION', 1.3);
 
 	/**
-	 * reduction factor for small font
+	 * Reduction factor for small font.
 	 */
 	define('K_SMALL_RATIO', 2/3);
 
 	/**
-	 * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
+	 * Set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language.
 	 */
 	define('K_THAI_TOPCHARS', true);
 
 	/**
-	 * if true allows to call TCPDF methods using HTML syntax
+	 * If true allows to call TCPDF methods using HTML syntax
 	 * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
 	 */
 	define('K_TCPDF_CALLS_IN_HTML', true);
 
 	/**
-	 * if true adn PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
+	 * If true adn PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
 	 */
 	define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
 }