diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 0b477f2..85404ff 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.043 (2013-10-29) + - Bug #854 "CSS instruction display" was fixed. + 6.0.042 (2013-10-25) - Bug #852 "CMYK Colors Bug" was fixed. diff --git a/README.TXT b/README.TXT index 5112b8b..d7b9f59 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.042 -Release date: 2013-10-25 +Version: 6.0.043 +Release date: 2013-10-29 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index 06d71bc..916313c 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.042", + "version": "6.0.043", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php index b24a9fd..ab7dc38 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.042'; + private static $tcpdf_version = '6.0.043'; /** * String alias for total number of pages. diff --git a/tcpdf.php b/tcpdf.php index d8790c6..983d70c 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.042 + * @version 6.0.043 */ // TCPDF configuration @@ -128,7 +128,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.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 6.0.042 + * @version 6.0.043 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -6804,7 +6804,7 @@ class TCPDF { if (isset($imgdata) AND ($imgdata !== FALSE) AND (strpos($file, '__tcpdf_img') === FALSE)) { // copy image to cache $original_file = $file; - $file = TCPDF_STATIC::getObjFilename('img'); //DEBUG + $file = TCPDF_STATIC::getObjFilename('img'); $fp = fopen($file, 'w'); fwrite($fp, $imgdata); fclose($fp); @@ -17065,28 +17065,22 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $dom = $this->getHtmlDomArray($html); $maxel = count($dom); $key = 0; - $hidden_node_key = -1; while ($key < $maxel) { - if ($dom[$key]['tag']) { - if ($dom[$key]['opening']) { - if (($hidden_node_key <= 0) AND $dom[$key]['hide']) { - // store the node key - $hidden_node_key = $key; + if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND $dom[$key]['hide']) { + // store the node key + $hidden_node_key = $key; + if ($dom[$key]['self']) { + // skip just this self-closing tag + ++$key; + } else { + // skip this and all children tags + while (($key < $maxel) AND (!$dom[$key]['tag'] OR $dom[$key]['opening'] OR ($dom[$key]['parent'] != $hidden_node_key))) { + // skip hidden objects + ++$key; } - } elseif (($hidden_node_key > 0) AND ($dom[$key]['parent'] == $hidden_node_key)) { - // we have reached the closing tag of the hidden node - $hidden_node_key = 0; + ++$key; } } - if ($hidden_node_key >= 0) { - // skip this node - ++$key; - if ($hidden_node_key == 0) { - // reset hidden mode - $hidden_node_key = -1; - } - continue; - } if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) { // check for pagebreak if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {