30
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-06-01 05:40:47 +00:00

6.0.081 (2014-05-22)

- Bug item #922 "writehtml tables thead repeating" was fixed.
- Patch #71 "External and internal links, local and remote" wa applied.
This commit is contained in:
nicolaasuni 2014-05-22 21:06:24 +01:00
parent fcd0098a2a
commit e885862b73
5 changed files with 29 additions and 10 deletions

View File

@ -1,3 +1,7 @@
6.0.081 (2014-05-22)
- Bug item #922 "writehtml tables thead repeating" was fixed.
- Patch #71 "External and internal links, local and remote" wa applied.
6.0.080 (2014-05-20) 6.0.080 (2014-05-20)
- Bug item #921 "Fatal error in hyphenateText() function" was fixed. - Bug item #921 "Fatal error in hyphenateText() function" was fixed.
- Bug item #923 "Automatic Hyphenation error" was fixed. - Bug item #923 "Automatic Hyphenation error" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.080 Version: 6.0.081
Release date: 2014-05-20 Release date: 2014-05-22
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.080", "version": "6.0.081",
"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

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

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.080 // Version : 6.0.081
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2014-05-20 // Last Update : 2014-05-22
// 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.080 * @version 6.0.081
*/ */
// 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.080 * @version 6.0.081
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -8401,8 +8401,20 @@ class TCPDF {
$jsa = 'var D=event.target.doc;var MyData=D.dataObjects;for (var i in MyData) if (MyData[i].path=="'.$filename.'") D.exportDataObject( { cName : MyData[i].name, nLaunch : 2});'; $jsa = 'var D=event.target.doc;var MyData=D.dataObjects;for (var i in MyData) if (MyData[i].path=="'.$filename.'") D.exportDataObject( { cName : MyData[i].name, nLaunch : 2});';
$annots .= ' /A << /S /JavaScript /JS '.$this->_textstring($jsa, $annot_obj_id).'>>'; $annots .= ' /A << /S /JavaScript /JS '.$this->_textstring($jsa, $annot_obj_id).'>>';
} else { } else {
// external URI link $parsedUrl = parse_url($pl['txt']);
$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt']), $annot_obj_id).'>>'; if (empty($parsedUrl['scheme']) AND (strtolower(substr($parsedUrl['path'], -4)) == '.pdf')) {
// relative link to a PDF file
$dest = '[0 /Fit]'; // default page 0
if (!empty($parsedUrl['fragment'])) {
// check for named destination
$tmp = explode('=', $parsedUrl['fragment']);
$dest = '('.((count($tmp) == 2) ? $tmp[1] : $tmp[0]).')';
}
$annots .= ' /A <</S /GoToR /D '.$dest.' /F '.$this->_datastring($this->unhtmlentities($parsedUrl['path']), $annot_obj_id).' /NewWindow true>>';
} else {
// external URI link
$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt']), $annot_obj_id).'>>';
}
} }
} elseif (isset($this->links[$pl['txt']])) { } elseif (isset($this->links[$pl['txt']])) {
// internal link ID // internal link ID
@ -18443,6 +18455,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
foreach ($this_method_vars as $vkey => $vval) { foreach ($this_method_vars as $vkey => $vval) {
$$vkey = $vval; $$vkey = $vval;
} }
if (!empty($dom[$key]['thead'])) {
$this->inthead = true;
}
// add a page (or trig AcceptPageBreak() for multicolumn mode) // add a page (or trig AcceptPageBreak() for multicolumn mode)
$pre_y = $this->y; $pre_y = $this->y;
if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) { if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {