Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 70ae8a47c93eaba06f16c1ffcf4f71b13a422057..4bf391479ceca3ff925df5f4ccfac540e6341df6 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -81,9 +81,12 @@ void LaTeXFeatures::getAvailable()
 
        lex.setFile(real_file);
 
-       if (!lex.isOK()) 
+       if (!lex.isOK())
                return;
 
+       // Make sure that we are clean
+       packages_.clear();
+
        bool finished = false;
        // Parse config-file
        while (lex.isOK() && !finished) {
@@ -235,7 +238,6 @@ char const * simplefeatures[] = {
        "varioref",
        "prettyref",
        "float",
-       "wasysym",
        "dvipost",
        "fancybox",
        "calc",
@@ -272,6 +274,11 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\usepackage{amsmath}\n";
        }
 
+       // wasysym is a simple feature, but it must be after amsmath if both
+       // are used
+       if (isRequired("wasysym"))
+               packages << "\\usepackage{wasysym}\n";
+
        // color.sty
        if (isRequired("color")) {
                if (params_.graphicsDriver == "default")