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

lyx2lyx/lyx_2_1.py: add missing things from previous commit (cherry pick seems to make mistakes or I used it not correctly)

Browse Source
This commit is contained in:
Uwe Stöhr 2012-03-21 23:39:33 +01:00
parent ea54461d85
commit 34014336fa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/lyx2lyx/lyx_2_1.py
View File

@ -589,14 +589,14 @@ def revert_cell_rotation(document):
k = document.body[i].find('"', j + 8) k = document.body[i].find('"', j + 8)
value = document.body[i][j + 8 : k] value = document.body[i][j + 8 : k]
if value == "0": if value == "0":
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
# remove rotate option # remove rotate option
document.body[i] = rgx.sub('', document.body[i]) document.body[i] = rgx.sub('', document.body[i])
elif value == "90": elif value == "90":
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
document.body[i] = rgx.sub('rotate="true"', document.body[i]) document.body[i] = rgx.sub('rotate="true"', document.body[i])
else: else:
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
load_rotating = True load_rotating = True
# remove rotate option # remove rotate option
document.body[i] = rgx.sub('', document.body[i]) document.body[i] = rgx.sub('', document.body[i])
@ -644,24 +644,25 @@ def revert_table_rotation(document):
return return
j = document.body[i].find('rotate="') j = document.body[i].find('rotate="')
if j != -1: if j != -1:
end_table = find_token(document.body, '</lyxtabular>', j)
k = document.body[i].find('"', j + 8) k = document.body[i].find('"', j + 8)
value = document.body[i][j + 8 : k] value = document.body[i][j + 8 : k]
if value == "0": if value == "0":
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
# remove rotate option # remove rotate option
document.body[i] = rgx.sub('', document.body[i]) document.body[i] = rgx.sub('', document.body[i])
elif value == "90": elif value == "90":
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r'rotate="[^"]+?"')
document.body[i] = rgx.sub('rotate="true"', document.body[i]) document.body[i] = rgx.sub('rotate="true"', document.body[i])
else: else:
rgx = re.compile(r'rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
load_rotating = True load_rotating = True
# remove rotate option # remove rotate option
document.body[i] = rgx.sub('', document.body[i]) document.body[i] = rgx.sub('', document.body[i])
# write ERT # write ERT
document.body[i + 5 : i + 5] = \ document.body[end_table + 3 : end_table + 3] = \
put_cmd_in_ert("\\end{turn}") put_cmd_in_ert("\\end{turn}")
document.body[i + 4 : i + 4] = \ document.body[i - 2 : i - 2] = \
put_cmd_in_ert("\\begin{turn}{" + value + "}") put_cmd_in_ert("\\begin{turn}{" + value + "}")
i += 1 i += 1