32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-25 13:57:33 +00:00

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
This commit is contained in:
nicolaasuni 2014-01-15 18:02:49 +00:00
parent 9c04ada91f
commit 31866c4b5b
4 changed files with 26 additions and 13 deletions

View File

@ -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) 6.0.054 (2014-01-13)
- Bug #877 "Parenteses causing corrupt text" was fixed. - Bug #877 "Parenteses causing corrupt text" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.054 Version: 6.0.055
Release date: 2014-01-13 Release date: 2014-01-15
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2014: Copyright (c) 2002-2014:

View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.054", "version": "6.0.055",
"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.",

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.054 // Version : 6.0.055
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2014-01-13 // Last Update : 2014-01-15
// 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.054 * @version 6.0.055
*/ */
// 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.054 * @version 6.0.055
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -3635,8 +3635,16 @@ class TCPDF {
$this->x += $this->cell_padding['L']; $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 // print table header
$this->writeHTML($this->thead, false, false, false, false, ''); $this->writeHTML($this->thead, false, false, false, false, '');
$this->setGraphicVars($gvars);
// set new top margin to skip the table headers // set new top margin to skip the table headers
if (!isset($this->theadMargins['top'])) { if (!isset($this->theadMargins['top'])) {
$this->theadMargins['top'] = $this->tMargin; $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). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate 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). * The new current point shall be (x3, y3).
* @param $x2 (float) Abscissa of control point 2. * @param $x2 (float) Abscissa of control point 2.
* @param $y2 (float) Ordinate 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). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate 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')) { if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) {
$dom[$key]['fontname'] = $this->default_monospaced_font; $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 // headings h1, h2, h3, h4, h5, h6
if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) { if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) {
$headsize = (4 - intval($dom[$key]['value']{1})) * 2; $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['rmargin'] = $this->rMargin;
$this->theadMargins['page'] = $this->page; $this->theadMargins['page'] = $this->page;
$this->theadMargins['cell'] = $cell; $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; break;
} }
case 'Q': { // quadratic B\E9zier curveto case 'Q': { // quadratic Bezier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if ((($ck + 1) % 4) == 0) { if ((($ck + 1) % 4) == 0) {
@ -23432,7 +23441,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
break; break;
} }
case 'T': { // shorthand/smooth quadratic B\E9zier curveto case 'T': { // shorthand/smooth quadratic Bezier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if (($ck % 2) != 0) { if (($ck % 2) != 0) {