32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-22 12:55:10 +00:00

6.0.086 (2014-06-20)

- Bug item #938 "Hyphenation-dash extends outside of cell" was fixed (collateral effect).
This commit is contained in:
nicolaasuni 2014-06-20 16:28:34 +01:00
parent 905f0af8af
commit b1c0cc74a8
5 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,6 @@
6.0.086 (2014-06-20)
- Bug item #938 "Hyphenation-dash extends outside of cell" was fixed (collateral effect).
6.0.085 (2014-06-19) 6.0.085 (2014-06-19)
- Some example images were replaced. - Some example images were replaced.
- A race condition bug was fixed. - A race condition bug was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.085 Version: 6.0.086
Release date: 2014-06-19 Release date: 2014-06-20
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2014: Copyright (c) 2002-2014:

View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.085", "version": "6.0.086",
"homepage": "http://www.tcpdf.org/", "homepage": "http://www.tcpdf.org/",
"type": "library", "type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.", "description": "TCPDF is a PHP class for generating PDF documents.",

View File

@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version. * Current TCPDF version.
* @private static * @private static
*/ */
private static $tcpdf_version = '6.0.085'; private static $tcpdf_version = '6.0.086';
/** /**
* String alias for total number of pages. * String alias for total number of pages.

View File

@ -6365,6 +6365,7 @@ class TCPDF {
$sep = -1; // position of the last blank space $sep = -1; // position of the last blank space
$prevsep = $sep; // previous separator $prevsep = $sep; // previous separator
$shy = false; // true if the last blank is a soft hypen (SHY) $shy = false; // true if the last blank is a soft hypen (SHY)
$prevshy = $shy; // previous shy mode
$l = 0; // current string length $l = 0; // current string length
$nl = 0; //number of lines $nl = 0; //number of lines
$linebreak = false; $linebreak = false;
@ -6459,6 +6460,7 @@ class TCPDF {
$sep = $i; $sep = $i;
// check if is a SHY // check if is a SHY
if (($c == 173) OR ($c == 45)) { if (($c == 173) OR ($c == 45)) {
$prevshy = $shy;
$shy = true; $shy = true;
if ($pc == 45) { if ($pc == 45) {
$tmp_shy_replacement_width = 0; $tmp_shy_replacement_width = 0;
@ -6482,6 +6484,7 @@ class TCPDF {
if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) >= $wmax))) { if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) >= $wmax))) {
if (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) { if (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) {
$sep = $prevsep; $sep = $prevsep;
$shy = $prevshy;
} }
// we have reached the end of column // we have reached the end of column
if ($sep == -1) { if ($sep == -1) {