LaTeXFeatures.cpp: add multicol and shapepar

lib/layouts/multicol.module

@@ -8,18 +8,13 @@
 
 Format 45
 
-AddToPreamble
-% used for multiple text columns
-\usepackage{multicol}
-
-EndPreamble
-
 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"
@@ -35,6 +30,5 @@ InsetLayout Flex:Multiple_Columns
     Tooltip             "Free space that needs to be on the page to start the multiple columns on this page"
     Requires            2
   EndArgument
-  Requires              multicol
 End
 

lib/layouts/shapepar.module

@@ -10,7 +10,6 @@ Format 45
 
 AddToPreamble
  % used for custom paragraph shapes
- \usepackage{shapepar}
  \IfFileExists{candleshape.def}{%
   \input{candleshape.def}}{}
  \IfFileExists{dropshape.def}{%
@@ -27,6 +26,7 @@ EndPreamble
 Style "CD label"
 	LatexType	command
 	LatexName	CDlabel
+	Requires	shapepar
 	Category	ShapedParagraphs
 	NextNoIndent	1
 	Margin		Static

src/LaTeXFeatures.cpp

@@ -731,8 +731,10 @@ char const * simplefeatures[] = {
 	"pdfpages",
 	"amscd",
 	"slashed",
+	"multicol",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"shapepar"
 };
 
 char const * bibliofeatures[] = {