From 547bceb62e6a1c6b820410a38a1aab1bb2bf162f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 18 Jun 2007 18:21:29 +0000 Subject: [PATCH] LaTeXFeatures.cpp: Make the German Userguide compile again, fixes bug 3878 (http://bugzilla.lyx.org/show_bug.cgi?id=3878) Patch kindly provided by Georg. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18819 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LaTeXFeatures.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 00234b796c..dae61ec069 100644 --- 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 -- 2.39.2