From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 3 Aug 2014 10:21:35 +0000 (+0200)
Subject: Do not break documents with complex beamer block ERT usage we cannot handle
X-Git-Tag: 2.1.2~31
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=03d6040904019b1ee82fd9822a15cc0eaea6083f;p=features.git

Do not break documents with complex beamer block ERT usage we cannot handle

Fixes: #9144
---

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 1a24675532..91ed291d9a 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3245,7 +3245,10 @@ def convert_beamerblocks(document):
                                 # Multipar ERT. Skip this.
                                 break
                             else:
-                                convert_TeX_brace_to_Argument(document, i, 2, 2, False, True, False)
+                                # ERT has contents after the closing bracket. We cannot convert this.
+                                # convert_TeX_brace_to_Argument cannot either.
+                                #convert_TeX_brace_to_Argument(document, i, 2, 2, False, True, False)
+                                break
                         else:
                             break
                         j = find_end_of_layout(document.body, i)
diff --git a/status.21x b/status.21x
index 5f3fc6283d..f7f450fa53 100644
--- a/status.21x
+++ b/status.21x
@@ -62,7 +62,7 @@ What's new
   or older.
 
 - Fix several conversion problems of beamer box arguments when the
-  arguments use multiple ERTs (part of bug 9208, bug 9225).
+  arguments use multiple ERTs (part of bug 9208, bug 9225, bug 9144).
 
 - Fix conversion of beamer overlay arguments when the module
   "beamer-resenumerate" is used (part of bug 9208).