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 1a2467553273e2f54082bca54f83ff282c0a016e..91ed291d9aa2f905b872ddba64d63ee3cdfb5f63 100644 (file)
--- 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 5f3fc6283ddce2377e6d135f3487ac49e5fbd697..f7f450fa53f471bf79b00b4f4979ecafc783a8ed 100644 (file)
--- 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).