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

Fix up some of the reversion and conversion routines.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25485 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-07-07 18:09:29 +00:00
parent 175959580f
commit e07caa5f52
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/lyx2lyx/lyx_1_6.py
View File

@ -748,17 +748,34 @@ def revert_wrapfig_options(document):
"Revert optional options for wrap floats (wrapfig)." "Revert optional options for wrap floats (wrapfig)."
i = 0 i = 0
while True: while True:
i = find_token(document.body, "lines", i) i = find_token(document.body, "\\begin_inset Wrap figure", i)
if i == -1: if i == -1:
return return
j = find_token(document.body, "overhang", i+1) j = find_end_of_inset(document.body, i)
if j != i + 2 and j != -1:
document.warning("Malformed LyX document: Couldn't find overhang parameter of wrap float.")
if j == -1: if j == -1:
return document.warning("Can't find end of Wrap inset at line " + str(i))
del document.body[i] i += 1
del document.body[j-1] continue
i = i + 1 k = find_default_layout(document, i, j)
if k == -1:
document.warning("Can't find default layout for Wrap figure!")
i = j
continue
# Options should be between i and k now
l = find_token(document.body, "lines", i, k)
if l == -1:
document.warning("Can't find lines option for Wrap figure!")
i = k
continue
m = find_token(document.body, "overhang", i + 1, k)
if m == -1:
document.warning("Malformed LyX document: Couldn't find overhang parameter of wrap float!")
i = k
continue
# Do these in reverse order
del document.body[m]
del document.body[l]
i = k
# To convert and revert indices, we need to convert between LaTeX # To convert and revert indices, we need to convert between LaTeX
@ -1986,18 +2003,21 @@ def revert_wrapplacement(document):
" Revert placement options wrap floats (wrapfig). " " Revert placement options wrap floats (wrapfig). "
i = 0 i = 0
while True: while True:
i = find_token(document.body, "lines", i) i = find_token(document.body, "\\begin_inset Wrap figure", i)
if i == -1: if i == -1:
return return
j = find_token(document.body, "placement", i+1) e = find_end_of_inset(document.body, i)
if j != i + 1: j = find_token(document.body, "placement", i + 1, e)
if j == -1:
document.warning("Malformed LyX document: Couldn't find placement parameter of wrap float.") document.warning("Malformed LyX document: Couldn't find placement parameter of wrap float.")
return i += 1
document.body[j] = document.body[j].replace("placement O", "placement o") continue
document.body[j] = document.body[j].replace("placement I", "placement i") r = re.compile("placement (o|i|l|r)")
document.body[j] = document.body[j].replace("placement L", "placement l") m = r.match(document.body[j])
document.body[j] = document.body[j].replace("placement R", "placement r") if m == None:
i = i + 1 document.warning("Malformed LyX document: Placement option isn't O|I|R|L!")
document.body[j] = "placement " + m.group(1).lower()
i = j
def remove_extra_embedded_files(document): def remove_extra_embedded_files(document):