From 5057617de74a11f49e93e4c1f1300c8efe8f7678 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 29 Dec 2018 14:56:11 +0100
Subject: [PATCH] change regex instead of checking twice

---
 src/PhpWord/TemplateProcessor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index fe342bcc..d230cdf9 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -612,8 +612,7 @@ class TemplateProcessor
                 // If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row.
                 $tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd);
                 if (!preg_match('#<w:vMerge/>#', $tmpXmlRow) &&
-                    !preg_match('#<w:vMerge w:val="continue" />#', $tmpXmlRow) &&
-                    !preg_match('#<w:vMerge w:val="continue"/>#', $tmpXmlRow)) {
+                    !preg_match('#<w:vMerge w:val="continue"\s*/>#', $tmpXmlRow)) {
                     break;
                 }
                 // This row was a spanned row, update $rowEnd and search for the next row.