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

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 921c15ef78..67f84b996f 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -28,14 +28,17 @@
 #include "lyx_sty.h"
 #include "lyxrc.h"
 
+#include "support/docstream.h"
 #include "support/filetools.h"
-
 #include <sstream>
 
-using lyx::support::isSGMLFilename;
-using lyx::support::libFileSearch;
-using lyx::support::makeRelPath;
-using lyx::support::onlyPath;
+
+namespace lyx {
+
+using support::isSGMLFilename;
+using support::libFileSearch;
+using support::makeRelPath;
+using support::onlyPath;
 
 using std::endl;
 using std::find;
@@ -45,9 +48,6 @@ using std::ostream;
 using std::ostringstream;
 using std::set;
 
-namespace biblio = lyx::biblio;
-
-
 LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
 
 
@@ -191,7 +191,7 @@ void LaTeXFeatures::useLanguage(Language const * lang)
 }
 
 
-void LaTeXFeatures::includeFile(string const & key, string const & name)
+void LaTeXFeatures::includeFile(docstring const & key, string const & name)
 {
 	IncludedFiles_[key] = name;
 }
@@ -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
@@ -314,7 +320,7 @@ string const LaTeXFeatures::getPackages() const
 	}
 	// shadecolor for shaded
 	if (isRequired("framed")) {
-	lyx::RGBColor c = lyx::RGBColor(lcolor.getX11Name(LColor::shadedbg));
+		RGBColor c = RGBColor(lcolor.getX11Name(LColor::shadedbg));
 		packages << "\\definecolor{shadecolor}{rgb}{" 
 			<< c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
 	}
@@ -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"
@@ -383,6 +395,14 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage[dot]{bibtopic}\n";
 	}
 
+	if (isRequired("xy"))
+		packages << "\\usepackage[all]{xy}\n";
+
+	if (isRequired("nomencl")) {
+		packages << "\\usepackage{nomencl}[2005/09/22]\n"
+			 << "\\makenomenclature\n";
+	}
+ 
 	return packages.str();
 }
 
@@ -473,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();
 
@@ -498,10 +518,10 @@ string const LaTeXFeatures::getTClassPreamble() const
 }
 
 
-string const LaTeXFeatures::getLyXSGMLEntities() const
+docstring const LaTeXFeatures::getLyXSGMLEntities() const
 {
 	// Definition of entities used in the document that are LyX related.
-	ostringstream entities;
+	odocstringstream entities;
 
 	if (isRequired("lyxarrow")) {
 		entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
@@ -511,9 +531,9 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 }
 
 
-string const LaTeXFeatures::getIncludedFiles(string const & fname) const
+docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
 {
-	ostringstream sgmlpreamble;
+	odocstringstream sgmlpreamble;
 	string const basename = onlyPath(fname);
 
 	FileMap::const_iterator end = IncludedFiles_.end();
@@ -521,7 +541,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
 	     fi != end; ++fi)
 		sgmlpreamble << "\n<!ENTITY " << fi->first
 			     << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
-			     << makeRelPath(fi->second, basename) << "\">";
+			     << from_ascii(makeRelPath(fi->second, basename)) << "\">";
 
 	return sgmlpreamble.str();
 }
@@ -531,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;
 }
 
@@ -614,3 +634,6 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 		}
 	}
 }
+
+
+} // namespace lyx