Fix bug 3148: always update the Labels if a DEPM is triggered.

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index ed5b8ccda735b9bd0be3990f7e88dd90ba99bbd8..46df0fec7c3b51ddfd857e97df6c106e4be37daa 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -17,23 +17,27 @@
 #include "LaTeXFeatures.h"
 
 #include "bufferparams.h"
+#include "Color.h"
 #include "debug.h"
 #include "encoding.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "LColor.h"
 #include "language.h"
 #include "lyxlex.h"
 #include "lyx_sty.h"
 #include "lyxrc.h"
 
+#include "support/docstream.h"
 #include "support/filetools.h"
 
-#include <sstream>
 
-using lyx::support::isSGMLFilename;
-using lyx::support::libFileSearch;
-using lyx::support::makeRelPath;
-using lyx::support::onlyPath;
+namespace lyx {
+
+using support::isSGMLFilename;
+using support::libFileSearch;
+using support::makeRelPath;
+using support::onlyPath;
 
 using std::endl;
 using std::find;
@@ -43,9 +47,6 @@ using std::ostream;
 using std::ostringstream;
 using std::set;
 
-namespace biblio = lyx::biblio;
-
-
 LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
 
 
@@ -75,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;
@@ -103,8 +104,6 @@ void LaTeXFeatures::getAvailable()
                                packages_.push_back(name);
                }
        }
-
-       return;
 }
 
 
@@ -161,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();
@@ -189,7 +188,7 @@ void LaTeXFeatures::useLanguage(Language const * lang)
 }
 
 
-void LaTeXFeatures::includeFile(string const & key, string const & name)
+void LaTeXFeatures::includeFile(docstring const & key, string const & name)
 {
        IncludedFiles_[key] = name;
 }
@@ -220,8 +219,12 @@ 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)
-                       encodings.insert((*it)->encoding()->LatexName());
+               // 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;
 }
 
@@ -239,10 +242,14 @@ char const * simplefeatures[] = {
        "varioref",
        "prettyref",
        "float",
+       "booktabs",
        "dvipost",
        "fancybox",
        "calc",
        "nicefrac",
+       "tipa",
+       "framed",
+       "textcomp",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -272,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
@@ -293,7 +306,7 @@ string const LaTeXFeatures::getPackages() const
 
        // makeidx.sty
        if (isRequired("makeidx")) {
-               if (! tclass.provides(LyXTextClass::makeidx))
+               if (!tclass.provides(LyXTextClass::makeidx))
                        packages << "\\usepackage{makeidx}\n";
                packages << "\\makeindex\n";
        }
@@ -307,6 +320,12 @@ string const LaTeXFeatures::getPackages() const
                                 << params_.graphicsDriver
                                 << "]{graphicx}\n";
        }
+       // shadecolor for shaded
+       if (isRequired("framed")) {
+               RGBColor c = RGBColor(lcolor.getX11Name(LColor::shadedbg));
+               packages << "\\definecolor{shadecolor}{rgb}{" 
+                       << c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
+       }
 
        //if (algorithm) {
        //      packages << "\\usepackage{algorithm}\n";
@@ -342,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"
@@ -372,6 +397,14 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\usepackage[dot]{bibtopic}\n";
        }
 
+       if (isRequired("xy"))
+               packages << "\\usepackage[all]{xy}\n";
+
+       if (isRequired("nomencl")) {
+               packages << "\\usepackage{nomencl}[2005/09/22]\n"
+                        << "\\makenomenclature\n";
+       }
+ 
        return packages.str();
 }
 
@@ -462,11 +495,11 @@ string const LaTeXFeatures::getBabelOptions() const
 }
 
 
-string const LaTeXFeatures::getTClassPreamble() const
+docstring const LaTeXFeatures::getTClassPreamble() const
 {
        // the text class specific preamble
        LyXTextClass const & tclass = params_.getLyXTextClass();
-       ostringstream tcpreamble;
+       odocstringstream tcpreamble;
 
        tcpreamble << tclass.preamble();
 
@@ -487,10 +520,10 @@ string const LaTeXFeatures::getTClassPreamble() const
 }
 
 
-string const LaTeXFeatures::getLyXSGMLEntities() const
+docstring const LaTeXFeatures::getLyXSGMLEntities() const
 {
        // Definition of entities used in the document that are LyX related.
-       ostringstream entities;
+       odocstringstream entities;
 
        if (isRequired("lyxarrow")) {
                entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
@@ -500,9 +533,9 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 }
 
 
-string const LaTeXFeatures::getIncludedFiles(string const & fname) const
+docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
 {
-       ostringstream sgmlpreamble;
+       odocstringstream sgmlpreamble;
        string const basename = onlyPath(fname);
 
        FileMap::const_iterator end = IncludedFiles_.end();
@@ -510,7 +543,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
             fi != end; ++fi)
                sgmlpreamble << "\n<!ENTITY " << fi->first
                             << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
-                            << makeRelPath(fi->second, basename) << "\">";
+                            << from_ascii(makeRelPath(fi->second, basename)) << "\">";
 
        return sgmlpreamble.str();
 }
@@ -520,7 +553,7 @@ void LaTeXFeatures::showStruct() const {
        lyxerr << "LyX needs the following commands when LaTeXing:"
               << "\n***** Packages:" << getPackages()
               << "\n***** Macros:" << getMacros()
-              << "\n***** Textclass stuff:" << getTClassPreamble()
+              << "\n***** Textclass stuff:" << to_utf8(getTClassPreamble())
               << "\n***** done." << endl;
 }
 
@@ -603,3 +636,6 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
                }
        }
 }
+
+
+} // namespace lyx