anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more lyx2lyx fixes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-12-02 16:47:27 +01:00
parent 6c70da4d9e
commit e250fd46ea
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/lyx2lyx/lyx_2_1.py
View File

@ -1260,7 +1260,7 @@ def revert_latexargs(document):
# Search for Argument insets
i = find_token(document.body, "\\begin_inset Argument", i)
if i == -1:
break
return
m = rx.match(document.body[i])
if not m:
# No ID: inset already reverted
@ -1268,6 +1268,9 @@ def revert_latexargs(document):
continue
# Find beginning and end of the containing paragraph
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:
document.warning("Malformed lyx document: Can't find parent paragraph layout")
continue
@ -1684,14 +1687,17 @@ def revert_itemargs(document):
if i == -1:
return
j = find_end_of_inset(document.body, i)
lastlay = 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)
beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i)
endLayout = find_token(document.body, "\\end_layout", beginPlain)
endInset = find_token(document.body, "\\end_inset", endLayout)
content = document.body[beginPlain + 1 : endLayout]
endPlain = find_end_of_layout(document.body, beginPlain)
endInset = find_end_of_inset(document.body, p)
content = document.body[beginPlain + 1 : endPlain]
del document.body[i:j+1]
subst = put_cmd_in_ert("[") + content + put_cmd_in_ert("]")
document.body[lastlay + 1:lastlay + 1] = subst
document.body[parbeg + 1:parbeg + 1] = subst
i = i + 1