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

Beamer block conversion: consider ERT arguments with leading/trailing blanks

Browse Source 
Should also go to branch.
This commit is contained in:
Juergen Spitzmueller 2014-05-08 19:52:01 +02:00
parent 4a24d8bec3
commit ede754039d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/lyx2lyx/lyx_2_1.py
View File

@ -2989,18 +2989,18 @@ def convert_beamerblocks(document):
break break
ertcontlastline = lastertend - 3 ertcontlastline = lastertend - 3
while True: while True:
if document.body[ertcontfirstline].startswith("<"): if document.body[ertcontfirstline].lstrip().startswith("<"):
# This is an overlay specification # This is an overlay specification
# strip off the < # strip off the <
document.body[ertcontfirstline] = document.body[ertcontfirstline][1:] document.body[ertcontfirstline] = document.body[ertcontfirstline].lstrip()[1:]
if document.body[ertcontlastline].endswith(">"): if document.body[ertcontlastline].rstrip().endswith(">"):
# strip off the > # strip off the >
document.body[ertcontlastline] = document.body[ertcontlastline][:-1] document.body[ertcontlastline] = document.body[ertcontlastline].rstrip()[:-1]
# Convert to ArgInset # Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 1" document.body[parbeg] = "\\begin_inset Argument 1"
elif document.body[ertcontlastline].endswith("}"): elif document.body[ertcontlastline].rstrip().endswith("}"):
# strip off the } # strip off the }
document.body[ertcontlastline] = document.body[ertcontlastline][:-1] document.body[ertcontlastline] = document.body[ertcontlastline].rstrip()[:-1]
# divide the args # divide the args
ertcontdivline = ertcontfirstline ertcontdivline = ertcontfirstline
tok = document.body[ertcontdivline].find('>{') tok = document.body[ertcontdivline].find('>{')
@ -3025,12 +3025,12 @@ def convert_beamerblocks(document):
document.body[ertcontdivline][tok + 2:]] 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[ertcontfirstline].startswith("{"): elif document.body[ertcontfirstline].lstrip().startswith("{"):
# This is the block title # This is the block title
if document.body[ertcontlastline].endswith("}"): if document.body[ertcontlastline].rstrip().endswith("}"):
# strip off the braces # strip off the braces
document.body[ertcontfirstline] = document.body[ertcontfirstline][1:] document.body[ertcontfirstline] = document.body[ertcontfirstline].lstrip()[1:]
document.body[ertcontlastline] = document.body[ertcontlastline][:-1] document.body[ertcontlastline] = document.body[ertcontlastline].rstrip()[:-1]
if ertcontfirstline < ertcontlastline: if ertcontfirstline < ertcontlastline:
# Multiline ERT. Might contain TeX code. Embrace in ERT. # Multiline ERT. Might contain TeX code. Embrace in ERT.
document.body[parend : parend + 1] = [ document.body[parend : parend + 1] = [

2
status.21x
View File

@ -67,6 +67,8 @@ What's new
- Fix conversion of beamer block titles ending with non-ERT insets to 2.1 format. - Fix conversion of beamer block titles ending with non-ERT insets to 2.1 format.
- Fix conversion of beamer blocks with preceding or trailing blanks.
- Add \justification parameter when converting to 2.1 format (avoids when - Add \justification parameter when converting to 2.1 format (avoids when
converting back to 2.0 format). converting back to 2.0 format).