From 8af8d3b460cebd6caacbb93388a10e5ad5fc5d7b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Mon, 3 Aug 2015 19:50:34 +0100
Subject: [PATCH] Fix to HTML generation with charts that fall outside of the
 main data area, and fix to show trailing `/` in folders for the jpgraph in
 examples

---
 Examples/36chartreadwriteHTML.php  | 2 +-
 Examples/36chartreadwritePDF.php   | 2 +-
 src/PhpSpreadsheet/Writer/HTML.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/36chartreadwriteHTML.php b/Examples/36chartreadwriteHTML.php
index 3ee8242d..7fc26fde 100644
--- a/Examples/36chartreadwriteHTML.php
+++ b/Examples/36chartreadwriteHTML.php
@@ -46,7 +46,7 @@ include 'PHPExcel/IOFactory.php';
 //	Change these values to select the Rendering library that you wish to use
 //		and its directory location on your server
 $rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH;
-$rendererLibrary = 'jpgraph3.5.0b1/src';
+$rendererLibrary = 'jpgraph3.5.0b1/src/';
 $rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary;
 
 
diff --git a/Examples/36chartreadwritePDF.php b/Examples/36chartreadwritePDF.php
index 0a428a2b..24d1c857 100644
--- a/Examples/36chartreadwritePDF.php
+++ b/Examples/36chartreadwritePDF.php
@@ -69,7 +69,7 @@ if (!PHPExcel_Settings::setPdfRenderer(
 //	Change these values to select the Rendering library that you wish to use
 //		for Chart images, and its directory location on your server
 $rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH;
-$rendererLibrary = 'jpgraph3.5.0b1/src';
+$rendererLibrary = 'jpgraph3.5.0b1/src/';
 $rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary;
 
 
diff --git a/src/PhpSpreadsheet/Writer/HTML.php b/src/PhpSpreadsheet/Writer/HTML.php
index 677031f4..2a4ac2ab 100644
--- a/src/PhpSpreadsheet/Writer/HTML.php
+++ b/src/PhpSpreadsheet/Writer/HTML.php
@@ -579,7 +579,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
         }
         $html = '';
         $colMax++;
-        while ($row < $rowMax) {
+        while ($row <= $rowMax) {
             $html .= '<tr>';
             for ($col = 'A'; $col != $colMax; ++$col) {
                 $html .= '<td>';