From: Richard Heck <rgheck@comcast.net>
Date: Fri, 24 Sep 2010 22:34:52 +0000 (+0000)
Subject: Revert the beamer changes from a while ago. They work with some documents,
X-Git-Tag: 2.0.0~2510
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7192937ab5a43edb45502f6f3182c57c7aa8ccc9;p=features.git

Revert the beamer changes from a while ago. They work with some documents,
but not with all. There's a general problem here that will take more work.
I've got most of it licked, but the lyx2lyx issue is difficult.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35495 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index a4f0eac816..c7c05e59cc 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -665,7 +665,6 @@ Style Block
 
   LatexName        block
   LabelString      "Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -692,7 +691,6 @@ Style ExampleBlock
 
   LatexName        exampleblock
   LabelString      "Example Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -723,7 +721,6 @@ Style AlertBlock
 
   LatexName        alertblock
   LabelString      "Alert Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index 02cc1f0fca..530446472b 100644
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -2254,7 +2254,7 @@ convert = [[346, []],
            [389, [convert_html_quotes]],
            [390, []],
            [391, []],
-           [392, [convert_beamer_args]],
+           [392, []],
            [393, [convert_optarg]],
            [394, [convert_use_makebox]],
            [395, []],