X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmulticol.module;h=86d742925869b86ec365426fd5a39d8ee38fb6b6;hb=8d8ee12e6481a2d9687228a4a5f9dd44a21a052e;hp=f30b1140953230ce4ea8da20bb675de07537fdee;hpb=2a62a2c3957b89489580f59150c20e45a66e4b43;p=lyx.git

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index f30b114095..86d7429258 100644
--- a/lib/layouts/multicol.module
+++ b/lib/layouts/multicol.module
@@ -1,42 +1,36 @@
 #\DeclareLyXModule[multicol.sty]{Multiple Columns}
 #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.
+#Adds a custom inset whose content is set with multiple columns (2 by default).
+#See the Additional manual, section 'Multiple Text Columns', for a detailed
+#description of multiple columns.
 #DescriptionEnd
-#Author: Uwe Stöhr
+#Authors: Uwe Stöhr and Jürgen Spitzmüller
 
-Format 43
+Format 66
 
-Style "Begin Multiple Columns"
-  Category		MainText
-  Margin		First_Dynamic
-  LatexType		command
-  LabelType		Static
-  LabelSep		xx
-  LatexName	        begin{multicols}
-  LabelString		"---Begin Multiple Columns---"
-  #OptionalArgs		2
-  #RequiredArgs		1
-  KeepEmpty		1
-  ParSkip		0
-  TopSep		0
-  BottomSep		0
-  ParSep		0
-  Font
-    Color		Blue
-  EndFont
-  LabelFont
-    Color		Green
-  EndFont
-  Preamble
-    \usepackage{multicol}
-  EndPreamble
-End
-
-Style "End Multiple Columns"
-  CopyStyle		"Begin Multiple Columns"
-  LatexName	        end{multicols}
-  LabelString		"---End Multiple Columns---"
+InsetLayout Flex:Multiple_Columns
+  LyXType			custom
+  Decoration		classic
+  LabelString		Columns
+  LatexType			environment
+  LatexName			multicols
+  Requires			multicol
+  Argument 1
+    LabelString		"Number of Columns"
+    Tooltip			"Insert the number of columns here"
+    Mandatory		1
+    DefaultArg		2
+    PassThru		1
+  EndArgument
+  Argument 2
+    LabelString		"Preface"
+    Tooltip			"An optional preface"
+  EndArgument
+  Argument 3
+    LabelString		"Space Before Page Break"
+    Tooltip			"Free space that needs to be on the page to start the multiple columns on this page"
+    Requires		2
+  EndArgument
+	ResetsFont true
 End