commit 98ab605041917d912e20c898c02c969d41243f69
Author: Juergen Spitzmueller <[email protected]>
Date: Sat Aug 30 13:24:29 2014 +0200
Fix lyx2lyx issue with complex beamer arguments.
Fixes: #9254
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 91ed291..d9bedf4 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3113,11 +3113,19 @@ def convert_beamerblocks(document):
# 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',
-
'status collapsed', '', '\\begin_layout Plain Layout',
-
'\\begin_inset ERT', '', 'status open' '', '\\begin_layout Plain Layout',
-
document.body[ertcontdivline][tok + 2:]]
+ if ertcontdivline == ertcontfirstline:
+ document.body[ertcontdivline :
ertcontdivline + 1] = [document.body[ertcontdivline][:tok],
+
'\\end_layout', '', '\\end_inset', '',
+
'\\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:]]
+ else:
+ document.body[ertcontdivline :
ertcontdivline + 1] = [document.body[ertcontdivline][: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:]]
else:
document.body[ertcontdivline :
ertcontdivline + 1] = [document.body[ertcontdivline][:tok],
'\\end_layout', '', '\\end_inset', '', '', '\\begin_inset Argument 2',
