LaTeXFeatures.cpp: add multicol and shapepar

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index c6611f225599fd5d392efc430b1f2d260af22429..064a5a52cba62b1150e171d71a3e1ce61f1dfa31 100644 (file)
--- 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 cdc62427543246d3ca326abdfa4925eda6ff0350..1f65fb6f5f8d8af0d5541f6b91082c4472f525d4 100644 (file)
--- 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 4cbdea6953eee8c10a71152dd55642932edb3d5a..924308c50c94e1d5886d78fbeb799e5bc13ce81b 100644 (file)
--- 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[] = {