formatting

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 18c348359a31ad3bcaf004ae11e5ce7c41bc4f49..faf5df9b82efbe88a6acca9335afbcfe835ff357 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -104,8 +104,6 @@ void LaTeXFeatures::getAvailable()
                                packages_.push_back(name);
                }
        }
-
-       return;
 }
 
 
@@ -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;
 }