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("}")
--
Enrico
#LyX 2.1 created this file. For more info see http://www.lyx.org/
\lyxformat 474
\begin_document
\begin_header
\textclass article
\use_default_options true
\maintain_unincluded_children false
\language english
\language_package default
\inputencoding auto
\fontencoding global
\font_roman default
\font_sans default
\font_typewriter default
\font_math auto
\font_default_family default
\use_non_tex_fonts false
\font_sc false
\font_osf false
\font_sf_scale 100
\font_tt_scale 100
\graphics default
\default_output_format default
\output_sync 0
\bibtex_command default
\index_command default
\paperfontsize default
\use_hyperref false
\papersize default
\use_geometry false
\use_package amsmath 1
\use_package amssymb 1
\use_package cancel 1
\use_package esint 1
\use_package mathdots 1
\use_package mathtools 1
\use_package mhchem 1
\use_package stackrel 1
\use_package stmaryrd 1
\use_package undertilde 1
\cite_engine basic
\cite_engine_type default
\biblio_style plain
\use_bibtopic false
\use_indices false
\paperorientation portrait
\suppress_date false
\justification true
\use_refstyle 1
\index Index
\shortcut idx
\color #008000
\end_index
\secnumdepth 3
\tocdepth 3
\paragraph_separation indent
\paragraph_indentation default
\quotes_language english
\papercolumns 1
\papersides 1
\paperpagestyle default
\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
\end_header
\begin_body
\begin_layout Standard
\begin_inset Box Frameless
position "t"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
use_makebox 1
width ""
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Plain Layout
\begin_inset Flex URL
status open
\begin_layout Plain Layout
http://example.com
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\end_body
\end_document
