LaTeXFeatures.cpp: Make the German Userguide compile again, fixes bug 3878 (http...

Patch kindly provided by Georg.

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

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 00234b796c895fa019f739252fec904e07271d46..dae61ec0695457ecc983d48d66a40571f956eb64 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -411,7 +411,6 @@ char const * simplefeatures[] = {
        "soul",
        "textcomp",
        "xcolor",
-       "wasysym",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -455,11 +454,12 @@ string const LaTeXFeatures::getPackages() const
        // are used
        // wasysym redefines some integrals (e.g. iint) from amsmath. That
        // leads to inconsistent integrals. We only load this package if
-       // esint is used, since esint redefines all relevant integral
-       // symbols from wasysym and amsmath.
+       // the document does not contain integrals (then isRequired("esint")
+       // is false) or if esint is used, since esint redefines all relevant
+       // integral symbols from wasysym and amsmath.
        // See http://bugzilla.lyx.org/show_bug.cgi?id=1942
-       if (mustProvide("wasysym") && isRequired("esint") &&
-           params_.use_esint != BufferParams::package_off)
+       if (mustProvide("wasysym") &&
+           (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
                packages << "\\usepackage{wasysym}\n";
 
        // color.sty