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 a4f0eac816d48d6e9cdeedb58a889e116313aa94..c7c05e59ccc3373403d4024a172320f0a83794ec 100644 (file)
--- 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 02cc1f0fca0fed11505156d2f187cd620965c9dd..530446472b154a2474f43decfc6bcf9b3ca3058a 100644 (file)
--- 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, []],