From 31866c4b5b40a4f0bc5ac75606f1b77eb820dc7d Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Wed, 15 Jan 2014 18:02:49 +0000 Subject: [PATCH] 6.0.055 (2014-01-15) - Bug #880 "Error detecting hX tags (h1,h2..)" was fixed - Bug #879 "Thead on the second page inherits style of previous tr" was fixed --- CHANGELOG.TXT | 4 ++++ README.TXT | 4 ++-- composer.json | 2 +- tcpdf.php | 29 +++++++++++++++++++---------- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 0ab197f..15e7b9c 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +6.0.055 (2014-01-15) + - Bug #880 "Error detecting hX tags (h1,h2..)" was fixed + - Bug #879 "Thead on the second page inherits style of previous tr" was fixed + 6.0.054 (2014-01-13) - Bug #877 "Parenteses causing corrupt text" was fixed. diff --git a/README.TXT b/README.TXT index 985d294..bf19f80 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.054 -Release date: 2014-01-13 +Version: 6.0.055 +Release date: 2014-01-15 Author: Nicola Asuni Copyright (c) 2002-2014: diff --git a/composer.json b/composer.json index d993856..35ca2b7 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.054", + "version": "6.0.055", "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 531a210..8f89bc2 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.054 + * @version 6.0.055 */ // 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.054 + * @version 6.0.055 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -3635,8 +3635,16 @@ class TCPDF { $this->x += $this->cell_padding['L']; } } + $gvars = $this->getGraphicVars(); + if (!empty($this->theadMargins['gvars'])) { + // set the correct graphic style + $this->setGraphicVars($this->theadMargins['gvars']); // DEBUG + $this->rMargin = $gvars['rMargin']; + $this->lMargin = $gvars['lMargin']; + } // print table header $this->writeHTML($this->thead, false, false, false, false, ''); + $this->setGraphicVars($gvars); // set new top margin to skip the table headers if (!isset($this->theadMargins['top'])) { $this->theadMargins['top'] = $this->tMargin; @@ -11429,7 +11437,7 @@ class TCPDF { } /** - * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B\E9zier control points. + * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bezier control points. * The new current point shall be (x3, y3). * @param $x1 (float) Abscissa of control point 1. * @param $y1 (float) Ordinate of control point 1. @@ -11447,7 +11455,7 @@ class TCPDF { } /** - * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B\E9zier control points. + * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bezier control points. * The new current point shall be (x3, y3). * @param $x2 (float) Abscissa of control point 2. * @param $y2 (float) Ordinate of control point 2. @@ -11463,7 +11471,7 @@ class TCPDF { } /** - * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B\E9zier control points. + * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bezier control points. * The new current point shall be (x3, y3). * @param $x1 (float) Abscissa of control point 1. * @param $y1 (float) Ordinate of control point 1. @@ -16833,7 +16841,7 @@ class TCPDF { if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) { $dom[$key]['fontname'] = $this->default_monospaced_font; } - if (($dom[$key]['value']{0} == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) { + if (!empty($dom[$key]['value']) AND ($dom[$key]['value']{0} == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) { // headings h1, h2, h3, h4, h5, h6 if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) { $headsize = (4 - intval($dom[$key]['value']{1})) * 2; @@ -18616,6 +18624,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $this->theadMargins['rmargin'] = $this->rMargin; $this->theadMargins['page'] = $this->page; $this->theadMargins['cell'] = $cell; + $this->theadMargins['gvars'] = $this->getGraphicVars(); } } } @@ -23406,7 +23415,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: } break; } - case 'Q': { // quadratic B\E9zier curveto + case 'Q': { // quadratic Bezier curveto foreach ($params as $ck => $cp) { $params[$ck] = $cp; if ((($ck + 1) % 4) == 0) { @@ -23432,7 +23441,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: } break; } - case 'T': { // shorthand/smooth quadratic B\E9zier curveto + case 'T': { // shorthand/smooth quadratic Bezier curveto foreach ($params as $ck => $cp) { $params[$ck] = $cp; if (($ck % 2) != 0) {