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

5.9.175 (2012-07-25)

- The problem of missing letter on hyphen break was fixed.
This commit is contained in:
nick 2012-07-25 18:50:52 +01:00
parent df9b495d27
commit 2f282db233
5 changed files with 21 additions and 18 deletions

View File

@ -1,3 +1,6 @@
5.9.175 (2012-07-25)
- The problem of missing letter on hyphen break was fixed.
5.9.174 (2012-07-25) 5.9.174 (2012-07-25)
- The problem of wrong filename when downloading PDF from an Android device was fixed. - The problem of wrong filename when downloading PDF from an Android device was fixed.
- The method setHeaderData() was extended to set text and line color for header (see example n. 1). - The method setHeaderData() was extended to set text and line color for header (see example n. 1).

View File

@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.174 Version: 5.9.175
Release date: 2012-07-25 Release date: 2012-07-25
Author: Nicola Asuni Author: Nicola Asuni

View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : rus.php // File name : rus.php
// Begin : 2004-03-03 // Begin : 2004-03-03
// Last Update : 2010-10-26 // Last Update : 2012-07-25
// //
// Description : Language module for TCPDF // Description : Language module for TCPDF
// (contains translated texts) // (contains translated texts)
@ -40,7 +40,7 @@ $l['a_meta_dir'] = 'ltr';
$l['a_meta_language'] = 'ru'; $l['a_meta_language'] = 'ru';
// TRANSLATIONS -------------------------------------- // TRANSLATIONS --------------------------------------
$l['w_page'] = 'страницы'; $l['w_page'] = 'страница';
//============================================================+ //============================================================+
// END OF FILE // END OF FILE

View File

@ -2,7 +2,7 @@
//============================================================+ //============================================================+
// File name : ukr.php // File name : ukr.php
// Begin : 2004-03-03 // Begin : 2004-03-03
// Last Update : 2010-10-26 // Last Update : 2012-07-25
// //
// Description : Language module for TCPDF // Description : Language module for TCPDF
// (contains translated texts) // (contains translated texts)
@ -40,7 +40,7 @@ $l['a_meta_dir'] = 'ltr';
$l['a_meta_language'] = 'ua'; $l['a_meta_language'] = 'ua';
// TRANSLATIONS -------------------------------------- // TRANSLATIONS --------------------------------------
$l['w_page'] = 'страница'; $l['w_page'] = 'сторінка';
//============================================================+ //============================================================+
// END OF FILE // END OF FILE

View File

@ -1,7 +1,7 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.174 // Version : 5.9.175
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2012-07-25 // Last Update : 2012-07-25
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
@ -138,7 +138,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 5.9.174 * @version 5.9.175
*/ */
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@ -150,7 +150,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.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 5.9.174 * @version 5.9.175
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -161,7 +161,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.174'; private $tcpdf_version = '5.9.175';
// Protected properties // Protected properties
@ -7344,8 +7344,8 @@ class TCPDF {
// \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.
if (($c != 160) if (($c != 160)
AND (($c == 173) AND (($c == 173)
OR preg_match($this->re_spaces, $this->unichr($c)) OR preg_match($this->re_spaces, $this->unichr($c))
OR (($c == 45) OR (($c == 45)
AND ($i < ($nb - 1)) AND ($i < ($nb - 1))
@ -7356,11 +7356,8 @@ class TCPDF {
) { ) {
// update last blank space position // update last blank space position
$sep = $i; $sep = $i;
if ($c == 45) {
++$sep;
}
// check if is a SHY // check if is a SHY
if ($c == 173) { if (($c == 173) OR ($c == 45)) {
$shy = true; $shy = true;
if ($pc == 45) { if ($pc == 45) {
$tmp_shy_replacement_width = 0; $tmp_shy_replacement_width = 0;
@ -7449,9 +7446,9 @@ class TCPDF {
$linew = $this->GetArrStringWidth($tmparr); $linew = $this->GetArrStringWidth($tmparr);
unset($tmparr); unset($tmparr);
if ($this->rtl) { if ($this->rtl) {
$this->endlinex = $startx - $linew; $this->endlinex = ($startx - $linew);
} else { } else {
$this->endlinex = $startx + $linew; $this->endlinex = ($startx + $linew);
} }
$w = $linew; $w = $linew;
$tmpcellpadding = $this->cell_padding; $tmpcellpadding = $this->cell_padding;
@ -7514,6 +7511,9 @@ class TCPDF {
$this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch); $this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch);
unset($tmpstr); unset($tmpstr);
if ($firstline) { if ($firstline) {
if ($chars[$sep] == 45) {
$endspace += 1;
}
// return the remaining text // return the remaining text
$this->cell_padding = $tmpcellpadding; $this->cell_padding = $tmpcellpadding;
return ($this->UniArrSubString($uchars, ($sep + $endspace))); return ($this->UniArrSubString($uchars, ($sep + $endspace)));
@ -7521,7 +7521,7 @@ class TCPDF {
$i = $sep; $i = $sep;
$sep = -1; $sep = -1;
$shy = false; $shy = false;
$j = ($i+1); $j = ($i + 1);
} }
} }
// account for margin changes // account for margin changes