Fix lyx2lyx (#8438)

This commit is contained in:
Juergen Spitzmueller 2012-12-02 15:19:40 +01:00
parent df7f2a074f
commit 1e681cdc80

View File

@ -1210,6 +1210,9 @@ def convert_latexargs(document):
# Find beginning and end of the containing paragraph # Find beginning and end of the containing paragraph
parbeg = find_token_backwards(document.body, "\\begin_layout", i) parbeg = find_token_backwards(document.body, "\\begin_layout", i)
while get_value(document.body, "\\begin_layout", parbeg) == "Plain Layout":
# Probably a preceding inset. Continue searching ...
parbeg = find_token_backwards(document.body, "\\begin_layout", parbeg - 1)
if parbeg == -1: if parbeg == -1:
document.warning("Malformed lyx document: Can't find parent paragraph layout") document.warning("Malformed lyx document: Can't find parent paragraph layout")
continue continue
@ -1623,11 +1626,12 @@ def convert_literate(document):
def revert_itemargs(document): def revert_itemargs(document):
" Reverts \\item arguments to TeX-code " " Reverts \\item arguments to TeX-code "
i = 0
while True: while True:
i = find_token(document.body, "\\begin_inset Argument item:", 0) i = find_token(document.body, "\\begin_inset Argument item:", i)
j = find_end_of_inset(document.body, i)
if i == -1: if i == -1:
break return
j = find_end_of_inset(document.body, i)
lastlay = find_token_backwards(document.body, "\\begin_layout", i) lastlay = find_token_backwards(document.body, "\\begin_layout", i)
beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i) beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i)
endLayout = find_token(document.body, "\\end_layout", beginPlain) endLayout = find_token(document.body, "\\end_layout", beginPlain)