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

Improve beamer frame conversion: frame arguments that use multiple ERTs (one ERT inset per argument) are converted

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-12-06 11:57:33 +01:00
parent ac7f7dbdce
commit 0aaf2f2008
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/lyx2lyx/lyx_2_1.py
View File

@ -2187,9 +2187,16 @@ def convert_beamerargs(document):
# #
# Helper function for the frame conversion routines # Helper function for the frame conversion routines
# #
# FIXME: This method currently requires the arguments to be either
# * In one (whole) ERT each: <ERT>[<arg1>]</ERT><ERT><arg2></ERT><ERT>[arg3]</ERT>
# * Altogether in one whole ERT: <ERT>[<arg1>]<arg2>[arg3]</ERT>
# If individual arguments mix ERT and non-ERT or are splitted
# over several ERTs, the parsing fails.
def convert_beamerframeargs(document, i, parbeg): def convert_beamerframeargs(document, i, parbeg):
ertend = i ertend = i
if document.body[parbeg] == "\\begin_inset ERT": while True:
if document.body[parbeg] != "\\begin_inset ERT":
return ertend
ertend = find_end_of_inset(document.body, parbeg) ertend = find_end_of_inset(document.body, parbeg)
if ertend == -1: if ertend == -1:
document.warning("Malformed LyX document: missing ERT \\end_inset") document.warning("Malformed LyX document: missing ERT \\end_inset")
@ -2268,14 +2275,14 @@ def convert_beamerframeargs(document, i, parbeg):
document.body[ertcont] = document.body[ertcont][:-1] document.body[ertcont] = document.body[ertcont][:-1]
# Convert to ArgInset # Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 3" document.body[parbeg] = "\\begin_inset Argument 3"
parbeg = ertend + 3
continue
return ertend return ertend
def convert_againframe_args(document): def convert_againframe_args(document):
" Converts beamer AgainFrame to new layout " " Converts beamer AgainFrame to new layout "
# FIXME: This currently only works if the arguments are in one single ERT
beamer_classes = ["beamer", "article-beamer", "scrarticle-beamer"] beamer_classes = ["beamer", "article-beamer", "scrarticle-beamer"]
if document.textclass not in beamer_classes: if document.textclass not in beamer_classes:
return return
@ -2292,7 +2299,10 @@ def convert_againframe_args(document):
parbeg = parent[3] parbeg = parent[3]
if i != -1: if i != -1:
# Convert ERT arguments # Convert ERT arguments
# FIXME: See restrictions in convert_beamerframeargs method
ertend = convert_beamerframeargs(document, i, parbeg) ertend = convert_beamerframeargs(document, i, parbeg)
if ertend == -1:
break
i = j i = j
@ -3784,10 +3794,10 @@ def convert_lyxframes(document):
parbeg = parent[3] parbeg = parent[3]
if i != -1: if i != -1:
# Step I: Convert ERT arguments # Step I: Convert ERT arguments
# FIXME: This currently only works if the arguments are in one single ERT # FIXME: See restrictions in convert_beamerframeargs method
ertend = convert_beamerframeargs(document, i, parbeg) ertend = convert_beamerframeargs(document, i, parbeg)
if ertend == -1: if ertend == -1:
continue break
# Step II: Now rename the layout and convert the title to an argument # Step II: Now rename the layout and convert the title to an argument
j = find_end_of_layout(document.body, i) j = find_end_of_layout(document.body, i)
document.body[j : j + 1] = ['\\end_layout', '', '\\end_inset', '', '\\end_layout'] document.body[j : j + 1] = ['\\end_layout', '', '\\end_inset', '', '\\end_layout']