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

Reduce indentation. Also, it is probably not a good idea to use "string"

Browse Source 
as a variable name here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36042 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-04 12:46:38 +00:00
parent dcc164407a
commit fbfdef21f1
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/lyx2lyx/lyx_2_0.py
View File

@ -259,11 +259,11 @@ def lyx2latex(document, lines):
return content
def latex_length(string):
def latex_length(slen):
'Convert lengths to their LaTeX representation.'
i = 0
percent = False
# the string has the form
# the slen has the form
# ValueUnit+ValueUnit-ValueUnit or
# ValueUnit+-ValueUnit
# the + and - (glue lengths) are optional
@ -274,41 +274,42 @@ def latex_length(string):
"page%":"\\paperwidth", "line%":"\\linewidth",
"theight%":"\\textheight", "pheight%":"\\paperheight"}
for unit in units.keys():
i = string.find(unit)
i = slen.find(unit)
if i == -1:
percent = True
minus = string.rfind("-", 1, i)
plus = string.rfind("+", 0, i)
latex_unit = units[unit]
if plus == -1 and minus == -1:
value = string[:i]
value = str(float(value)/100)
end = string[i + len(unit):]
string = value + latex_unit + end
if plus > minus:
value = string[plus + 1:i]
value = str(float(value)/100)
begin = string[:plus + 1]
end = string[i+len(unit):]
string = begin + value + latex_unit + end
if plus < minus:
value = string[minus + 1:i]
value = str(float(value)/100)
begin = string[:minus + 1]
string = begin + value + latex_unit
continue
percent = True
minus = slen.rfind("-", 1, i)
plus = slen.rfind("+", 0, i)
latex_unit = units[unit]
if plus == -1 and minus == -1:
value = slen[:i]
value = str(float(value)/100)
end = slen[i + len(unit):]
slen = value + latex_unit + end
if plus > minus:
value = slen[plus + 1:i]
value = str(float(value)/100)
begin = slen[:plus + 1]
end = slen[i+len(unit):]
slen = begin + value + latex_unit + end
if plus < minus:
value = slen[minus + 1:i]
value = str(float(value)/100)
begin = slen[:minus + 1]
slen = begin + value + latex_unit
# replace + and -, but only if the - is not the first character
string = string[0] + string[1:].replace("+", " plus ").replace("-", " minus ")
slen = slen[0] + slen[1:].replace("+", " plus ").replace("-", " minus ")
# handle the case where "+-1mm" was used, because LaTeX only understands
# "plus 1mm minus 1mm"
if string.find("plus minus"):
lastvaluepos = string.rfind(" ")
lastvalue = string[lastvaluepos:]
string = string.replace(" ", lastvalue + " ")
if slen.find("plus minus"):
lastvaluepos = slen.rfind(" ")
lastvalue = slen[lastvaluepos:]
slen = slen.replace(" ", lastvalue + " ")
if percent == False:
return "False," + string
return "False," + slen
else:
return "True," + string
return "True," + slen
def revert_flex_inset(document, name, LaTeXname, position):