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

Fix up revert_rule routine.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36097 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-05 01:03:46 +00:00
parent e0227fa396
commit f86f875a8c
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/lyx2lyx/lyx_2_0.py
View File

@ -1876,35 +1876,23 @@ def revert_rule(document):
return return
# find end of inset # find end of inset
j = find_token(document.body, "\\end_inset" , i) j = find_token(document.body, "\\end_inset" , i)
# assure we found the end_inset of the current inset if j == -1:
if j > i + 6 or j == -1:
document.warning("Malformed LyX document: Can't find end of line inset.") document.warning("Malformed LyX document: Can't find end of line inset.")
return return
# determine the optional offset # determine the optional offset
k = find_token(document.body, 'offset', i, j) offset = get_value(document.body, 'offset', i, j).strip('"')
if k != -1:
offset = document.body[k][8:-1]
else:
offset = ""
# determine the width
l = find_token(document.body, 'width', i, j)
if l != -1:
width = document.body[l][7:-1]
else:
width = "100col%"
# determine the height
m = find_token(document.body, 'height', i, j)
if m != -1:
height = document.body[m][8:-1]
else:
height = "1pt"
# output the \rule command
if offset: if offset:
offset = '[' + offset + ']'
# determine the width
width = get_value(document.body, 'width', i, j, "100col%").strip('"')
width = latex_length(width)[1]
# determine the height
height = get_value(document.body, 'height', i, j, "1pt").strip('"')
height = latex_length(height)[1]
# output the \rule command
subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}" subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}"
else:
subst = "\\rule{" + width + "}{" + height + "}"
document.body[i:j + 1] = put_cmd_in_ert(subst) document.body[i:j + 1] = put_cmd_in_ert(subst)
i += 1 i += len(subst) - (j - i)
def revert_diagram(document): def revert_diagram(document):