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

Fix nesting in some beamer reversion methods.

Browse Source 
Patch by Enrico
This commit is contained in:
Juergen Spitzmueller 2014-05-21 11:37:51 +02:00
parent 02410adbfe
commit ad723c41b6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lyx2lyx/lyx_2_1.py
View File

@ -3148,12 +3148,12 @@ def revert_overprint(document):
continue continue
endseq = j endseq = j
subst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\begin{overprint}") subst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\begin{overprint}")
esubst = ["\\end_layout", "", "\\begin_layout Standard"] + put_cmd_in_ert("\\end{overprint}") esubst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\end{overprint}")
endseq = endseq + len(esubst) - len(document.body[j : j]) endseq = endseq + len(esubst) - len(document.body[j : j])
if document.body[j] == "\\end_deeper": if document.body[j] == "\\end_deeper":
document.body[j : j] = ["\\end_deeper", ""] + esubst document.body[j : j] = [""] + esubst + ["", "\\end_layout"]
else: else:
document.body[j : j] = esubst document.body[j : j] = ["\\end_layout", ""] + esubst
r = i r = i
while r < j: while r < j:
if document.body[r] == "\\begin_deeper": if document.body[r] == "\\begin_deeper":
@ -3518,10 +3518,10 @@ def revert_fragileframe(document):
continue continue
endseq = j endseq = j
subst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\begin{frame}") subst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\begin{frame}")
esubst = ["\\end_layout", "", "\\begin_layout Standard"] + put_cmd_in_ert("\\end{frame}") esubst = ["\\begin_layout Standard"] + put_cmd_in_ert("\\end{frame}")
endseq = endseq + len(esubst) - len(document.body[j : j]) endseq = endseq + len(esubst) - len(document.body[j : j])
if document.body[j] == "\\end_deeper": if document.body[j] == "\\end_deeper":
document.body[j : j] = ["\\end_deeper", ""] + esubst document.body[j : j] = [""] + esubst + ["", "\\end_layout"]
else: else:
document.body[j : j] = esubst document.body[j : j] = esubst
for q in range(i, j): for q in range(i, j):
@ -3621,10 +3621,10 @@ def revert_newframes(document):
continue continue
endseq = j endseq = j
subst = ["\\begin_layout %s" % frame_dict[val]] subst = ["\\begin_layout %s" % frame_dict[val]]
esubst = ["\\end_layout", "", "\\begin_layout EndFrame", "", "\\end_layout"] esubst = ["\\begin_layout EndFrame", "", "\\end_layout"]
endseq = endseq + len(esubst) - len(document.body[j : j]) endseq = endseq + len(esubst) - len(document.body[j : j])
if document.body[j] == "\\end_deeper": if document.body[j] == "\\end_deeper":
document.body[j : j] = ["\\end_deeper", ""] + esubst document.body[j : j] = [""] + esubst
else: else:
document.body[j : j] = esubst document.body[j : j] = esubst
for q in range(i, j): for q in range(i, j):

2
status.21x
View File

@ -84,6 +84,8 @@ What's new
- Fix import of some argument insets. - Fix import of some argument insets.
- Fix some nesting problems in reversion of some beamer environments to 2.0 format.
* USER INTERFACE * USER INTERFACE