32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-29 23:53:54 +00:00
This commit is contained in:
nicolaasuni 2010-07-09 10:25:25 +02:00
parent 80bce01c76
commit 8e06f2f701
22 changed files with 595 additions and 483 deletions

View File

@ -1,3 +1,8 @@
5.5.011 (2010-07-09)
- Support for multiple CSS classes was added.
- The method getColumn() was added to return the current column number.
- Some regular Expressions were fixed to be more compatible with UTF-8.
5.5.010 (2010-07-06) 5.5.010 (2010-07-06)
- Bug item #3025772 "Borders in all image functions are still flawed" was fixed. - Bug item #3025772 "Borders in all image functions are still flawed" was fixed.

View File

@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.5.010 Version: 5.5.011
Release date: 2010-07-06 Release date: 2010-07-09
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2010: Copyright (c) 2002-2010:

View File

@ -60,7 +60,7 @@
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -1003,7 +1003,7 @@ $code)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -5551,7 +5551,7 @@ $frame)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

File diff suppressed because it is too large Load Diff

View File

@ -299,7 +299,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -1377,7 +1377,7 @@ $type)</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -105,7 +105,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 Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:20 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -82,7 +82,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>5.5.010</td> <td><b>version:</b>&nbsp;&nbsp;</td><td>5.5.011</td>
</tr> </tr>
<tr> <tr>
<td><b>copyright:</b>&nbsp;&nbsp;</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> <td><b>copyright:</b>&nbsp;&nbsp;</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>
@ -113,7 +113,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 5.5.010 (http://www.tcpdf.org)'</code> <code>PDF_PRODUCER = 'TCPDF 5.5.011 (http://www.tcpdf.org)'</code>
</td></tr></table> </td></tr></table>
</td></tr></table> </td></tr></table>
@ -124,7 +124,7 @@ unicode data<br /><br /></div>
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:30 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:16 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
<div class="credit"> <div class="credit">
<hr /> <hr />
Documentation generated on Tue, 06 Jul 2010 16:18:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:20 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -585,6 +585,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetCharWidth">TCPDF::GetCharWidth()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the length of the char in user unit for the current font.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetCharWidth">TCPDF::GetCharWidth()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the length of the char in user unit for the current font.</dd>
<dt><b>getCode</b></dt> <dt><b>getCode</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetCode">QRcode::getCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return Reed-Solomon block code.</dd> <dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetCode">QRcode::getCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return Reed-Solomon block code.</dd>
<dt><b>getColumn</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetColumn">TCPDF::getColumn()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the current column number</dd>
<dt><b>getCompaction</b></dt> <dt><b>getCompaction</b></dt>
<dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#methodgetCompaction">PDF417::getCompaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Compact data by mode.</dd> <dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#methodgetCompaction">PDF417::getCompaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Compact data by mode.</dd>
<dt><b>getDataLength</b></dt> <dt><b>getDataLength</b></dt>
@ -1303,6 +1305,8 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$radio_groups">TCPDF::$radio_groups</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of radio group objects IDs</dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$radio_groups">TCPDF::$radio_groups</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of radio group objects IDs</dd>
<dt><b>$rasterize_vector_images</b></dt> <dt><b>$rasterize_vector_images</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$rasterize_vector_images">TCPDF::$rasterize_vector_images</a></dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$rasterize_vector_images">TCPDF::$rasterize_vector_images</a></dd>
<dt><b>$re_space</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_space">TCPDF::$re_space</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Array of parts $re_spaces</dd>
<dt><b>$re_spaces</b></dt> <dt><b>$re_spaces</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_spaces">TCPDF::$re_spaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Regular expression used to find blank characters used for word-wrapping.</dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_spaces">TCPDF::$re_spaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Regular expression used to find blank characters used for word-wrapping.</dd>
<dt><b>$rMargin</b></dt> <dt><b>$rMargin</b></dt>
@ -2030,7 +2034,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 Tue, 06 Jul 2010 16:18:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -783,6 +783,8 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetCharWidth">TCPDF::GetCharWidth()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the length of the char in user unit for the current font.</dd> <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetCharWidth">TCPDF::GetCharWidth()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the length of the char in user unit for the current font.</dd>
<dt><b>getCode</b></dt> <dt><b>getCode</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetCode">QRcode::getCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return Reed-Solomon block code.</dd> <dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetCode">QRcode::getCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return Reed-Solomon block code.</dd>
<dt><b>getColumn</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetColumn">TCPDF::getColumn()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the current column number</dd>
<dt><b>getCompaction</b></dt> <dt><b>getCompaction</b></dt>
<dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#methodgetCompaction">PDF417::getCompaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Compact data by mode.</dd> <dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#methodgetCompaction">PDF417::getCompaction()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Compact data by mode.</dd>
<dt><b>getDataLength</b></dt> <dt><b>getDataLength</b></dt>
@ -1501,6 +1503,8 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$radio_groups">TCPDF::$radio_groups</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of radio group objects IDs</dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$radio_groups">TCPDF::$radio_groups</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of radio group objects IDs</dd>
<dt><b>$rasterize_vector_images</b></dt> <dt><b>$rasterize_vector_images</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$rasterize_vector_images">TCPDF::$rasterize_vector_images</a></dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$rasterize_vector_images">TCPDF::$rasterize_vector_images</a></dd>
<dt><b>$re_space</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_space">TCPDF::$re_space</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Array of parts $re_spaces</dd>
<dt><b>$re_spaces</b></dt> <dt><b>$re_spaces</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_spaces">TCPDF::$re_spaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Regular expression used to find blank characters used for word-wrapping.</dd> <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$re_spaces">TCPDF::$re_spaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Regular expression used to find blank characters used for word-wrapping.</dd>
<dt><b>$rMargin</b></dt> <dt><b>$rMargin</b></dt>
@ -2062,7 +2066,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 Tue, 06 Jul 2010 16:18:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

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 Tue, 06 Jul 2010 16:18:34 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:20 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -67,7 +67,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 Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -67,7 +67,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 Tue, 06 Jul 2010 16:18:29 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a> Documentation generated on Fri, 09 Jul 2010 10:25:14 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div> </div>
</td></tr></table> </td></tr></table>
</td> </td>

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.5.010 // Version : 5.5.011
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2010-07-06 // Last Update : 2010-07-09
// 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.5.010 * @version 5.5.011
*/ */
/** /**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/** /**
* define default PDF document producer * define default PDF document producer
*/ */
define('PDF_PRODUCER', 'TCPDF 5.5.010 (http://www.tcpdf.org)'); define('PDF_PRODUCER', 'TCPDF 5.5.011 (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.5.010 * @version 5.5.011
* @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
@ -1312,6 +1312,13 @@ if (!class_exists('TCPDF', false)) {
*/ */
protected $re_spaces = '/[\s]/'; protected $re_spaces = '/[\s]/';
/**
* Array of parts $re_spaces
* @access protected
* @since 5.5.011 (2010-07-09)
*/
protected $re_space = array('p' => '[\s]', 'm' => '');
/** /**
* Signature object ID * Signature object ID
* @access protected * @access protected
@ -1846,11 +1853,11 @@ if (!class_exists('TCPDF', false)) {
// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator. // \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} 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. // \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}]/u'; //$this->setSpacesRE('/[\s\p{Z}\p{Lo}]/u');
$this->re_spaces = '/[\s\p{Z}]/u'; $this->setSpacesRE('/[\s\p{Z}]/u');
} else { } else {
// PCRE unicode support is turned OFF // PCRE unicode support is turned OFF
$this->re_spaces = '/[\s]/'; $this->setSpacesRE('/[\s]/');
} }
$this->annot_obj_id = $this->annots_start_obj_id; $this->annot_obj_id = $this->annots_start_obj_id;
$this->curr_annot_obj_id = $this->annots_start_obj_id; $this->curr_annot_obj_id = $this->annots_start_obj_id;
@ -2852,16 +2859,33 @@ if (!class_exists('TCPDF', false)) {
/** /**
* Set regular expression to detect withespaces or word separators. * Set regular expression to detect withespaces or word separators.
* The pattern delimiter must be the forward-slash character '/'.
* <pre>
* 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.
* </pre>
* @param string $re regular expression (leave empty for default). * @param string $re regular expression (leave empty for default).
* @access public * @access public
* @since 4.6.016 (2009-06-15) * @since 4.6.016 (2009-06-15)
*/ */
public function setSpacesRE($re='/[\s]/') { 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; $this->re_spaces = $re;
$re_parts = explode('/', $re);
// get pattern parts
$this->re_space = array();
if (isset($re_parts[1]) AND !empty($re_parts[1])) {
$this->re_space['p'] = $re_parts[1];
} else {
$this->re_space['p'] = '[\s]';
}
// set pattern modifiers
if (isset($re_parts[2]) AND !empty($re_parts[2])) {
$this->re_space['m'] = $re_parts[2];
} else {
$this->re_space['m'] = '';
}
} }
/** /**
@ -16242,9 +16266,9 @@ if (!class_exists('TCPDF', false)) {
protected function isValidCSSSelectorForTag($dom, $key, $selector) { protected function isValidCSSSelectorForTag($dom, $key, $selector) {
$valid = false; // value to be returned $valid = false; // value to be returned
$tag = $dom[$key]['value']; $tag = $dom[$key]['value'];
$class = ''; $class = array();
if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) { if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) {
$class = strtolower($dom[$key]['attribute']['class']); $class = explode(' ', strtolower($dom[$key]['attribute']['class']));
} }
$id = ''; $id = '';
if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) { if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) {
@ -16265,7 +16289,7 @@ if (!class_exists('TCPDF', false)) {
// check if matches class, id, attribute, pseudo-class or pseudo-element // check if matches class, id, attribute, pseudo-class or pseudo-element
switch ($attrib{0}) { switch ($attrib{0}) {
case '.': { // class case '.': { // class
if (substr($attrib, 1) == $class) { if (in_array(substr($attrib, 1), $class)) {
$valid = true; $valid = true;
} }
break; break;
@ -16501,8 +16525,8 @@ if (!class_exists('TCPDF', false)) {
$html = $html_a.$html_b.substr($html, $pos + 11); $html = $html_a.$html_b.substr($html, $pos + 11);
$offset = strlen($html_a.$html_b); $offset = strlen($html_a.$html_b);
} }
$html = preg_replace("'([\s]*)<option'si", "<option", $html); $html = preg_replace('/([\s]*)<option/si', '<option', $html);
$html = preg_replace("'</option>([\s]*)'si", "</option>", $html); $html = preg_replace('/<\/option>([\s]*)/si', '</option>', $html);
$offset = 0; $offset = 0;
while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) { while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) {
$html_a = substr($html, 0, $offset); $html_a = substr($html, 0, $offset);
@ -16520,19 +16544,21 @@ if (!class_exists('TCPDF', false)) {
// restore textarea newlines // restore textarea newlines
$html = str_replace('<TBR>', "\n", $html); $html = str_replace('<TBR>', "\n", $html);
// remove extra spaces from code // remove extra spaces from code
$html = preg_replace('/[\s]+<\/(table|tr|td|th|ul|ol|li|dl|dt|dd)>/', '</\\1>', $html); $html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $html);
$html = preg_replace('/[\s]+<(tr|td|th|ul|ol|li|dl|dt|dd|br)/', '<\\1', $html); $html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $html);
$html = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $html);
$html = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $html);
$html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html); $html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
$html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html); $html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
$html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html); $html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
$html = preg_replace('/[\s]*<img/', ' <img', $html); $html = preg_replace('/'.$this->re_space['p'].'*<img/'.$this->re_space['m'], ' <img', $html);
$html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html); $html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html);
$html = preg_replace('/<xre/', '<pre', $html); // restore pre tag $html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
$html = preg_replace('/<textarea([^\>]*)>/xi', '<textarea\\1 value="', $html); $html = preg_replace('/<textarea([^\>]*)>/xi', '<textarea\\1 value="', $html);
$html = preg_replace('/<\/textarea>/', '" />', $html); $html = preg_replace('/<\/textarea>/', '" />', $html);
// trim string // trim string
$html = preg_replace('/^[\s]+/', '', $html); $html = preg_replace('/^'.$this->re_space['p'].'+/'.$this->re_space['m'], '', $html);
$html = preg_replace('/[\s]+$/', '', $html); $html = preg_replace('/'.$this->re_space['p'].'+$/'.$this->re_space['m'], '', $html);
// pattern for generic tag // pattern for generic tag
$tagpattern = '/(<[^>]+>)/'; $tagpattern = '/(<[^>]+>)/';
// explodes the string // explodes the string
@ -20807,6 +20833,16 @@ if (!class_exists('TCPDF', false)) {
} }
} }
/**
* Return the current column number
* @return int current column number
* @access public
* @since 5.5.011 (2010-07-08)
*/
public function getColumn() {
return $this->current_column;
}
/** /**
* Serialize an array of parameters to be used with TCPDF tag in HTML code. * Serialize an array of parameters to be used with TCPDF tag in HTML code.
* @param array $pararray parameters array * @param array $pararray parameters array