X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmulticol.module;h=60364c7a552c3d3e9a4b440400d948415953ad00;hb=0c993b513588454e9bbfecb27b6f160c79188d21;hp=c1fb4ac8b6599d62e11e0394cfb6b8518c315d2d;hpb=8ba08a53b2ac7039126a0b90fce5d19374c781ea;p=lyx.git

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index c1fb4ac8b6..60364c7a55 100644
--- a/lib/layouts/multicol.module
+++ b/lib/layouts/multicol.module
@@ -2,11 +2,18 @@
 #DescriptionBegin
 #Adds 2 styles to begin and end text in multiple columns.
 #The begin style contains the number of columns, the end style must be kept empty.
-#See the Additional manual for a detailed description of multiple columns.
+#See the Additional manual, section 'Multiple Text Columns', for a detailed
+#description of multiple columns.
 #DescriptionEnd
 #Author: Uwe Stöhr
 
-Format 36
+Format 43
+
+AddToPreamble
+ % used for multiple text columns
+ \usepackage{multicol}
+
+EndPreamble
 
 Style "Begin Multiple Columns"
   Category		MainText
@@ -16,8 +23,14 @@ Style "Begin Multiple Columns"
   LabelSep		xx
   LatexName	        begin{multicols}
   LabelString		"---Begin Multiple Columns---"
-  #OptionalArgs		2
-  #RequiredArgs		1
+  Argument post:1
+    LabelString		"Preface"
+    Tooltip		"An optional preface"
+  EndArgument
+  Argument post:2
+    LabelString		"Space Before Page Break"
+    Tooltip		"Free space that needs to be on the page to start the multiple columns on this page"
+  EndArgument
   KeepEmpty		1
   ParSkip		0
   TopSep		0
@@ -29,14 +42,12 @@ Style "Begin Multiple Columns"
   LabelFont
     Color		Green
   EndFont
-  Preamble
-    \usepackage{multicol}
-  EndPreamble
 End
 
 Style "End Multiple Columns"
   CopyStyle		"Begin Multiple Columns"
   LatexName	        end{multicols}
   LabelString		"---End Multiple Columns---"
+  ResetArgs		1
 End