On Thu, May 29, 2014 at 10:56:37AM +0200, Enrico Forestieri wrote: > commit dbd4d781dcbe73d347a76fed9ca51faf2841e133 > Author: Enrico Forestieri <for...@lyx.org> > Date: Thu May 29 10:55:30 2014 +0200 > > Fix an off-by-one error in the reversion of beamer documents.
Richard, you may want to also cherry-pick this for 2.1 and 2.0. > diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py > index 6752eb9..a94ef52 100644 > --- a/lib/lyx2lyx/lyx_2_1.py > +++ b/lib/lyx2lyx/lyx_2_1.py > @@ -3789,12 +3789,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 -- Enrico
