* src/insets/insetcommand.C: fix plaintext() output

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 63dd2abfe606c82ac283b89e86426bb4e8464f56..16fe59da46e15820686ae7d2a0cdd0361df1eb44 100644 (file)
--- 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;
 }
 
 
@@ -155,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();
@@ -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 *);
@@ -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"