arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fix a TCPDF bug causing misaligned table headers on a page break

Browse Source
This commit is contained in:
dave 2010-06-08 18:49:17 +00:00
parent b0842d28ee
commit 6ab3522970
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tcpdf/tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.3.002 // Version : 5.3.003
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-06-07 // Last Update : 2010-06-08
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - 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)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -126,7 +126,7 @@
* @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://www.tcpdf.org * @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL * @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 5.3.002 * @version 5.3.003
*/ */
/** /**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 5.3.002 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 5.3.003 (http://www.tcpdf.org)');
/** /**
* This is a PHP class for generating PDF documents without requiring external extensions.<br> * This is a PHP class for generating PDF documents without requiring external extensions.<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> * 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>
* @name TCPDF * @name TCPDF
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @version 5.3.002 * @version 5.3.003
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org * @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL * @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -2459,7 +2459,7 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function SetLeftMargin($margin) { public function SetLeftMargin($margin) {
//Set left margin //Set left margin
$this->lMargin=$margin; $this->lMargin = $margin;
if (($this->page > 0) AND ($this->x < $margin)) { if (($this->page > 0) AND ($this->x < $margin)) {
$this->x = $margin; $this->x = $margin;
} }
@ -2474,7 +2474,7 @@ if (!class_exists('TCPDF', false)) {
*/ */
public function SetTopMargin($margin) { public function SetTopMargin($margin) {
//Set top margin //Set top margin
$this->tMargin=$margin; $this->tMargin = $margin;
if (($this->page > 0) AND ($this->y < $margin)) { if (($this->page > 0) AND ($this->y < $margin)) {
$this->y = $margin; $this->y = $margin;
} }
@ -2488,7 +2488,7 @@ if (!class_exists('TCPDF', false)) {
* @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins() * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
*/ */
public function SetRightMargin($margin) { public function SetRightMargin($margin) {
$this->rMargin=$margin; $this->rMargin = $margin;
if (($this->page > 0) AND ($this->x > ($this->w - $margin))) { if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
$this->x = $this->w - $margin; $this->x = $this->w - $margin;
} }
@ -3255,8 +3255,8 @@ if (!class_exists('TCPDF', false)) {
// set margins // set margins
$prev_lMargin = $this->lMargin; $prev_lMargin = $this->lMargin;
$prev_rMargin = $this->rMargin; $prev_rMargin = $this->rMargin;
$this->lMargin = $this->pagedim[$this->page]['olm']; $this->lMargin = $this->theadMargins['lmargin'] + ($this->pagedim[$this->page]['olm'] - $this->pagedim[($this->page - 1)]['olm']);
$this->rMargin = $this->pagedim[$this->page]['orm']; $this->rMargin = $this->theadMargins['rmargin'] + ($this->pagedim[$this->page]['orm'] - $this->pagedim[($this->page - 1)]['orm']);
$this->cMargin = $this->theadMargins['cmargin']; $this->cMargin = $this->theadMargins['cmargin'];
if ($this->rtl) { if ($this->rtl) {
$this->x = $this->w - $this->rMargin; $this->x = $this->w - $this->rMargin;
@ -17137,12 +17137,6 @@ if (!class_exists('TCPDF', false)) {
$this->y -= $yshift; $this->y -= $yshift;
} }
} }
if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
$this->Ln($this->lasth);
if ($this->y < $maxbottomliney) {
$this->y = $maxbottomliney;
}
}
// restore previous values // restore previous values
$this->setGraphicVars($gvars); $this->setGraphicVars($gvars);
if ($this->page > $prevPage) { if ($this->page > $prevPage) {
@ -17155,6 +17149,12 @@ if (!class_exists('TCPDF', false)) {
$this->listordered = $prev_listordered; $this->listordered = $prev_listordered;
$this->listcount = $prev_listcount; $this->listcount = $prev_listcount;
$this->lispacer = $prev_lispacer; $this->lispacer = $prev_lispacer;
if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
$this->Ln($this->lasth);
if ($this->y < $maxbottomliney) {
$this->y = $maxbottomliney;
}
}
unset($dom); unset($dom);
} }
@ -17216,6 +17216,8 @@ if (!class_exists('TCPDF', false)) {
if (!isset($this->theadMargins) OR (empty($this->theadMargins))) { if (!isset($this->theadMargins) OR (empty($this->theadMargins))) {
$this->theadMargins = array(); $this->theadMargins = array();
$this->theadMargins['cmargin'] = $this->cMargin; $this->theadMargins['cmargin'] = $this->cMargin;
$this->theadMargins['lmargin'] = $this->lMargin;
$this->theadMargins['rmargin'] = $this->rMargin;
} }
} }
} }
@ -19670,7 +19672,7 @@ if (!class_exists('TCPDF', false)) {
// print HTML table header (if any) // print HTML table header (if any)
if (!$this->empty_string($this->thead) AND (!$this->inthead)) { if (!$this->empty_string($this->thead) AND (!$this->inthead)) {
// print table header // print table header
$this->writeHTML($this->thead, false, false, false, false, ''); $this->writeHTML($this->thead, false, false, false, false, '');
} }
} }