mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-26 06:17:33 +00:00
4.6.016
This commit is contained in:
nicolaasuni
parent
abc541f269
commit
36a6bac445
@ -1,3 +1,7 @@
|
||||
4.6.016 (2009-06-16)
|
||||
- Method setSpacesRE() was added to set the regular expression for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/');
|
||||
- The method _putinfo() now automatically fills the metadata with '?' in case of empty string.
|
||||
|
||||
4.6.015 (2009-06-11)
|
||||
- Bug #2804667 "word wrap bug" was fixed.
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 4.6.015
|
||||
Release date: 2009-06-11
|
||||
Version: 4.6.016
|
||||
Release date: 2009-06-15
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2001-2009:
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1368,7 +1368,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:08 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -73,7 +73,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>4.6.015</td>
|
||||
<td><b>version:</b> </td><td>4.6.016</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>copyright:</b> </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">
|
||||
<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 4.6.015 (http://www.tcpdf.org)'</code>
|
||||
<code>PDF_PRODUCER = 'TCPDF 4.6.016 (http://www.tcpdf.org)'</code>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
|
||||
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1023,6 +1023,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetRTL">TCPDF::setRTL()</a><br> Enable or disable Right-To-Left language mode</dd>
|
||||
<dt><b>setSignature</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetSignature">TCPDF::setSignature()</a></dd>
|
||||
<dt><b>setSpacesRE</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetSpacesRE">TCPDF::setSpacesRE()</a><br> Set regular expression to detect withespaces or word separators.</dd>
|
||||
<dt><b>SetSubject</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetSubject">TCPDF::SetSubject()</a><br> Defines the subject of the document.</dd>
|
||||
<dt><b>setTableHeader</b></dt>
|
||||
@ -1364,7 +1366,7 @@
|
||||
<a href="elementindex.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -1174,6 +1174,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetRTL">TCPDF::setRTL()</a><br> Enable or disable Right-To-Left language mode</dd>
|
||||
<dt><b>setSignature</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetSignature">TCPDF::setSignature()</a></dd>
|
||||
<dt><b>setSpacesRE</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodsetSpacesRE">TCPDF::setSpacesRE()</a><br> Set regular expression to detect withespaces or word separators.</dd>
|
||||
<dt><b>SetSubject</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetSubject">TCPDF::SetSubject()</a><br> Defines the subject of the document.</dd>
|
||||
<dt><b>setTableHeader</b></dt>
|
||||
@ -1387,7 +1389,7 @@
|
||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<a href="#Post-parsing">Post-parsing</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:18 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
56
tcpdf.php
56
tcpdf.php
@ -2,9 +2,9 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2009-06-11
|
||||
// Last Update : 2009-06-15
|
||||
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
|
||||
// Version : 4.6.015
|
||||
// Version : 4.6.016
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
|
||||
@ -126,7 +126,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
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
* @version 4.6.015
|
||||
* @version 4.6.016
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
|
||||
/**
|
||||
* define default PDF document producer
|
||||
*/
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.015 (http://www.tcpdf.org)');
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.016 (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 4.6.015
|
||||
* @version 4.6.016
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
@ -1292,7 +1292,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
* @access protected
|
||||
* @since 4.6.006 (2009-04-28)
|
||||
*/
|
||||
protected $re_spaces = '/[\s\p{Z}\p{Lo}]/';
|
||||
protected $re_spaces = '/[\s]/';
|
||||
|
||||
//------------------------------------------------------------
|
||||
// METHODS
|
||||
@ -1419,7 +1419,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
|
||||
// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
|
||||
// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
|
||||
$this->re_spaces = '/[\s\p{Z}\p{Lo}]/';
|
||||
//$this->re_spaces = '/[\s\p{Z}\p{Lo}]/';
|
||||
$this->re_spaces = '/[\s\p{Z}]/';
|
||||
} else {
|
||||
// PCRE unicode support is turned OFF
|
||||
$this->re_spaces = '/[\s]/';
|
||||
@ -1596,6 +1597,20 @@ if (!class_exists('TCPDF', false)) {
|
||||
$this->pagedim[$this->page] = array('w' => $this->wPt, 'h' => $this->hPt, 'wk' => $this->w, 'hk' => $this->h, 'tm' => $this->tMargin, 'bm' => $bottommargin, 'lm' => $this->lMargin, 'rm' => $this->rMargin, 'pb' => $autopagebreak, 'or' => $this->CurOrientation, 'olm' => $this->original_lMargin, 'orm' => $this->original_rMargin);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set regular expression to detect withespaces or word separators.
|
||||
* @param string $re regular expression (leave empty for default).
|
||||
* @access public
|
||||
* @since 4.6.016 (2009-06-15)
|
||||
*/
|
||||
public function setSpacesRE($re='/[\s]/') {
|
||||
// if PCRE unicode support is turned ON:
|
||||
// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
|
||||
// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
|
||||
// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
|
||||
$this->re_spaces = $re;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable or disable Right-To-Left language mode
|
||||
* @param Boolean $enable if true enable Right-To-Left language mode.
|
||||
@ -6195,23 +6210,30 @@ if (!class_exists('TCPDF', false)) {
|
||||
* @access protected
|
||||
*/
|
||||
protected function _putinfo() {
|
||||
if (!$this->empty_string($this->title)) {
|
||||
$this->_out('/Title '.$this->_textstring($this->title));
|
||||
if ($this->empty_string($this->title)) {
|
||||
$this->title = '?';
|
||||
}
|
||||
if (!$this->empty_string($this->author)) {
|
||||
$this->_out('/Author '.$this->_textstring($this->author));
|
||||
$this->_out('/Title '.$this->_textstring($this->title));
|
||||
if ($this->empty_string($this->author)) {
|
||||
$this->author = '?';
|
||||
}
|
||||
if (!$this->empty_string($this->subject)) {
|
||||
$this->_out('/Subject '.$this->_textstring($this->subject));
|
||||
$this->_out('/Author '.$this->_textstring($this->author));
|
||||
if ($this->empty_string($this->subject)) {
|
||||
$this->subject = '?';
|
||||
}
|
||||
if (!$this->empty_string($this->keywords)) {
|
||||
$this->_out('/Keywords '.$this->_textstring($this->keywords));
|
||||
$this->_out('/Subject '.$this->_textstring($this->subject));
|
||||
if ($this->empty_string($this->keywords)) {
|
||||
$this->keywords = '?';
|
||||
}
|
||||
if (!$this->empty_string($this->creator)) {
|
||||
$this->_out('/Creator '.$this->_textstring($this->creator));
|
||||
$this->_out('/Keywords '.$this->_textstring($this->keywords));
|
||||
if ($this->empty_string($this->creator)) {
|
||||
$this->creator = '?';
|
||||
}
|
||||
$this->_out('/Creator '.$this->_textstring($this->creator));
|
||||
if (defined('PDF_PRODUCER')) {
|
||||
$this->_out('/Producer '.$this->_textstring(PDF_PRODUCER));
|
||||
} else {
|
||||
$this->_out('/Producer '.$this->_textstring('TCPDF'));
|
||||
}
|
||||
$this->_out('/CreationDate '.$this->_datastring('D:'.date('YmdHis')));
|
||||
$this->_out('/ModDate '.$this->_datastring('D:'.date('YmdHis')));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user