Patch kindly provided by Georg.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18819
a592a061-630c-0410-9148-
cb99ea01b6c8
"soul",
"textcomp",
"xcolor",
"soul",
"textcomp",
"xcolor",
"pmboxdraw",
"bbding",
"ifsym",
"pmboxdraw",
"bbding",
"ifsym",
// are used
// wasysym redefines some integrals (e.g. iint) from amsmath. That
// leads to inconsistent integrals. We only load this package if
// 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
// 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
packages << "\\usepackage{wasysym}\n";
// color.sty