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

beamer conversion: deal with more complicated block titles

Browse Source
This commit is contained in:
Juergen Spitzmueller 2014-01-24 09:24:12 +01:00
parent 2ddf66a71d
commit a7a585c7bd
1 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/lyx2lyx/lyx_2_1.py
View File

@ -2904,39 +2904,67 @@ def convert_beamerblocks(document):
document.warning("Wrong parent layout!") document.warning("Wrong parent layout!")
i += 1 i += 1
continue continue
j = parent[2]
parbeg = parent[3] parbeg = parent[3]
parend = parent[2]
j = parend
if i != -1: if i != -1:
if document.body[parbeg] == "\\begin_inset ERT": if document.body[parbeg] == "\\begin_inset ERT":
ertcont = parbeg + 5 ertcontfirstline = parbeg + 5
ertcontlastline = parend - 6
while True: while True:
if document.body[ertcont].startswith("<"): if document.body[ertcontfirstline].startswith("<"):
# This is an overlay specification # This is an overlay specification
# strip off the < # strip off the <
document.body[ertcont] = document.body[ertcont][1:] document.body[ertcontfirstline] = document.body[ertcontfirstline][1:]
if document.body[ertcont].endswith(">"): if document.body[ertcontlastline].endswith(">"):
# strip off the > # strip off the >
document.body[ertcont] = document.body[ertcont][:-1] document.body[ertcontlastline] = document.body[ertcontlastline][:-1]
# Convert to ArgInset # Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 1" document.body[parbeg] = "\\begin_inset Argument 1"
elif document.body[ertcont].endswith("}"): elif document.body[ertcontlastline].endswith("}"):
# strip off the }
document.body[ertcontlastline] = document.body[ertcontlastline][:-1]
# divide the args # divide the args
tok = document.body[ertcont].find('>{') ertcontdivline = ertcontfirstline
tok = document.body[ertcontdivline].find('>{')
if tok == -1:
regexp = re.compile(r'.*>\{', re.IGNORECASE)
ertcontdivline = find_re(document.body, regexp, ertcontfirstline, ertcontlastline)
tok = document.body[ertcontdivline].find('>{')
if tok != -1: if tok != -1:
document.body[ertcont : ertcont + 1] = [document.body[ertcont][:tok], if ertcontfirstline < ertcontlastline:
# Multiline ERT. Might contain TeX code. Embrace in ERT.
document.body[ertcontlastline : ertcontlastline + 1] = [
document.body[ertcontlastline], '\\end_layout', '', '\\end_inset']
document.body[ertcontdivline : ertcontdivline + 1] = [document.body[ertcontdivline][:tok],
'\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2', '\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2',
'status collapsed', '', '\\begin_layout Plain Layout', 'status collapsed', '', '\\begin_layout Plain Layout',
document.body[ertcont][tok + 2:-1]] '\\begin_inset ERT', '', 'status open' '', '\\begin_layout Plain Layout',
document.body[ertcontdivline][tok + 2:]]
else:
document.body[ertcontdivline : ertcontdivline + 1] = [document.body[ertcontdivline][:tok],
'\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2',
'status collapsed', '', '\\begin_layout Plain Layout',
document.body[ertcontdivline][tok + 2:]]
# Convert to ArgInset # Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 1" document.body[parbeg] = "\\begin_inset Argument 1"
elif document.body[ertcont].startswith("{"): elif document.body[ertcontfirstline].startswith("{"):
# This is the block title # This is the block title
if document.body[ertcont].endswith("}"): if document.body[ertcontlastline].endswith("}"):
# strip off the braces # strip off the braces
document.body[ertcont] = document.body[ertcont][1:-1] document.body[ertcontfirstline] = document.body[ertcontfirstline][1:]
document.body[ertcontlastline] = document.body[ertcontlastline][:-1]
if ertcontfirstline < ertcontlastline:
# Multiline ERT. Might contain TeX code. Embrace in ERT.
document.body[parend : parend + 1] = [
document.body[parend], '\\end_layout', '', '\\end_inset']
document.body[parbeg : parbeg + 1] = ['\\begin_inset Argument 2',
'status collapsed', '', '\\begin_layout Plain Layout',
'\\begin_inset ERT', '']
else:
# Convert to ArgInset # Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 2" document.body[parbeg] = "\\begin_inset Argument 2"
elif count_pars_in_inset(document.body, ertcont) > 1: elif count_pars_in_inset(document.body, ertcontfirstline) > 1:
# Multipar ERT. Skip this. # Multipar ERT. Skip this.
break break
else: else:
@ -2954,7 +2982,7 @@ def convert_beamerblocks(document):
m = find_token(document.body, "\\begin_inset ERT", l, j) m = find_token(document.body, "\\begin_inset ERT", l, j)
if m == -1: if m == -1:
break break
ertcont = m + 5 ertcontfirstline = m + 5
parbeg = m parbeg = m
i = j i = j