From 979432f754965bc13960776df51cb28eabfc0938 Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Wed, 16 Jul 2014 18:59:23 +0100
Subject: [PATCH] 6.0.089 (2014-07-16) - Bug item #948 "bottom line of rowspan
 cell not work correctly" was fixed.

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

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index bf85447..8511182 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.0.089 (2014-07-16)
+	- Bug item #948 "bottom line of rowspan cell not work correctly" was fixed.
+
 6.0.088 (2014-07-09)
 	- Bug item #946 "Case sensitive type check causes broken match for SVG" was fixed.
 	- Bug item #945 "Imagick load doesn't account for passed data string " was fixed.
diff --git a/README.TXT b/README.TXT
index 42c76a2..fd73686 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.088
-Release date: 2014-07-09
+Version: 6.0.089
+Release date: 2014-07-16
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index d9b24d5..b6bab5e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.088",
+	"version": "6.0.089",
 	"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 a36bbc8..4fe0bdd 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.088';
+	private static $tcpdf_version = '6.0.089';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 1ab95ac..34ff299 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.0.088
+// Version     : 6.0.089
 // Begin       : 2002-08-03
-// Last Update : 2014-07-09
+// Last Update : 2014-07-16
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.0.088
+ * @version 6.0.089
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.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>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.0.088
+ * @version 6.0.089
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
@@ -1291,14 +1291,14 @@ class TCPDF {
 	/**
 	 * Boolean flag to enable document timestamping with TSA.
 	 * @protected
-	 * @since 6.0.088 (2014-06-19)
+	 * @since 6.0.089 (2014-06-19)
 	 */
 	protected $tsa_timestamp = false;
 
 	/**
 	 * Timestamping data.
 	 * @protected
-	 * @since 6.0.088 (2014-06-19)
+	 * @since 6.0.089 (2014-06-19)
 	 */
 	protected $tsa_data = array();
 
@@ -13631,7 +13631,7 @@ class TCPDF {
 	 * @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL)
 	 * @public
 	 * @author Richard Stockinger
-	 * @since 6.0.088 (2014-06-16)
+	 * @since 6.0.089 (2014-06-16)
 	 */
 	public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') {
 		$this->tsa_data = array();
@@ -13659,7 +13659,7 @@ class TCPDF {
 	 * @return (string) Timestamped digital signature
 	 * @protected
 	 * @author Richard Stockinger
-	 * @since 6.0.088 (2014-06-16)
+	 * @since 6.0.089 (2014-06-16)
 	 */
 	protected function applyTSA($signature) {
 		if (!$this->tsa_timestamp) {
@@ -19580,7 +19580,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 						// update row-spanned cells
 						if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
 							foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-								if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] > 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
+								if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
 									$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
 									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
 								}