commit d98618c7db1a8e9ccc6a32ca598686d2276091b4
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Mar 24 21:43:25 2015 +0100
Fix thinko in convert_corollary_args
Fixes: #9478
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 798a36b..f5b3aee 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -2461,22 +2461,22 @@ def convert_corollary_args(document):
document.body[parbeg] = "\\begin_inset
Argument 1"
elif document.body[ertcontlastline].endswith("]"):
# divide the args
- ertcontdivline =
document.body[ertcontfirstline].find('>[')
- if ertcontdivline != -1:
+ tok = document.body[ertcontfirstline].find('>[')
+ if tok != -1:
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],
+ document.body[ertcontfirstline :
ertcontfirstline + 1] = [document.body[ertcontfirstline][:tok],
'\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2',
'status collapsed', '', '\\begin_layout Plain Layout',
'\\begin_inset ERT', '', 'status open' '', '\\begin_layout Plain Layout',
-
document.body[ertcontdivline][tok + 2:]]
+
document.body[ertcontfirstline][tok + 2:-1]]
else:
- document.body[ertcontdivline :
ertcontdivline + 1] = [document.body[ertcontdivline][:tok],
+ document.body[ertcontfirstline :
ertcontfirstline + 1] = [document.body[ertcontfirstline][:tok],
'\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2',
'status collapsed', '', '\\begin_layout Plain Layout',
-
document.body[ertcontdivline][tok + 2:]]
+
document.body[ertcontfirstline][tok + 2:-1]]
# Convert to ArgInset
document.body[parbeg] = "\\begin_inset Argument 1"
i = j
diff --git a/status.21x b/status.21x
index 6cca977..30adf9f 100644
--- a/status.21x
+++ b/status.21x
@@ -104,6 +104,8 @@ What's new
- Fix conversion of beamer block arguments where the overlay argument and the
closing title argument bracket share the same ERT (bug 9411).
+- Fix conversion of beamer colloraries with argument (bug 9478).
+
- Fix handling of the TEXINPUTS environment variable on Windows (bug 9453).
