[LyX/master] Improve revert of mutlicolumn

[Georg Baum]

commit 69abac9605b1ae2093d6e5acae11d440d051796e
Author: Georg Baum <b...@lyx.org>
Date:   Sun May 17 16:39:14 2015 +0200

    Improve revert of mutlicolumn
    
    Old LyX version can cope with degenerated multicolumn cells spanning only 
one
    column, so these should not cause a conversion of the whole formula to ERT.
    Such columns are used to set border lines or alignment for single cells.

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index bca3b56..e225abf 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -1146,9 +1146,21 @@ def revert_mathmulticol(document):
         lines = document.body[i:j]
         lines[0] = lines[0].replace('\\begin_inset Formula', '').lstrip()
         code = "\n".join(lines)
-        if code.find("\\multicolumn") != -1:
-            ert = put_cmd_in_ert(code)
-            document.body[i:j+1] = ert
+        converted = False
+        k = 0
+        n = 0
+        while n >= 0:
+            n = code.find("\\multicolumn", k)
+            # no need to convert degenerated multicolumn cells,
+            # they work in old LyX versions as "math ERT"
+            if n != -1 and code.find("\\multicolumn{1}", k) != n:
+                ert = put_cmd_in_ert(code)
+                document.body[i:j+1] = ert
+                converted = True
+                break
+            else:
+                k = n + 12
+        if converted:
             i = find_end_of_inset(document.body, i)
         else:
             i = j