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

Convert floatingfigure.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5284 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-09-12 12:02:54 +00:00
parent b8eeb95c16
commit a4af485033
2 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

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

62
lib/lyx2lyx/lyxconvert_218.py
View File

@ -48,6 +48,21 @@ font_tokens = ["\\family", "\\series", "\\shape", "\\size", "\\emph",
# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset # Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
# #
pextra_type3_rexp = re.compile(r".*\\pextra_type\s+3")
pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
r"(\s+\\pextra_alignment\s+(\S+))?"+\
r"(\s+\\pextra_hfill\s+(\S+))?"+\
r"(\s+\\pextra_start_minipage\s+(\S+))?"+\
r"(\s+(\\pextra_widthp?)\s+(\S*))?")
def get_width(mo):
if mo.group(9) == "\\pextra_widthp":
return mo.group(10)+"col%"
elif mo.group(10):
return mo.group(10)
else:
return "100col%"
def remove_oldfloat(lines, language): def remove_oldfloat(lines, language):
i = 0 i = 0
while 1: while 1:
@ -71,6 +86,18 @@ def remove_oldfloat(lines, language):
lines[j2:j2] = ["\\end_deeper "]*(i2-(i+1)) lines[j2:j2] = ["\\end_deeper "]*(i2-(i+1))
new = floats[floattype]+[""] new = floats[floattype]+[""]
# Check if the float is floatingfigure
k = find_re(lines, pextra_type3_rexp, i, j)
if k != -1:
mo = pextra_rexp.search(lines[k])
width = get_width(mo)
lines[k] = re.sub(pextra_rexp, "", lines[k])
new = ["\\begin_inset Wrap figure",
'width "%s"' % width,
"collapsed false",
""]
new = new+lines[i2:j]+["\\end_inset ", ""] new = new+lines[i2:j]+["\\end_inset ", ""]
# After a float, all font attributes are reseted. # After a float, all font attributes are reseted.
@ -97,27 +124,22 @@ def remove_oldfloat(lines, language):
lines[i:j+1] = new lines[i:j+1] = new
i = i+1 i = i+1
pextra_type2_rexp = re.compile(r".*\\pextra_type\s+2")
pextra_type2_rexp2 = re.compile(r".*(\\layout|\\pextra_type\s+2)")
def remove_oldminipage(lines): def remove_oldminipage(lines):
i = 0 i = 0
flag = 0 flag = 0
while 1: while 1:
i = find_token(lines, "\\pextra_type 2", i) i = find_re(lines, pextra_type2_rexp, i)
if i == -1: if i == -1:
break break
hfill = 0
line = string.split(lines[i])
if line[4] == "\\pextra_hfill":
hfill = 1
line[4:6] = []
if line[4] == "\\pextra_start_minipage":
# We just ignore this
line[4:6] = []
position = line[3]
width = line[5]
if line[4] == "\\pextra_widthp":
width = line[5]+"col%"
mo = pextra_rexp.search(lines[i])
position = mo.group(3)
hfill = mo.group(5)
width = get_width(mo)
lines[i] = re.sub(pextra_rexp, "", lines[i])
start = ["\\begin_inset Minipage", start = ["\\begin_inset Minipage",
"position " + position, "position " + position,
@ -147,13 +169,13 @@ def remove_oldminipage(lines):
count = count+1 count = count+1
if j == -1 or not check_token(lines[j], "\\layout"): if j == -1 or not check_token(lines[j], "\\layout"):
break break
i = find_tokens(lines, ["\\layout", "\\pextra_type"], j+1) i = find_re(lines, pextra_type2_rexp2, j+1)
if i == -1 or not check_token(lines[i], "\\pextra_type"): if i == -1:
break break
line = string.split(lines[i]) mo = pextra_rexp.search(lines[i])
if line[4] == "\\pextra_hfill": if not mo:
line[4:6] = [] break
if line[4] == "\\pextra_start_minipage" and line[5] == "1": if mo.group(7) == "1":
flag = 1 flag = 1
break break
j = find_token_backwards(lines,"\\layout", i-1) j = find_token_backwards(lines,"\\layout", i-1)