From b1c0cc74a84948029d8c9824736d9021871a63a7 Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Fri, 20 Jun 2014 16:28:34 +0100
Subject: [PATCH] 6.0.086 (2014-06-20) - Bug item #938 "Hyphenation-dash
 extends outside of cell" was fixed (collateral effect).

---
 CHANGELOG.TXT            | 3 +++
 README.TXT               | 4 ++--
 composer.json            | 2 +-
 include/tcpdf_static.php | 2 +-
 tcpdf.php                | 3 +++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a2dce13..8f05074 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -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)
 	- Some example images were replaced.
 	- A race condition bug was fixed.
diff --git a/README.TXT b/README.TXT
index 109e2b4..8c80c14 100644
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.0.085
-Release date: 2014-06-19
+Version: 6.0.086
+Release date: 2014-06-20
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index ab7ea23..2c70404 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.085",
+	"version": "6.0.086",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents.",
diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
index 1a6d297..0552a05 100644
--- a/include/tcpdf_static.php
+++ b/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.0.085';
+	private static $tcpdf_version = '6.0.086';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index bac88c5..17c5422 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -6365,6 +6365,7 @@ class TCPDF {
 		$sep = -1; // position of the last blank space
 		$prevsep = $sep; // previous separator
 		$shy = false; // true if the last blank is a soft hypen (SHY)
+		$prevshy = $shy; // previous shy mode
 		$l = 0; // current string length
 		$nl = 0; //number of lines
 		$linebreak = false;
@@ -6459,6 +6460,7 @@ class TCPDF {
 					$sep = $i;
 					// check if is a SHY
 					if (($c == 173) OR ($c == 45)) {
+						$prevshy = $shy;
 						$shy = true;
 						if ($pc == 45) {
 							$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 (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) {
 						$sep = $prevsep;
+						$shy = $prevshy;
 					}
 					// we have reached the end of column
 					if ($sep == -1) {