X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=46df0fec7c3b51ddfd857e97df6c106e4be37daa;hb=0da3d53269a49c66b24615d24e20e441dcf7c07e;hp=0ce379ef58282684581792e15aba1c4f1aedb194;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 0ce379ef58..46df0fec7c 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -28,10 +28,9 @@
 #include "lyx_sty.h"
 #include "lyxrc.h"
 
+#include "support/docstream.h"
 #include "support/filetools.h"
 
-#include <sstream>
-
 
 namespace lyx {
 
@@ -77,7 +76,7 @@ void LaTeXFeatures::require(string const & name)
 void LaTeXFeatures::getAvailable()
 {
 	LyXLex lex(0, 0);
-	string real_file = libFileSearch("", "packages.lst");
+	support::FileName const real_file = libFileSearch("", "packages.lst");
 
 	if (real_file.empty())
 		return;
@@ -105,8 +104,6 @@ void LaTeXFeatures::getAvailable()
 				packages_.push_back(name);
 		}
 	}
-
-	return;
 }
 
 
@@ -163,7 +160,7 @@ bool LaTeXFeatures::isAvailable(string const & name) const
 }
 
 
-void LaTeXFeatures::addExternalPreamble(string const & preamble)
+void LaTeXFeatures::addPreambleSnippet(string const & preamble)
 {
 	FeaturesList::const_iterator begin = preamble_snippets_.begin();
 	FeaturesList::const_iterator end   = preamble_snippets_.end();
@@ -191,7 +188,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;
 }
@@ -222,7 +219,11 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 	LanguageList::const_iterator it  = UsedLanguages_.begin();
 	LanguageList::const_iterator end = UsedLanguages_.end();
 	for (; it != end; ++it)
-		if ((*it)->encoding()->latexName() != doc_encoding)
+		// thailatex does not use the inputenc package, but sets up
+		// babel directly for tis620-0 encoding, therefore we must
+		// not add tis620-0 to the encoding set.
+		if ((*it)->encoding()->latexName() != doc_encoding &&
+		    (*it)->encoding()->name() != "tis620-0")
 			encodings.insert((*it)->encoding()->latexName());
 	return encodings;
 }
@@ -248,6 +249,7 @@ char const * simplefeatures[] = {
 	"nicefrac",
 	"tipa",
 	"framed",
+	"textcomp",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -277,13 +279,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 +361,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 +397,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 +495,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 +520,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 +533,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 +543,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 +553,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;
 }