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

Improve parsing of ERT arguments in beamer block titles.

Browse Source 
Fixes: #9225
This commit is contained in:
Juergen Spitzmueller 2014-08-01 09:42:43 +02:00
parent e9c1a1943b
commit d62ba3c333
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/lyx2lyx/lyx_2_1.py
View File

@ -3062,7 +3062,11 @@ def convert_beamerblocks(document):
if i != -1: if i != -1:
if document.body[parbeg] == "\\begin_inset ERT": if document.body[parbeg] == "\\begin_inset ERT":
ertcontfirstline = parbeg + 5 ertcontfirstline = parbeg + 5
# Find the last ERT in this paragraph (which might also be the first) lastertbeg = -1
lastertend = -1
while True:
# Find the last ERT in this paragraph used for arguments
# (which might also be the first)
lastertbeg = find_token_backwards(document.body, "\\begin_inset ERT", j) lastertbeg = find_token_backwards(document.body, "\\begin_inset ERT", j)
if lastertbeg == -1: if lastertbeg == -1:
document.warning("Last ERT not found!") document.warning("Last ERT not found!")
@ -3071,6 +3075,18 @@ def convert_beamerblocks(document):
if lastertend == -1: if lastertend == -1:
document.warning("End of last ERT not found!") document.warning("End of last ERT not found!")
break break
# Is this ERT really used for an argument?
# Note: This will fail when non-argument ERTs actually use brackets
# (e.g. \pause{})
regexp = re.compile(r'.*[>\]\}]', re.IGNORECASE)
cbracket = find_re(document.body, regexp, lastertbeg, lastertend)
if cbracket != -1:
break
if lastertbeg == parbeg:
break
j = lastertbeg - 1
if lastertbeg == -1 or lastertend == -1:
break
ertcontlastline = lastertend - 3 ertcontlastline = lastertend - 3
while True: while True:
if document.body[ertcontfirstline].lstrip().startswith("<"): if document.body[ertcontfirstline].lstrip().startswith("<"):