mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-26 06:17:33 +00:00
5.0.007
This commit is contained in:
nicolaasuni
parent
72cc22e6d7
commit
5c22d6a76d
@ -1,3 +1,7 @@
|
||||
5.0.007 (2010-05-14)
|
||||
- Bug #3001347 "Bug when using WriteHTML with setEqualColumns()" was fixed.
|
||||
- Bug #3001505 "problem with sup and sub tags at the beginning of a line" was fixed.
|
||||
|
||||
5.0.006 (2010-05-13)
|
||||
- Length of hr tag was fixed.
|
||||
- An error on 2d barcode method was fixed.
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 5.0.006
|
||||
Release date: 2010-05-13
|
||||
Version: 5.0.007
|
||||
Release date: 2010-05-14
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2001-2010:
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -5548,7 +5548,7 @@ $frame)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -296,7 +296,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1374,7 +1374,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -539,7 +539,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -94,7 +94,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -477,7 +477,7 @@ string $string, [int $split_length = 1])</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -79,7 +79,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>version:</b> </td><td>5.0.006</td>
|
||||
<td><b>version:</b> </td><td>5.0.007</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>copyright:</b> </td><td>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</td>
|
||||
@ -110,7 +110,7 @@ unicode data<br /><br /></div>
|
||||
<div class="tags">
|
||||
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
|
||||
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
|
||||
<code>PDF_PRODUCER = 'TCPDF 5.0.006 (http://www.tcpdf.org)'</code>
|
||||
<code>PDF_PRODUCER = 'TCPDF 5.0.007 (http://www.tcpdf.org)'</code>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
|
||||
@ -121,7 +121,7 @@ unicode data<br /><br /></div>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:31 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:24 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -243,7 +243,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1946,7 +1946,7 @@
|
||||
<a href="elementindex.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1975,7 +1975,7 @@
|
||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -37,14 +37,14 @@
|
||||
<a name="tcpdf.php"></a>
|
||||
<h1>tcpdf.php</h1>
|
||||
<h2>Warnings:</h2><br>
|
||||
<b>Warning on line 18053</b> - Unknown tag "@parma" used<br>
|
||||
<b>Warning on line 18062</b> - Unknown tag "@parma" used<br>
|
||||
<a name="2dbarcodes.php"></a>
|
||||
<h1>2dbarcodes.php</h1>
|
||||
<h2>Errors:</h2><br>
|
||||
<b>Error on line 79</b> - Text cannot be outside of li tag in a DocBlock list, parsing will be incorrect<br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:27 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 13 May 2010 17:40:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
Documentation generated on Fri, 14 May 2010 12:43:23 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
29
tcpdf.php
29
tcpdf.php
@ -2,9 +2,9 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2010-05-13
|
||||
// Last Update : 2010-05-14
|
||||
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
|
||||
// Version : 5.0.006
|
||||
// Version : 5.0.007
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l.
|
||||
@ -122,7 +122,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
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
* @version 5.0.006
|
||||
* @version 5.0.007
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) {
|
||||
/**
|
||||
* define default PDF document producer
|
||||
*/
|
||||
define('PDF_PRODUCER', 'TCPDF 5.0.006 (http://www.tcpdf.org)');
|
||||
define('PDF_PRODUCER', 'TCPDF 5.0.007 (http://www.tcpdf.org)');
|
||||
|
||||
/**
|
||||
* 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>
|
||||
* @name TCPDF
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 5.0.006
|
||||
* @version 5.0.007
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
@ -4904,7 +4904,6 @@ if (!class_exists('TCPDF', false)) {
|
||||
$shy = false;
|
||||
// account for margin changes
|
||||
if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
|
||||
// AcceptPageBreak() may be overriden on extended classed to include margin changes
|
||||
$this->AcceptPageBreak();
|
||||
}
|
||||
$w = $this->getRemainingWidth();
|
||||
@ -5046,7 +5045,6 @@ if (!class_exists('TCPDF', false)) {
|
||||
}
|
||||
// account for margin changes
|
||||
if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
|
||||
// AcceptPageBreak() may be overriden on extended classed to include margin changes
|
||||
$this->AcceptPageBreak();
|
||||
}
|
||||
$w = $this->getRemainingWidth();
|
||||
@ -15334,12 +15332,19 @@ if (!class_exists('TCPDF', false)) {
|
||||
$this->y -= $yshift;
|
||||
}
|
||||
}
|
||||
$this->newline = false;
|
||||
$pre_y = $this->y;
|
||||
$pbrk = $this->checkPageBreak($this->lasth);
|
||||
$this->newline = false;
|
||||
$startlinex = $this->x;
|
||||
$startliney = $this->y;
|
||||
if ($dom[$dom[$key]['parent']]['value'] == 'sup') {
|
||||
$startliney -= ((0.3 * $this->FontSizePt) / $this->k);
|
||||
} elseif ($dom[$dom[$key]['parent']]['value'] == 'sub') {
|
||||
$startliney -= (($this->FontSizePt / 0.7) / $this->k);
|
||||
} else {
|
||||
$minstartliney = $startliney;
|
||||
$maxbottomliney = ($this->y + (($fontsize * $this->cell_height_ratio) / $this->k));
|
||||
}
|
||||
$startlinepage = $this->page;
|
||||
if (isset($endlinepos) AND (!$pbrk)) {
|
||||
$startlinepos = $endlinepos;
|
||||
@ -15646,7 +15651,6 @@ if (!class_exists('TCPDF', false)) {
|
||||
$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0);
|
||||
}
|
||||
$this->textindent = 0;
|
||||
|
||||
if (strlen($strrest) > 0) {
|
||||
// store the remaining string on the previous $key position
|
||||
$this->newline = true;
|
||||
@ -16999,6 +17003,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
$retval = ($value * $refsize);
|
||||
break;
|
||||
}
|
||||
// height of lower case 'x' (about half the font-size)
|
||||
case 'ex': {
|
||||
$retval = $value * ($refsize / 2);
|
||||
break;
|
||||
@ -17008,23 +17013,27 @@ if (!class_exists('TCPDF', false)) {
|
||||
$retval = ($value * $this->dpi) / $k;
|
||||
break;
|
||||
}
|
||||
// centimeters
|
||||
case 'cm': {
|
||||
$retval = ($value / 2.54 * $this->dpi) / $k;
|
||||
break;
|
||||
}
|
||||
// millimeters
|
||||
case 'mm': {
|
||||
$retval = ($value / 25.4 * $this->dpi) / $k;
|
||||
break;
|
||||
}
|
||||
case 'pc': {
|
||||
// one pica is 12 points
|
||||
case 'pc': {
|
||||
$retval = ($value * 12) / $k;
|
||||
break;
|
||||
}
|
||||
// points
|
||||
case 'pt': {
|
||||
$retval = $value / $k;
|
||||
break;
|
||||
}
|
||||
// pixels
|
||||
case 'px': {
|
||||
$retval = $this->pixelsToUnits($value);
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user