From 90ba811bb556b9dd9e436961087f14a310ce98bc Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Fri, 4 Nov 2011 03:15:26 +0100
Subject: [PATCH] Fixed a bug that creates invalid HTML at Export that lets
 Abiwords parser crash

---
 node/utils/ExportHtml.js | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/node/utils/ExportHtml.js b/node/utils/ExportHtml.js
index dce156ec8..c02e12992 100644
--- a/node/utils/ExportHtml.js
+++ b/node/utils/ExportHtml.js
@@ -119,8 +119,10 @@ function getHTMLFromAtext(pad, atext)
     var taker = Changeset.stringIterator(text);
     var assem = Changeset.stringAssembler();
 
+    var openTags = [];
     function emitOpenTag(i)
     {
+      openTags.unshift(i);
       assem.append('<');
       assem.append(tags[i]);
       assem.append('>');
@@ -128,10 +130,27 @@ function getHTMLFromAtext(pad, atext)
 
     function emitCloseTag(i)
     {
+      openTags.shift();
       assem.append('</');
       assem.append(tags[i]);
       assem.append('>');
     }
+    
+    function orderdCloseTags(tags2close)
+    {
+      for(var i=0;i<openTags.length;i++)
+      {
+        for(var j=0;j<tags2close.length;j++)
+        {
+          if(tags2close[j] == openTags[i])
+          {
+            emitCloseTag(tags2close[j]);
+            i--;
+            break;
+          }
+        }
+      }
+    }
 
     var urls = _findURLs(text);
 
@@ -204,18 +223,25 @@ function getHTMLFromAtext(pad, atext)
             }
           }
 
+          var tags2close = [];
+
           for (var i = propVals.length - 1; i >= 0; i--)
           {
             if (propVals[i] === LEAVE)
             {
-              emitCloseTag(i);
+              //emitCloseTag(i);
+              tags2close.push(i);
               propVals[i] = false;
             }
             else if (propVals[i] === STAY)
             {
-              emitCloseTag(i);
+              //emitCloseTag(i);
+              tags2close.push(i);
             }
           }
+          
+          orderdCloseTags(tags2close);
+          
           for (var i = 0; i < propVals.length; i++)
           {
             if (propVals[i] === ENTER || propVals[i] === STAY)
@@ -235,14 +261,18 @@ function getHTMLFromAtext(pad, atext)
 
         assem.append(_escapeHTML(s));
       } // end iteration over spans in line
+      
+      var tags2close = [];
       for (var i = propVals.length - 1; i >= 0; i--)
       {
         if (propVals[i])
         {
-          emitCloseTag(i);
+          tags2close.push(i);
           propVals[i] = false;
         }
       }
+      
+      orderdCloseTags(tags2close);
     } // end processNextChars
     if (urls)
     {