Fix conversion of beamer block titles when the language is switched at the beginning...

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index e6d0bdca5bdee0d679f34a074666021e71510558..2d523dbcfd66296dab3fb5b62b6312e1eefee5b6 100644 (file)
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3070,6 +3070,10 @@ def convert_beamerblocks(document):
             parend = parent[2]
             j = parend
             if i != -1:
+                # If the paragraph starts with a language switch, adjust parbeg
+                if len(document.body[parbeg]) == 0 and parbeg < parend \
+                and document.body[parbeg + 1].startswith("\\lang"):
+                    parbeg += 2
                 if document.body[parbeg] == "\\begin_inset ERT":
                     ertcontfirstline = parbeg + 5
                     lastertbeg = -1

diff --git a/status.21x b/status.21x
index 9ece51d7e9a69496602daf7a12936f846066c769..5f87cc5600ace54730aa97c9384587cb2c534e2d 100644 (file)
--- a/status.21x
+++ b/status.21x
@@ -105,6 +105,9 @@ What's new
 
 - Fix import of chunk insets containing newlines (bug 9300).
 
+- Fix import of ERT beamer block titles which are preceeded by a
+  language switch.
+
 
 * USER INTERFACE