Fixed problem with matching opening and closing tags in HTML code inc…

…luding nested span tags.
lpaulsen93 · Apr 1, 2017 · 52ba770 · 52ba770
1 parent d8d36a8
commit 52ba770
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ODT/ODTSpan.php b/ODT/ODTSpan.php
@@ -175,6 +175,7 @@ public static function generateSpansfromHTMLCode(ODTInternalParams $params, $HTM
                         $entry ['tag-orig'] = $tagged;
                     }
                 }
+                $entry ['matched'] = false;
                 $parsed [] = $entry;
 
                 $pos = $found [1]+1;
@@ -192,18 +193,21 @@ public static function generateSpansfromHTMLCode(ODTInternalParams $params, $HTM
             if ($checked [$out] !== NULL) {
                 continue;
             }
-            $found = $parsed [$out];
+            $found = &$parsed [$out];
             if ($found ['content'] !== NULL) {
                 $checked [$out] = $params->document->replaceXMLEntities($found ['content']);
             } else if ($found ['tag-open'] !== NULL) {
                 $closed = false;
 
                 for ($in = $out+1 ; $in < count($parsed) ; $in++) {
-                    $search = $parsed [$in];
+                    $search = &$parsed [$in];
                     if ($search ['tag-close'] !== NULL &&
                         $found ['tag-open'] == $search ['tag-close'] &&
+                        $search ['matched'] === false &&
                         (array_key_exists($found ['tag-open'], $spans) || $found ['tag-open'] == 'span')) {
+
                         $closed = true;
+                        $search ['matched'] = true;
 
                         // Known and closed tag, convert to ODT
                         if ($found ['tag-open'] != 'span') {

diff --git a/ODT/ODTUtility.php b/ODT/ODTUtility.php
@@ -678,6 +678,8 @@ public static function generateODTfromHTMLCode(ODTInternalParams $params, $HTMLC
                                               'close' => '</text:span>'),
                            'del' => array ('open' => '<text:span text:style-name="del">',
                                            'close' => '</text:span>'),
+                           'span' => array ('open' => '',
+                                         'close' => ''),
                            'a' => array ('open' => '',
                                          'close' => ''),
                            'ol' => array ('open' => '',
@@ -756,6 +758,7 @@ public static function generateODTfromHTMLCode(ODTInternalParams $params, $HTMLC
                         $entry ['tag-orig'] = $tagged;
                     }
                 }
+                $entry ['matched'] = false;
                 $parsed [] = $entry;
 
                 $pos = $found [1]+1;
@@ -775,7 +778,7 @@ public static function generateODTfromHTMLCode(ODTInternalParams $params, $HTMLC
             if ($checked [$out] !== NULL) {
                 continue;
             }
-            $found = $parsed [$out];
+            $found = &$parsed [$out];
             if ($found ['content'] !== NULL) {
                 if ($options ['escape_content'] !== 'false') {
                     $checked [$out] = $params->document->replaceXMLEntities($found ['content']);
@@ -786,11 +789,14 @@ public static function generateODTfromHTMLCode(ODTInternalParams $params, $HTMLC
                 $closed = false;
 
                 for ($in = $out+1 ; $in < count($parsed) ; $in++) {
-                    $search = $parsed [$in];
+                    $search = &$parsed [$in];
                     if ($search ['tag-close'] !== NULL &&
                         $found ['tag-open'] == $search ['tag-close'] &&
-                        (array_key_exists($found ['tag-open'], $elements) || $found ['tag-open'] == 'span')) {
+                        $search ['matched'] === false &&
+                        array_key_exists($found ['tag-open'], $elements)) {
+
                         $closed = true;
+                        $search ['matched'] = true;
 
                         // Remeber the first element
                         if ($first) {