Fix conversion of minipages that contains tabulars.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6507 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2003-03-14 15:29:01 +00:00
parent 14847c8730
commit 239b9377e7
3 changed files with 9 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2003-03-14 Dekel Tsur <dekelts@tau.ac.il>
* lyx2lyx/lyxconvert_218.py (remove_pextra): Fix conversion of
minipages that contains tabulars.
2003-03-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* templates/revtex4.lyx:

View File

@ -164,11 +164,8 @@ def remove_pextra(lines):
else:
start = ["\\layout Standard"] + start
j = find_token_backwards(lines,"\\layout", i-1)
j0 = j
j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
# j can be -1
j0 = find_token_backwards(lines,"\\layout", i-1)
j = get_next_paragraph(lines, i)
count = 0
while 1:

View File

@ -105,9 +105,8 @@ def get_paragraph(lines, i):
# Finds the paragraph after the paragraph that contains line i.
def get_next_paragraph(lines, i):
while i != -1:
i = find_tokens(lines, ["\\begin_inset", "\\layout"], i)
if i == -1: return -1
if check_token(lines[i], "\\layout"):
i = find_tokens(lines, ["\\begin_inset", "\\layout", "\\end_float", "\\the_end"], i)
if not check_token(lines[i], "\\begin_inset"):
return i
i = find_end_of_inset(lines, i)