X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=16fe59da46e15820686ae7d2a0cdd0361df1eb44;hb=80328d2053869dc089c23c25adbed4167d7bf0b1;hp=18c348359a31ad3bcaf004ae11e5ce7c41bc4f49;hpb=ca5838b017d01afd7defa15fd46a0566d5a98f8d;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 18c348359a..16fe59da46 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -104,8 +104,6 @@ void LaTeXFeatures::getAvailable()
 				packages_.push_back(name);
 		}
 	}
-
-	return;
 }
 
 
@@ -154,7 +152,7 @@ bool LaTeXFeatures::isRequired(string const & name) const
 }
 
 
-bool LaTeXFeatures::isAvailable(string const & name) const
+bool LaTeXFeatures::isAvailable(string const & name)
 {
 	if (packages_.empty())
 		getAvailable();
@@ -162,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();
@@ -221,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;
 }