some more uses of Requires.

The package ifthen needs to be added to LaTeXConfig.lyx. I'll do this when that file can be opened again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22419 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 437127976828c9314111dd6bd2b75bd0eec1f5bc..c354476f3a4b5ab3b7202213fa9292f3867084c4 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -231,6 +231,7 @@
 \TestPackage{endnotes}
 \TestPackage{enumitem}
 \TestPackage{esint}
+\TestPackage{ifthen}
 \TestPackage{fancybox}
 \TestPackage{fancyhdr}
 \TestPackage{framed}

diff --git a/lib/layouts/amsart-plain.layout b/lib/layouts/amsart-plain.layout
index ce23eddd4972e1f94402385bdcb4251438af9ced..bbbb724250e68cd0e4ee24f3a8cbf372ef81c6a4 100644 (file)
--- a/lib/layouts/amsart-plain.layout
+++ b/lib/layouts/amsart-plain.layout
@@ -17,8 +17,10 @@ Input amsart.layout
 
 # Use a simpler preamble.
 Preamble
-       \usepackage{amsmath,amsthm}
+       \usepackage{amsthm}
        \usepackage{amsfonts}
 EndPreamble
 
+Requires       amsmath
+
 Input amsmaths-plain.inc

diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout
index 1bfd23bf16a055a666dc896e8e83ca6fe49c16fb..461fb20bda572879af09010ffeb5779d63c006f3 100644 (file)
--- a/lib/layouts/entcs.layout
+++ b/lib/layouts/entcs.layout
@@ -11,8 +11,10 @@ ClassOptions
        FontSize   11
 End
 
+Requires       ifthen
+
 Preamble
-       \usepackage{entcsmacro,ifthen}
+       \usepackage{entcsmacro}
        \newcommand{\theTitle}[1]{}
        \newcommand{\theAuthor}[1]{}
        \newcommand{\theAddress}[1]{}

diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout
index b8279451d6c3f9039a952e6f1bbcb9d15179af67..062f2fc6d677b5b7608760c58f4501c5dff1e86b 100644 (file)
--- a/lib/layouts/foils.layout
+++ b/lib/layouts/foils.layout
@@ -95,9 +95,7 @@ Style TickList
        AlignPossible         Block, Left
        LabelType             Static
        LabelString           "_/"
-       Preamble
-          \usepackage{pifont}
-       EndPreamble
+       Requires              pifont
 End
 
 Style CrossList
@@ -116,9 +114,7 @@ Style CrossList
        AlignPossible         Block, Left
        LabelType             Static
        LabelString           "><"
-       Preamble
-         \usepackage{pifont}
-       EndPreamble
+       Requires              pifont
 End
 
 

diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module
index 6ad06a9f591810c66db4910cf43cb328c314fffe..3ac84748d5e99d8ec8d7fa1583796919dda9e4ce 100644 (file)
--- a/lib/layouts/hanging.module
+++ b/lib/layouts/hanging.module
@@ -15,8 +15,8 @@ Style Hanging
   Margin Static
   LeftMargin "MMMM"
   ParIndent "-MMMM"
+  Requires     ifthen
   Preamble
-    \usepackage{ifthen}
     \newlength{\lyxhang}
     \IfFileExists{hanging.sty}{
       \usepackage{hanging}

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 17d3d5660da80df07c39244907bebb9d07a25ec4..46ddf5f379fa3efee78f1a752cb6de36d335b46e 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -43,6 +43,8 @@
 #      FreeSpacing           Preserve multiple spaces etc.
 #      ForceLTR              Force the "latex" language, leading to Left-to-Right
 #                           (latin) output, e.g., in ERT or URL. A kludge.
+#      Requires              Require a given (supported) feature. Multiple features must
+#                            be comma-separated.
 #End
 
 Format 6
@@ -247,9 +249,7 @@ InsetLayout URL
          Color               Blue
          Size                Small
        EndFont
-       Preamble
-         \usepackage{url}
-       EndPreamble
+       Requires              url
 End
 
 InsetLayout OptArg

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 887651d4c58b96206c18b9c8f1a971445aa55688..2a3eec1efb4c67f1445d24049011dbca3804f15e 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -533,7 +533,8 @@ char const * simplefeatures[] = {
        "covington",
        "csquotes",
        "enumitem",
-       "endnotes"
+       "endnotes",
+       "ifthen"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);