* BufferParams:

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 4d82a9bde20772b8b38f3f2a35146495e23cd2e5..63f74837cd5700e480b0935244dd2de3b768fa9b 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -31,6 +31,7 @@
 #include "support/docstream.h"
 #include "support/filetools.h"
 
+#include "frontends/controllers/biblio.h"
 
 namespace lyx {
 
@@ -104,8 +105,6 @@ void LaTeXFeatures::getAvailable()
                                packages_.push_back(name);
                }
        }
-
-       return;
 }
 
 
@@ -154,7 +153,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 +161,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 +220,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;
 }
@@ -247,6 +250,7 @@ char const * simplefeatures[] = {
        "nicefrac",
        "tipa",
        "framed",
+       "textcomp",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -375,7 +379,7 @@ string const LaTeXFeatures::getPackages() const
        // natbib.sty
        if (isRequired("natbib") && ! tclass.provides(LyXTextClass::natbib)) {
                packages << "\\usepackage[";
-               if (params_.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL) {
+               if (params_.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL) {
                        packages << "numbers";
                } else {
                        packages << "authoryear";