From 304173c4d78b65685e2e91654beccd573fe8b4ee Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 8 Feb 2018 07:02:28 +0100
Subject: [PATCH] fix nested list

---
 src/PhpWord/Element/AbstractElement.php | 13 +++++++++++++
 src/PhpWord/Shared/Html.php             |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 63892b74..52279645 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -93,6 +93,13 @@ abstract class AbstractElement
      */
     private $nestedLevel = 0;
 
+    /**
+     * A reference to the parent
+     *
+     * @var \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    private $parent;
+
     /**
      * Parent container type
      *
@@ -321,6 +328,11 @@ abstract class AbstractElement
         $this->commentRangeEnd->setEndElement($this);
     }
 
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
     /**
      * Set parent container
      *
@@ -331,6 +343,7 @@ abstract class AbstractElement
     public function setParentContainer(AbstractElement $container)
     {
         $this->parentContainer = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
+        $this->parent = $container;
 
         // Set nested level
         $this->nestedLevel = $container->getNestedLevel();
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index a3ea0cc0..971776ff 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -366,7 +366,7 @@ class Html
      */
     private static function shouldAddTextRun(\DOMNode $node)
     {
-        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./li', $node)->length > 0;
+        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol', $node)->length > 0;
         if ($containsBlockElement) {
             return false;
         }
@@ -402,7 +402,7 @@ class Html
      */
     private static function parseList($node, $element, &$styles, &$data)
     {
-        $isOrderedList = $node->nodeName == 'ol';
+        $isOrderedList = $node->nodeName === 'ol';
         if (isset($data['listdepth'])) {
             $data['listdepth']++;
         } else {
@@ -410,6 +410,9 @@ class Html
             $styles['list'] = 'listStyle_' . self::$listIndex++;
             $element->getPhpWord()->addNumberingStyle($styles['list'], self::getListStyle($isOrderedList));
         }
+        if ($node->parentNode->nodeName === 'li') {
+            return $element->getParent();
+        }
     }
 
     private static function getListStyle($isOrderedList)