anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify code

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5287 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-09-12 15:10:23 +00:00
parent df71b75d4a
commit 0ed17fdba3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ChangeLog
View File

@ -1,6 +1,7 @@
2002-09-12 Dekel Tsur <dekelts@tau.ac.il> 2002-09-12 Dekel Tsur <dekelts@tau.ac.il>
* lyx2lyx/lyxconvert_218.py (remove_oldfloat): Convert floatingfigure. * lyx2lyx/lyxconvert_218.py (remove_oldfloat): Convert floatingfigure.
(remove_oldminipage): Simplified.
2002-09-10 José Matos <jamatos@fep.up.pt> 2002-09-10 José Matos <jamatos@fep.up.pt>

18
lib/lyx2lyx/lyxconvert_218.py
View File

@ -56,10 +56,11 @@ pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
r"(\s+(\\pextra_widthp?)\s+(\S*))?") r"(\s+(\\pextra_widthp?)\s+(\S*))?")
def get_width(mo): def get_width(mo):
if mo.group(9) == "\\pextra_widthp": if mo.group(10):
return mo.group(10)+"col%" if mo.group(9) == "\\pextra_widthp":
elif mo.group(10): return mo.group(10)+"col%"
return mo.group(10) else:
return mo.group(10)
else: else:
return "100col%" return "100col%"
@ -157,11 +158,9 @@ def remove_oldminipage(lines):
j = find_token_backwards(lines,"\\layout", i-1) j = find_token_backwards(lines,"\\layout", i-1)
j0 = j j0 = j
mid = lines[j:i]
j = find_tokens(lines, ["\\layout", "\\end_float"], i+1) j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
# j can be -1, but this is still ok # j can be -1
mid = mid+lines[i+1:j]
count = 0 count = 0
while 1: while 1:
@ -178,11 +177,10 @@ def remove_oldminipage(lines):
if mo.group(7) == "1": if mo.group(7) == "1":
flag = 1 flag = 1
break break
j = find_token_backwards(lines,"\\layout", i-1) lines[i] = re.sub(pextra_rexp, "", lines[i])
mid = mid+lines[j:i]
j = find_tokens(lines, ["\\layout", "\\end_float"], i+1) j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
mid = mid+lines[i+1:j]
mid = lines[j0:j]
end = ["\\end_inset "] end = ["\\end_inset "]
lines[j0:j] = start+mid+end lines[j0:j] = start+mid+end