From 8a2cba22926242b6ec9433781b8878d301ae1e0e Mon Sep 17 00:00:00 2001
From: Damjan Cvetko <damjan.cvetko@gmail.com>
Date: Sun, 4 Mar 2018 17:13:06 +0100
Subject: [PATCH] Support multiple elements (w:t, w:delText, w:tab) in w:r.

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 18 +++++++++++-------
 tests/PhpWord/Reader/Word2007/ElementTest.php |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 70d3d960..c69f636a 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -241,14 +241,18 @@ abstract class AbstractPart
             if ($xmlReader->elementExists('w:br', $domNode)) {
                 $parent->addTextBreak();
             }
-            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode)) {
+            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode) || $xmlReader->elementExists('w:delText', $domNode)) {
                 // TextRun
-                if ($xmlReader->elementExists('w:tab', $domNode)) {
-                    $textContent = "\t";
-                } elseif ($domNode->parentNode->nodeName == 'w:del') {
-                    $textContent = $xmlReader->getValue('w:delText', $domNode);
-                } else {
-                    $textContent = $xmlReader->getValue('w:t', $domNode);
+                $textContent = '';
+                $nodes = $xmlReader->getElements('w:t|w:delText|w:tab', $domNode);
+                foreach ($nodes as $node) {
+                    if ($node->nodeName == 'w:t') {
+                        $textContent .= $node->nodeValue;
+                    } elseif ($node->nodeName == 'w:delText') {
+                        $textContent .= $node->nodeValue;
+                    } elseif ($node->nodeName == 'w:tab') {
+                        $textContent .= "\t";
+                    }
                 }
                 /** @var AbstractElement $element */
                 $element = $parent->addText($textContent, $fontStyle, $paragraphStyle);
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 6804b172..aad4a543 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -91,7 +91,9 @@ class ElementTest extends AbstractTestReader
     {
         $documentXml = '<w:p>
             <w:r>
+                <w:t>One</w:t>
                 <w:tab/>
+                <w:t>Two</w:t>
             </w:r>
         </w:p>';
 
@@ -99,6 +101,6 @@ class ElementTest extends AbstractTestReader
 
         $elements = $this->get($phpWord->getSections(), 0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
-        $this->assertEquals("\t", $elements[0]->getText());
+        $this->assertEquals("One\tTwo", $elements[0]->getText());
     }
 }