From 66e99bd32829e040a72c82c109271a94eea55ba8 Mon Sep 17 00:00:00 2001 From: Nicola Asuni Date: Mon, 24 Sep 2012 18:50:59 +0100 Subject: [PATCH] 5.9.192 (2012-09-24) - A problem on the releasing process was fixed. --- CHANGELOG.TXT | 3 +++ README.TXT | 2 +- composer.json | 2 +- tcpdf.php | 28 ++++++++++++++++++++-------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index fc886bf..33d72ae 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.192 (2012-09-24) + - A problem on the releasing process was fixed. + 5.9.191 (2012-09-24) - SVG image naow support svg and eps images. diff --git a/README.TXT b/README.TXT index e64ccd4..bac8630 100755 --- a/README.TXT +++ b/README.TXT @@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.191 +Version: 5.9.192 Release date: 2012-09-24 Author: Nicola Asuni diff --git a/composer.json b/composer.json index b56c64f..007f115 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "5.9.191", + "version": "5.9.192", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/tcpdf.php b/tcpdf.php index f8562ac..246bf83 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.189 + * @version 5.9.192 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -151,7 +151,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.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.189 + * @version 5.9.192 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -162,7 +162,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.189'; + private $tcpdf_version = '5.9.192'; // Protected properties @@ -4382,10 +4382,11 @@ class TCPDF { ); $this->write1DBarcode($barcode, 'C128', '', $cur_y + $line_width, '', (($this->footer_margin / 3) - $line_width), 0.3, $style, ''); } + $w_page = isset($this->l['w_page']) ? $this->l['w_page'].' ' : ''; if (empty($this->pagegroups)) { - $pagenumtxt = $this->l['w_page'].' '.$this->getAliasNumPage().' / '.$this->getAliasNbPages(); + $pagenumtxt = $w_page.$this->getAliasNumPage().' / '.$this->getAliasNbPages(); } else { - $pagenumtxt = $this->l['w_page'].' '.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias(); + $pagenumtxt = $w_page.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias(); } $this->SetY($cur_y); //Print page number @@ -9548,6 +9549,9 @@ class TCPDF { $annots .= ' /Ff 49152'; } $annots .= ' /T '.$this->_datastring($pl['txt'], $radio_button_obj_id); + if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) { + $annots .= ' /TU '.$this->_datastring($pl['opt']['tu'], $radio_button_obj_id); + } $annots .= ' /FT /Btn'; $annots .= ' /Kids ['; $defval = ''; @@ -29489,7 +29493,15 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $img = str_replace(K_PATH_URL, K_PATH_MAIN, $img); } } - $this->Image($img, $x, $y, $w, $h); + // get image type + $imgtype = $this->getImageFileType($img); + if (($imgtype == 'eps') OR ($imgtype == 'ai')) { + $this->ImageEps($img, $x, $y, $w, $h); + } elseif ($imgtype == 'svg') { + $this->ImageSVG($img, $x, $y, $w, $h); + } else { + $this->Image($img, $x, $y, $w, $h); + } $this->StopTransform(); } break;