X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=67f84b996f94b6cdbb4c04a123abffffe15e1f06;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=09806e090b6ec7b3c4616fc0c12ec3c92fa9f4e3;hpb=f8b9d95ee407c7867692f7e56b4ff06274463b58;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 09806e090b..67f84b996f 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -277,13 +277,19 @@ string const LaTeXFeatures::getPackages() const
 
 	if (isRequired("amsmath")
 	    && !tclass.provides(LyXTextClass::amsmath)
-	    && params_.use_amsmath != BufferParams::AMS_OFF) {
+	    && params_.use_amsmath != BufferParams::package_off) {
 		packages << "\\usepackage{amsmath}\n";
 	}
 
 	// wasysym is a simple feature, but it must be after amsmath if both
 	// are used
-	if (isRequired("wasysym"))
+	// 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.
+	// See http://bugzilla.lyx.org/show_bug.cgi?id=1942
+	if (isRequired("wasysym") && isRequired("esint") &&
+	    params_.use_esint != BufferParams::package_off)
 		packages << "\\usepackage{wasysym}\n";
 
 	// color.sty
@@ -353,8 +359,14 @@ string const LaTeXFeatures::getPackages() const
 	}
 
 	// amssymb.sty
-	if (isRequired("amssymb") || params_.use_amsmath == BufferParams::AMS_ON)
+	if (isRequired("amssymb") || params_.use_amsmath == BufferParams::package_on)
 		packages << "\\usepackage{amssymb}\n";
+
+	// esint must be after amsmath and wasysym, since it will redeclare
+	// inconsistent integral symbols
+	if (isRequired("esint") && params_.use_esint != BufferParams::package_off)
+		packages << "\\usepackage{esint}\n";
+
 	// url.sty
 	if (isRequired("url") && ! tclass.provides(LyXTextClass::url))
 		packages << "\\IfFileExists{url.sty}{\\usepackage{url}}\n"
@@ -386,6 +398,11 @@ string const LaTeXFeatures::getPackages() const
 	if (isRequired("xy"))
 		packages << "\\usepackage[all]{xy}\n";
 
+	if (isRequired("nomencl")) {
+		packages << "\\usepackage{nomencl}[2005/09/22]\n"
+			 << "\\makenomenclature\n";
+	}
+ 
 	return packages.str();
 }
 
@@ -476,11 +493,11 @@ string const LaTeXFeatures::getBabelOptions() const
 }
 
 
-string const LaTeXFeatures::getTClassPreamble() const
+docstring const LaTeXFeatures::getTClassPreamble() const
 {
 	// the text class specific preamble
 	LyXTextClass const & tclass = params_.getLyXTextClass();
-	ostringstream tcpreamble;
+	odocstringstream tcpreamble;
 
 	tcpreamble << tclass.preamble();
 
@@ -534,7 +551,7 @@ void LaTeXFeatures::showStruct() const {
 	lyxerr << "LyX needs the following commands when LaTeXing:"
 	       << "\n***** Packages:" << getPackages()
 	       << "\n***** Macros:" << getMacros()
-	       << "\n***** Textclass stuff:" << getTClassPreamble()
+	       << "\n***** Textclass stuff:" << to_utf8(getTClassPreamble())
 	       << "\n***** done." << endl;
 }