Transfer the setting of the current LyXView from workArea::focusInEvent() to GuiView...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index d22f881d7f934f742b89ce42effc5dd80043c294..2db41bf4caa51fe2bb43979291d9484ad3aa56f0 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -23,6 +23,7 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "Language.h"
+#include "Layout.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
@@ -397,10 +398,10 @@ char const * simplefeatures[] = {
        "subfigure",
        "varioref",
        "prettyref",
-       /* For a successful cooperation of the `wrapfig' package with the
-          `float' package you should load the `wrapfig' package *after*
-          the `float' package. See the caption package documentation
-          for explanation.*/
+       /*For a successful cooperation of the `wrapfig' package with the
+         `float' package you should load the `wrapfig' package *after*
+         the `float' package. See the caption package documentation
+         for explanation.*/
        "float",
        "wrapfig",
        "booktabs",
@@ -421,6 +422,7 @@ char const * simplefeatures[] = {
        "txfonts",
        "mathrsfs",
        "ascii",
+       "url",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -549,11 +551,6 @@ string const LaTeXFeatures::getPackages() const
            params_.use_esint != BufferParams::package_off)
                packages << "\\usepackage{esint}\n";
 
-       // url.sty
-       if (mustProvide("url"))
-               packages << "\\IfFileExists{url.sty}{\\usepackage{url}}\n"
-                           "                      {\\newcommand{\\url}{\\texttt}}\n";
-
        // natbib.sty
        if (mustProvide("natbib")) {
                packages << "\\usepackage[";