anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 09:32:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix conversion of minipages that contains tabulars.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
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> 2003-03-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* templates/revtex4.lyx: * templates/revtex4.lyx:

7
lib/lyx2lyx/lyxconvert_218.py
View File

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

5
lib/lyx2lyx/parser_tools.py
View File

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