joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-29 07:33:54 +00:00
Code Issues Releases Activity

6.0.043 (2013-10-29)

Browse Source 
- Bug #854 "CSS instruction display" was fixed.
This commit is contained in:
nicolaasuni 2013-10-29 18:26:55 +00:00
parent 8510efc6cf
commit 7745dbfdf1
5 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.TXT
View File

@ -1,3 +1,6 @@
6.0.043 (2013-10-29)
- Bug #854 "CSS instruction display" was fixed.
6.0.042 (2013-10-25) 6.0.042 (2013-10-25)
- Bug #852 "CMYK Colors Bug" was fixed. - Bug #852 "CMYK Colors Bug" was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.042 Version: 6.0.043
Release date: 2013-10-25 Release date: 2013-10-29
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2013: Copyright (c) 2002-2013:

2
composer.json
View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.042", "version": "6.0.043",
"homepage": "http://www.tcpdf.org/", "homepage": "http://www.tcpdf.org/",
"type": "library", "type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.", "description": "TCPDF is a PHP class for generating PDF documents.",

2
include/tcpdf_static.php
View File

@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version. * Current TCPDF version.
* @private static * @private static
*/ */
private static $tcpdf_version = '6.0.042'; private static $tcpdf_version = '6.0.043';
/** /**
* String alias for total number of pages. * String alias for total number of pages.

40
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.042 // Version : 6.0.043
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2013-10-25 // Last Update : 2013-10-29
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - 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)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -104,7 +104,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.042 * @version 6.0.043
*/ */
// TCPDF configuration // 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.<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.042 * @version 6.0.043
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -6804,7 +6804,7 @@ class TCPDF {
if (isset($imgdata) AND ($imgdata !== FALSE) AND (strpos($file, '__tcpdf_img') === FALSE)) { if (isset($imgdata) AND ($imgdata !== FALSE) AND (strpos($file, '__tcpdf_img') === FALSE)) {
// copy image to cache // copy image to cache
$original_file = $file; $original_file = $file;
$file = TCPDF_STATIC::getObjFilename('img'); //DEBUG $file = TCPDF_STATIC::getObjFilename('img');
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
fclose($fp); fclose($fp);
@ -17065,28 +17065,22 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$dom = $this->getHtmlDomArray($html); $dom = $this->getHtmlDomArray($html);
$maxel = count($dom); $maxel = count($dom);
$key = 0; $key = 0;
$hidden_node_key = -1;
while ($key < $maxel) { while ($key < $maxel) {
if ($dom[$key]['tag']) { if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND $dom[$key]['hide']) {
if ($dom[$key]['opening']) { // store the node key
if (($hidden_node_key <= 0) AND $dom[$key]['hide']) { $hidden_node_key = $key;
// store the node key if ($dom[$key]['self']) {
$hidden_node_key = $key; // 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)) { ++$key;
// we have reached the closing tag of the hidden node
$hidden_node_key = 0;
} }
} }
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'])) { if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
// check for pagebreak // check for pagebreak
if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) { if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {