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

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 67f84b996f..46df0fec7c 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -30,7 +30,6 @@
 
 #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();
@@ -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 *);