joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-29 15:43:53 +00:00
Code Issues Releases Activity

4.8.014

Browse Source
This commit is contained in:
nicolaasuni 2009-11-04 09:57:52 +01:00
parent 9d1aafa9d4
commit a49d4abb6c
16 changed files with 410 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,3 +1,7 @@
4.8.014 (2009-11-04)
- Bug item #2891316 "writeHTML, underlining replacing spaces" was fixed.
- The handling of temporary RTL text direction mode was fixed.
4.8.013 (2009-10-26) 4.8.013 (2009-10-26)
- Bug item #2884729 "Problem with word-wrap and hyphen" was fixed. - Bug item #2884729 "Problem with word-wrap and hyphen" was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 4.8.013 Version: 4.8.014
Release date: 2009-10-26 Release date: 2009-11-04
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2001-2009: Copyright (c) 2001-2009:

2
doc/classtrees_com-tecnick-tcpdf.html
View File

@ -45,7 +45,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

647
doc/com-tecnick-tcpdf/TCPDF.html
View File

File diff suppressed because it is too large Load Diff

2
doc/com-tecnick-tcpdf/TCPDFBarcode.html
View File

@ -1368,7 +1368,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_barcodes.php.html
View File

@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
View File

@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_htmlcolors.php.html
View File

@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

6
doc/com-tecnick-tcpdf/_tcpdf.php.html
View File

