X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmulticol.module;h=c1f4a76500670145c805ed1335b6ad6e205f2e44;hb=2a72fa3a041ddb5061aef564ce779a5d01a7c216;hp=2cd4e7f5f2316b5e4dcb567a073f5057551bf59b;hpb=f1b40f986730f12fa8814fcae4d9f7b135bcbb9a;p=lyx.git

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index 2cd4e7f5f2..c1f4a76500 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 35
+Format 69
 
-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