From a2e6fc773a85787b70ed9c69581a20103a048cb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Thu, 30 May 2013 17:55:21 +0200
Subject: [PATCH] LaTeXFeatures.cpp: add multicol and shapepar

---
 lib/layouts/multicol.module | 8 +-------
 lib/layouts/shapepar.module | 2 +-
 src/LaTeXFeatures.cpp       | 4 +++-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index c6611f2255..064a5a52cb 100644
--- a/lib/layouts/multicol.module
+++ b/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
 
diff --git a/lib/layouts/shapepar.module b/lib/layouts/shapepar.module
index cdc6242754..1f65fb6f5f 100644
--- a/lib/layouts/shapepar.module
+++ b/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
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 4cbdea6953..924308c50c 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -731,8 +731,10 @@ char const * simplefeatures[] = {
 	"pdfpages",
 	"amscd",
 	"slashed",
+	"multicol",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"shapepar"
 };
 
 char const * bibliofeatures[] = {
-- 
2.39.2