@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td> <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr> </tr>
<tr> <tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.013</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>4.8.014</td>
</tr> </tr>
<tr> <tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2009 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> <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2009 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>
@ -104,7 +104,7 @@ unicode data<br /><br /></div>
<div class="tags"> <div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border"> <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"> <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 4.8.013 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 4.8.014 (http://www.tcpdf.org)'</code>
</td></tr></table> </td></tr></table>
</td></tr></table> </td></tr></table>
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/com-tecnick-tcpdf/_unicode_data.php.html
View File

@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

4
doc/elementindex.html
View File

@ -577,6 +577,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodIncludeJS">TCPDF::IncludeJS()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodIncludeJS">TCPDF::IncludeJS()</a></dd>
<dt><b>intToRoman</b></dt> <dt><b>intToRoman</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodintToRoman">TCPDF::intToRoman()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the Roman representation of an integer number</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodintToRoman">TCPDF::intToRoman()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the Roman representation of an integer number</dd>
<dt><b>isRTLTextDir</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodisRTLTextDir">TCPDF::isRTLTextDir()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the current temporary RTL status</dd>
</dl> </dl>
</div> </div>
<a href="elementindex.html#top">top</a><br> <a href="elementindex.html#top">top</a><br>
@ -1444,7 +1446,7 @@
<a href="elementindex.html#top">top</a><br> <a href="elementindex.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

4
doc/elementindex_com-tecnick-tcpdf.html
View File

@ -736,6 +736,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodIncludeJS">TCPDF::IncludeJS()</a></dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodIncludeJS">TCPDF::IncludeJS()</a></dd>
<dt><b>intToRoman</b></dt> <dt><b>intToRoman</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodintToRoman">TCPDF::intToRoman()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the Roman representation of an integer number</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodintToRoman">TCPDF::intToRoman()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the Roman representation of an integer number</dd>
<dt><b>isRTLTextDir</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodisRTLTextDir">TCPDF::isRTLTextDir()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the current temporary RTL status</dd>
</dl> </dl>
</div> </div>
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br> <a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
@ -1467,7 +1469,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br> <a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/errors.html
View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br> <a href="#Post-parsing">Post-parsing</a><br>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/index.html
View File

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

2
doc/li_com-tecnick-tcpdf.html
View File

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br /> This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

64
tcpdf.php
View File

@ -2,9 +2,9 @@
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2009-10-26 // Last Update : 2009-11-04
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.8.013 // Version : 4.8.014
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
@ -128,7 +128,7 @@
* @copyright 2002-2009 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-2009 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 4.8.013 * @version 4.8.014
*/ */
/** /**
@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 4.8.013 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 4.8.014 (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 4.8.013 * @version 4.8.014
* @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
@ -1835,13 +1835,41 @@ if (!class_exists('TCPDF', false)) {
* @since 2.1.000 (2008-01-09) * @since 2.1.000 (2008-01-09)
*/ */
public function setTempRTL($mode) { public function setTempRTL($mode) {
$newmode = false;
switch ($mode) { switch ($mode) {
case false: case 'ltr':
case 'L': case 'LTR':
case 'L': {
if ($this->rtl) {
$newmode = 'L';
}
break;
}
case 'rtl':
case 'RTL':
case 'R': { case 'R': {
$this->tmprtl = $mode; if (!$this->rtl) {
$newmode = 'R';
}
break;
}
case false:
default: {
$newmode = false;
break;
} }
} }
$this->tmprtl = $newmode;
}
/**
* Return the current temporary RTL status
* @return boolean
* @access public
* @since 4.8.014 (2009-11-04)
*/
public function isRTLTextDir() {
return ($this->rtl OR ($this->tmprtl == 'R'));
} }
/** /**
@ -4224,7 +4252,7 @@ if (!class_exists('TCPDF', false)) {
$arabic = false; $arabic = false;
} }
// check if string contains RTL text // check if string contains RTL text
if ($arabic OR $this->tmprtl OR preg_match(K_RE_PATTERN_RTL, $txt)) { if ($arabic OR ($this->tmprtl == 'R') OR preg_match(K_RE_PATTERN_RTL, $txt)) {
$rtlmode = true; $rtlmode = true;
} else { } else {
$rtlmode = false; $rtlmode = false;
@ -13351,7 +13379,7 @@ if (!class_exists('TCPDF', false)) {
$t_x = -$mdiff; $t_x = -$mdiff;
} elseif (($plalign == 'J') AND ($plalign == $lalign)) { } elseif (($plalign == 'J') AND ($plalign == $lalign)) {
// Justification // Justification
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$t_x = $this->lMargin - $this->endlinex; $t_x = $this->lMargin - $this->endlinex;
} }
$no = 0; $no = 0;
@ -13368,7 +13396,7 @@ if (!class_exists('TCPDF', false)) {
$lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]); $lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]);
$lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]); $lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]);
if ($kk == $maxkk) { if ($kk == $maxkk) {
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$tvalue = ltrim($lnstring[1][$kk]); $tvalue = ltrim($lnstring[1][$kk]);
} else { } else {
$tvalue = rtrim($lnstring[1][$kk]); $tvalue = rtrim($lnstring[1][$kk]);
@ -13380,7 +13408,7 @@ if (!class_exists('TCPDF', false)) {
$no += substr_count($lnstring[1][$kk], chr(32)); $no += substr_count($lnstring[1][$kk], chr(32));
$ns += substr_count($tvalue, chr(32)); $ns += substr_count($tvalue, chr(32));
} }
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$t_x = $this->lMargin - $this->endlinex - (($no - $ns - 1) * $this->GetStringWidth(chr(32))); $t_x = $this->lMargin - $this->endlinex - (($no - $ns - 1) * $this->GetStringWidth(chr(32)));
} }
// calculate additional space to add to each space // calculate additional space to add to each space
@ -13408,7 +13436,7 @@ if (!class_exists('TCPDF', false)) {
} }
continue; continue;
} }
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$spacew = ($spacewidth * ($nsmax - $ns)); $spacew = ($spacewidth * ($nsmax - $ns));
} else { } else {
$spacew = ($spacewidth * $ns); $spacew = ($spacewidth * $ns);
@ -13441,7 +13469,7 @@ if (!class_exists('TCPDF', false)) {
$currentxpos = $xmatches[1]; $currentxpos = $xmatches[1];
if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) { if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) {
if ($strcount == $maxkk) { if ($strcount == $maxkk) {
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$tvalue = $lnstring[1][$strcount]; $tvalue = $lnstring[1][$strcount];
} else { } else {
$tvalue = rtrim($lnstring[1][$strcount]); $tvalue = rtrim($lnstring[1][$strcount]);
@ -13452,7 +13480,7 @@ if (!class_exists('TCPDF', false)) {
$ns += substr_count($tvalue, chr(32)); $ns += substr_count($tvalue, chr(32));
++$strcount; ++$strcount;
} }
if ($this->rtl OR $this->tmprtl) { if ($this->isRTLTextDir()) {
$spacew = ($spacewidth * ($nsmax - $ns)); $spacew = ($spacewidth * ($nsmax - $ns));
} }
// justify block // justify block
@ -13798,7 +13826,7 @@ if (!class_exists('TCPDF', false)) {
} }
// text // text
$this->htmlvspace = 0; $this->htmlvspace = 0;
if ((!$this->premode) AND ($this->rtl OR $this->tmprtl)) { if ((!$this->premode) AND $this->isRTLTextDir()) {
// reverse spaces order // reverse spaces order
$len1 = strlen($dom[$key]['value']); $len1 = strlen($dom[$key]['value']);
$lsp = $len1 - strlen(ltrim($dom[$key]['value'])); $lsp = $len1 - strlen(ltrim($dom[$key]['value']));
@ -13815,7 +13843,7 @@ if (!class_exists('TCPDF', false)) {
} }
if ($newline) { if ($newline) {
if (!$this->premode) { if (!$this->premode) {
if (($this->rtl OR $this->tmprtl)) { if ($this->isRTLTextDir()) {
$dom[$key]['value'] = rtrim($dom[$key]['value']); $dom[$key]['value'] = rtrim($dom[$key]['value']);
} else { } else {
$dom[$key]['value'] = ltrim($dom[$key]['value']); $dom[$key]['value'] = ltrim($dom[$key]['value']);
@ -13984,7 +14012,7 @@ if (!class_exists('TCPDF', false)) {
$firstorlast = ($key == 1); $firstorlast = ($key == 1);
// check for text direction attribute // check for text direction attribute
if (isset($tag['attribute']['dir'])) { if (isset($tag['attribute']['dir'])) {
$this->tmprtl = $tag['attribute']['dir'] == 'rtl' ? 'R' : 'L'; $this->setTempRTL($tag['attribute']['dir']);
} else { } else {
$this->tmprtl = false; $this->tmprtl = false;
} }