From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 29 May 2014 08:55:30 +0000 (+0200)
Subject: Fix an off-by-one error in the reversion of beamer documents.
X-Git-Tag: 2.1.1~41
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=20214ee224f0bb83dda183852cbfdc37619b57b8;p=features.git

Fix an off-by-one error in the reversion of beamer documents.
(cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133)
---

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 0c170d4ae7..eccf522edf 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3621,12 +3621,12 @@ def revert_newframes(document):
             continue
         endseq = j
         subst = ["\\begin_layout %s" % frame_dict[val]]
-        esubst = ["\\begin_layout EndFrame", "", "\\end_layout"]
+        esubst = ["", "\\begin_layout EndFrame", "", "\\end_layout"]
         endseq = endseq + len(esubst) - len(document.body[j : j])
         if document.body[j] == "\\end_deeper":
-            document.body[j : j] = [""] + esubst
-        else:
             document.body[j : j] = esubst
+        else:
+            document.body[j+1 : j+1] = esubst
         for q in range(i, j):
             if document.body[q] == "\\begin_layout %s" % val:
                 document.body[q] = "\\begin_layout %s" % document.default_layout