30
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-06-05 23:30:47 +00:00

6.0.005 (2013-03-26)

- Default font path was fixed.
This commit is contained in:
nicolaasuni 2013-03-26 13:49:17 +00:00
parent 3e1f83ee55
commit 57fd821ca9
6 changed files with 24 additions and 18 deletions

View File

@ -1,3 +1,6 @@
6.0.005 (2013-03-26)
- Default font path was fixed.
6.0.004 (2013-03-21) 6.0.004 (2013-03-21)
- Return value of addTTFfont() method was fixed. - Return value of addTTFfont() method was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.004 Version: 6.0.005
Release date: 2013-03-21 Release date: 2013-03-26
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2013: Copyright (c) 2002-2013:

View File

@ -3,7 +3,7 @@
// File name : tcpdf_colors.php // File name : tcpdf_colors.php
// Version : 1.0.000 // Version : 1.0.000
// Begin : 2002-04-09 // Begin : 2002-04-09
// Last Update : 2013-03-16 // Last Update : 2013-03-25
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -260,7 +260,7 @@ class TCPDF_COLORS {
* @return array RGB or CMYK color, or false in case of error. * @return array RGB or CMYK color, or false in case of error.
* @public static * @public static
*/ */
public static function convertHTMLColorToDec($hcolor='#FFFFFF', &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) { public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
$color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces $color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces
$color = strtolower($color); $color = strtolower($color);
// check for javascript color array syntax // check for javascript color array syntax

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf_fonts.php // File name : tcpdf_fonts.php
// Version : 1.0.002 // Version : 1.0.003
// Begin : 2008-01-01 // Begin : 2008-01-01
// Last Update : 2013-03-21 // Last Update : 2013-03-26
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -1667,8 +1667,11 @@ class TCPDF_FONTS {
* @public static * @public static
*/ */
public static function _getfontpath() { public static function _getfontpath() {
if (!defined('K_PATH_FONTS') AND is_dir(dirname(__FILE__).'/fonts')) { if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
define('K_PATH_FONTS', dirname(__FILE__).'/fonts/'); if (substr($fdir, -1) != '/') {
$fdir .= '/';
}
define('K_PATH_FONTS', $fdir);
} }
return defined('K_PATH_FONTS') ? K_PATH_FONTS : ''; return defined('K_PATH_FONTS') ? K_PATH_FONTS : '';
} }

View File

@ -3,7 +3,7 @@
// File name : tcpdf_static.php // File name : tcpdf_static.php
// Version : 1.0.000 // Version : 1.0.000
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2013-03-20 // Last Update : 2013-03-26
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version. * Current TCPDF version.
* @private static * @private static
*/ */
private static $tcpdf_version = '6.0.003'; private static $tcpdf_version = '6.0.005';
/** /**
* String alias for total number of pages. * String alias for total number of pages.

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.004 // Version : 6.0.005
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2013-03-20 // Last Update : 2013-03-26
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -139,7 +139,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 6.0.004 * @version 6.0.005
*/ */
if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
@ -168,7 +168,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.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 6.0.004 * @version 6.0.005
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -11436,7 +11436,7 @@ class TCPDF {
*/ */
protected function _outRect($x, $y, $w, $h, $op) { protected function _outRect($x, $y, $w, $h, $op) {
if ($this->state == 2) { if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op)); $this->_out(sprintf('%F %F %F %F re %s', ($x * $this->k), (($this->h - $y) * $this->k), ($w * $this->k), (-$h * $this->k), $op));
} }
} }
@ -11454,7 +11454,7 @@ class TCPDF {
*/ */
protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) { protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
if ($this->state == 2) { if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F %F %F c', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k)); $this->_out(sprintf('%F %F %F %F %F %F c', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
} }
} }
@ -11470,7 +11470,7 @@ class TCPDF {
*/ */
protected function _outCurveV($x2, $y2, $x3, $y3) { protected function _outCurveV($x2, $y2, $x3, $y3) {
if ($this->state == 2) { if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F v', $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k)); $this->_out(sprintf('%F %F %F %F v', ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
} }
} }
@ -11486,7 +11486,7 @@ class TCPDF {
*/ */
protected function _outCurveY($x1, $y1, $x3, $y3) { protected function _outCurveY($x1, $y1, $x3, $y3) {
if ($this->state == 2) { if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F y', $x1 * $this->k, ($this->h - $y1) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k)); $this->_out(sprintf('%F %F %F %F y', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
} }
} }