From fa9959fd41af1b9b11efd56c15e456d1194a6190 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Tue, 15 Apr 2008 15:52:01 +0000 Subject: [PATCH] Check for Plain Layout as well as for Standard in these cases. We should always do this in the 1.6.x lyx2lyx. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24270 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/lyx2lyx/lyx_1_6.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py index 0809721f04..14938cf1bc 100644 --- a/lib/lyx2lyx/lyx_1_6.py +++ b/lib/lyx2lyx/lyx_1_6.py @@ -1278,7 +1278,9 @@ def revert_framed_notes(document): status = document.body[k] l = find_token(document.body, "\\begin_layout Standard", i + 1, j) if l == -1: - document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Box inset.") + l = find_token(document.body, "\\begin_layout Plain", i + 1, j) + if l == -1: + document.warning("Malformed LyX document: Missing `\\begin_layout' in Box inset.") return m = find_token(document.body, "\\end_layout", i + 1, j) if m == -1: @@ -1460,7 +1462,9 @@ def revert_rotfloat(document): if get_value(document.body, 'sideways', i, j) != "false": l = find_token(document.body, "\\begin_layout Standard", i + 1, j) if l == -1: - document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Float inset.") + l = find_token(document.body, "\\begin_layout Plain", i + 1, j) + if l == -1: + document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.") return document.body[j] = '\\begin_layout Standard\n\\begin_inset ERT\nstatus collapsed\n\n' \ '\\begin_layout Standard\n\n\n\\backslash\n' \ @@ -1506,7 +1510,9 @@ def revert_widesideways(document): if get_value(document.body, 'wide', i, j) != "false": l = find_token(document.body, "\\begin_layout Standard", i + 1, j) if l == -1: - document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Float inset.") + l = find_token(document.body, "\\begin_layout Plain", i + 1, j) + if l == -1: + document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.") return document.body[j] = '\\begin_layout Standard\n\\begin_inset ERT\nstatus collapsed\n\n' \ '\\begin_layout Standard\n\n\n\\backslash\n' \ -- 2.39.2