[LyX master] LaTeXFeatures.cpp: add multicol and shapepar

[Uwe Stöhr]

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit a2e6fc773a85787b70ed9c69581a20103a048cb8
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Thu May 30 17:55:21 2013 +0200

    LaTeXFeatures.cpp: add multicol and shapepar

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index c6611f2..064a5a5 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 cdc6242..1f65fb6 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 4cbdea6..924308c 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[] = {

-----------------------------------------------------------------------

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


hooks/post-receive
-- 
The LyX Source Repository