The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 5a016dc85d3a2525967b35eb5234d23d2ebac27c
Author: Juergen Spitzmueller <[email protected]>
Date:   Fri Nov 23 17:25:08 2012 +0100

    support beamer columns option

diff --git a/lib/examples/beamerlyxexample1.lyx 
b/lib/examples/beamerlyxexample1.lyx
index a59c859..f12a72b 100644
--- a/lib/examples/beamerlyxexample1.lyx
+++ b/lib/examples/beamerlyxexample1.lyx
@@ -1365,12 +1365,11 @@ onslide<1,3,5,7,9,11-12>
 \end_layout
 
 \begin_layout Columns
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-[t,onlytextwidth]
+t,onlytextwidth
 \end_layout
 
 \end_inset
@@ -3171,12 +3170,11 @@ nointerlineskip
 \end_layout
 
 \begin_layout Columns
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-[t]
+t
 \end_layout
 
 \end_inset
@@ -3833,12 +3831,11 @@ nointerlineskip
 \end_layout
 
 \begin_layout Columns
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-[t,onlytextwidth]
+t,onlytextwidth
 \end_layout
 
 \end_inset
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index c3e8457..0c1e210 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -526,9 +526,14 @@ Style Columns
   LabelType        Static
   LabelSep         xx
 
-  LatexName        columns}%{
+  LatexName        columns
   LabelString      "Columns"
   LeftMargin       "Columnsxx"
+  
+  Argument 1
+       LabelString   "Columns Options"
+       Tooltip       "Columns options (see beamer manual)"
+  EndArgument
 
   ParSkip          0.5
   TopSep           1

-----------------------------------------------------------------------

Summary of changes:
 lib/examples/beamerlyxexample1.lyx |   21 +++++++++------------
 lib/layouts/beamer.layout          |    7 ++++++-
 2 files changed, 15 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to