Got this one and the other.
Richard
On 05/29/2014 04:48 AM, Enrico Forestieri wrote:
On Thu, May 29, 2014 at 10:44:59AM +0200, Enrico Forestieri wrote:
commit da75d3194824c87e2b2fc92fa4644e080aeaf962
Author: Enrico Forestieri <for...@lyx.org>
Date: Thu May 29 10:44:02 2014 +0200
Fix reversion of box insets.
Richard, you may want to cherry-pick this for 2.1 and 2.0.
It fixes reversion in cases like the one in the attached example.
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 4999368..6752eb9 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -4365,7 +4365,7 @@ def revert_mbox_fbox(document):
i += 1
continue
BeginLayout = find_token(document.body, "\\begin_layout Plain
Layout", j)
- EndLayout = find_token(document.body, "\\end_layout", BeginLayout)
+ EndLayout = find_end_of_layout(document.body, BeginLayout)
# replace if width is ""
if (width == '""'):
document.body[EndLayout:k + 1] = put_cmd_in_ert("}")