X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=d5163a09d4328c7ec2a5bc3cdf41d464baaac6eb;hb=559c2f648239fff4fec769b34b30ccff23491e31;hp=00234b796c895fa019f739252fec904e07271d46;hpb=2149a73b7b8d958105dc4da7b3cea200ed025c73;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 00234b796c..d5163a09d4 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -31,13 +31,6 @@
 
 #include "frontends/controllers/frontend_helpers.h"
 
-namespace lyx {
-
-using support::isSGMLFilename;
-using support::libFileSearch;
-using support::makeRelPath;
-using support::onlyPath;
-
 using std::endl;
 using std::find;
 using std::string;
@@ -46,6 +39,14 @@ using std::ostream;
 using std::ostringstream;
 using std::set;
 
+
+namespace lyx {
+
+using support::isSGMLFilename;
+using support::libFileSearch;
+using support::makeRelPath;
+using support::onlyPath;
+
 /////////////////////////////////////////////////////////////////////
 //
 // Strings
@@ -254,7 +255,7 @@ void LaTeXFeatures::getAvailable()
 }
 
 
-void LaTeXFeatures::useLayout(string const & layoutname)
+void LaTeXFeatures::useLayout(docstring const & layoutname)
 {
 	// Some code to avoid loops in dependency definition
 	static int level = 0;
@@ -262,15 +263,15 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 	if (level > maxlevel) {
 		lyxerr << "LaTeXFeatures::useLayout: maximum level of "
 		       << "recursion attained by layout "
-		       << layoutname << endl;
+		       << to_utf8(layoutname) << endl;
 		return;
 	}
 
 	TextClass const & tclass = params_.getTextClass();
 	if (tclass.hasLayout(layoutname)) {
 		// Is this layout already in usedLayouts?
-		list<string>::const_iterator cit = usedLayouts_.begin();
-		list<string>::const_iterator end = usedLayouts_.end();
+		list<docstring>::const_iterator cit = usedLayouts_.begin();
+		list<docstring>::const_iterator end = usedLayouts_.end();
 		for (; cit != end; ++cit) {
 			if (layoutname == *cit)
 				return;
@@ -285,7 +286,7 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 		usedLayouts_.push_back(layoutname);
 	} else {
 		lyxerr << "LaTeXFeatures::useLayout: layout `"
-		       << layoutname << "' does not exist in this class"
+		       << to_utf8(layoutname) << "' does not exist in this class"
 		       << endl;
 	}
 
@@ -411,7 +412,6 @@ char const * simplefeatures[] = {
 	"soul",
 	"textcomp",
 	"xcolor",
-	"wasysym",
 	"pmboxdraw",
 	"bbding",
 	"ifsym",
@@ -446,8 +446,11 @@ string const LaTeXFeatures::getPackages() const
 	// than those above.
 	//
 
-	if (mustProvide("amsmath")
-	    && params_.use_amsmath != BufferParams::package_off) {
+	// esint is preferred for esintoramsmath
+	if ((mustProvide("amsmath") &&
+	     params_.use_amsmath != BufferParams::package_off) ||
+	    (mustProvide("esintoramsmath") &&
+	     params_.use_esint == BufferParams::package_off)) {
 		packages << "\\usepackage{amsmath}\n";
 	}
 
@@ -455,11 +458,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
@@ -539,8 +543,8 @@ string const LaTeXFeatures::getPackages() const
 
 	// esint must be after amsmath and wasysym, since it will redeclare
 	// inconsistent integral symbols
-	if (mustProvide("esint")
-	    && params_.use_esint != BufferParams::package_off)
+	if ((mustProvide("esint") || mustProvide("esintoramsmath")) &&
+	    params_.use_esint != BufferParams::package_off)
 		packages << "\\usepackage{esint}\n";
 
 	// url.sty
@@ -709,8 +713,8 @@ docstring const LaTeXFeatures::getTClassPreamble() const
 
 	tcpreamble << tclass.preamble();
 
-	list<string>::const_iterator cit = usedLayouts_.begin();
-	list<string>::const_iterator end = usedLayouts_.end();
+	list<docstring>::const_iterator cit = usedLayouts_.begin();
+	list<docstring>::const_iterator end = usedLayouts_.end();
 	for (; cit != end; ++cit) {
 		tcpreamble << tclass[*cit]->preamble();
 	}