Use new RequiredArgs tag to improve Beamer UI. Also includes a dummy

format bump so we can convert old Beamer files, which are otherwise
broken by the new layout.

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index ebbd2860b6cecd395d00d5376f192239e0930cae..9e1c69ddcc648eac7f166369d34adc2bcc861bbf 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -663,7 +663,8 @@ Style Block
   LabelSep         xx
 
   LatexName        block
-  LabelString      "Block ( ERT[{title}] body ):"
+  LabelString      "Block:"
+  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -689,8 +690,9 @@ Style ExampleBlock
   LabelSep         xx
 
   LatexName        exampleblock
-  LabelString      "Block ( ERT[{title}] example text ):"
-
+  LabelString      "Example Block:"
+  RequiredArgs     1
+  
   ParSkip          0.5
   TopSep           1
   BottomSep        1
@@ -719,8 +721,9 @@ Style AlertBlock
   LabelSep         xx
 
   LatexName        alertblock
-  LabelString      "Block ( ERT[{title}] alert text ):"
-
+  LabelString      "Alert Block:"
+  RequiredArgs     1
+  
   ParSkip          0.5
   TopSep           1
   BottomSep        1

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 7cb29353944724c479cabb5b65636f6bf65b8879..c4e457b8b6a548930877aaac1110a299f802fefc 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -126,7 +126,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 391; // edwin: decimal alignment in tables
+int const LYX_FORMAT = 392; // rgh: beamer layout change
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;