* Only enter inset which return true on isActive(). This is the behavior in the curso...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 5902106485c5ee7bdbb10fe8a822bf0032954064..d03f964d035744d6a7c3a600f0e26c4d5a5d7eb6 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -171,6 +171,20 @@ static string const lyxdot_def =
        "%% A simple dot to overcome graphicx limitations\n"
        "\\newcommand{\\lyxdot}{.}\n";
 
+static string const changetracking_dvipost_def =
+       "%% Change tracking with dvipost\n"
+       "\\dvipostlayout\n"
+       "\\dvipost{osstart color push Red}\n"
+       "\\dvipost{osend color pop}\n"
+       "\\dvipost{cbstart color push Blue}\n"
+       "\\dvipost{cbend color pop}\n"
+       "\\newcommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n"
+       "\\newcommand{\\lyxdeleted}[3]{%\n"
+       "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n";
+
+static string const changetracking_none_def =
+       "\\newcommand{\\lyxadded}[3]{#3}\n"
+       "\\newcommand{\\lyxdeleted}[3]{}\n";
 
 
 /////////////////////////////////////////////////////////////////////
@@ -191,7 +205,8 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 bool LaTeXFeatures::useBabel() const
 {
        return lyxrc.language_use_babel ||
-               bufferParams().language->lang() != lyxrc.default_language ||
+               (bufferParams().language->lang() != lyxrc.default_language &&
+                !bufferParams().language->babel().empty()) ||
                this->hasLanguages();
 }
 
@@ -322,7 +337,8 @@ void LaTeXFeatures::useFloat(string const & name)
 
 void LaTeXFeatures::useLanguage(Language const * lang)
 {
-       UsedLanguages_.insert(lang);
+       if (!lang->babel().empty())
+               UsedLanguages_.insert(lang);
 }
 
 
@@ -342,26 +358,29 @@ string LaTeXFeatures::getLanguages() const
 {
        ostringstream languages;
 
-       for (LanguageList::const_iterator cit =
-                   UsedLanguages_.begin();
+       LanguageList::const_iterator const begin = UsedLanguages_.begin();
+       for (LanguageList::const_iterator cit = begin;
             cit != UsedLanguages_.end();
-            ++cit)
-               languages << (*cit)->babel() << ',';
+            ++cit) {
+               if (cit != begin)
+                       languages << ',';
+               languages << (*cit)->babel();
+       }
        return languages.str();
 }
 
 
 set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
+       // This does only find encodings of languages supported by babel, but
+       // that does not matter since we don't have a language with an
+       // encoding supported by inputenc but without babel support.
        set<string> encodings;
        LanguageList::const_iterator it  = UsedLanguages_.begin();
        LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
-               // 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")
+                   (*it)->encoding()->package() == Encoding::inputenc)
                        encodings.insert((*it)->encoding()->latexName());
        return encodings;
 }
@@ -369,6 +388,7 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 namespace {
 
 char const * simplefeatures[] = {
+// note that the package order here will be the same in the LaTeX-output
        "array",
        "verbatim",
        "longtable",
@@ -387,7 +407,18 @@ char const * simplefeatures[] = {
        "nicefrac",
        "tipa",
        "framed",
+       "pdfcolmk",
+       "soul",
        "textcomp",
+       "xcolor",
+       "wasysym",
+       "pmboxdraw",
+       "bbding",
+       "ifsym",
+       "marvosym",
+       "txfonts",
+       "mathrsfs",
+       "ascii",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -458,10 +489,18 @@ string const LaTeXFeatures::getPackages() const
                                 << "]{graphicx}\n";
        }
        // shadecolor for shaded
-       if (mustProvide("framed")) {
+       if (mustProvide("framed") && mustProvide("color")) {
                RGBColor c = RGBColor(lcolor.getX11Name(Color::shadedbg));
-               packages << "\\definecolor{shadecolor}{rgb}{" 
-                       << c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
+               //255.0 to force conversion to double
+               //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
+               //to use the xcolor package instead, and then we can do
+               // \define{shadcolor}{RGB}...
+               //and not do any conversion. We'd then need to require xcolor
+               //in InsetNote::validate().
+               int const stmSize = packages.precision(2);
+               packages << "\\definecolor{shadecolor}{rgb}{"
+                       << c.r/255.0 << ',' << c.g/255.0 << ',' << c.b/255.0 << "}\n";
+               packages.precision(stmSize);
        }
 
        // lyxskak.sty --- newer chess support based on skak.sty
@@ -494,13 +533,13 @@ string const LaTeXFeatures::getPackages() const
        }
 
        // amssymb.sty
-       if (mustProvide("amssymb") 
+       if (mustProvide("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 (mustProvide("esint") 
+       if (mustProvide("esint")
            && params_.use_esint != BufferParams::package_off)
                packages << "\\usepackage{esint}\n";
 
@@ -539,12 +578,15 @@ string const LaTeXFeatures::getPackages() const
                // but don't use the compatibility option since it is
                // incompatible to other packages.
                packages << "\\usepackage{nomencl}\n"
-                           "% the following is useful when we have the old nomencl.sty package\n"
-                           "\\providecommand{\\printnomenclature}{\\printglossary}\n"
-                           "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
-                           "\\makenomenclature\n";
+                           "% the following is useful when we have the old nomencl.sty package\n"
+                           "\\providecommand{\\printnomenclature}{\\printglossary}\n"
+                           "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
+                           "\\makenomenclature\n";
        }
- 
+
+       if (mustProvide("listings"))
+               packages << "\\usepackage{listings}\n";
+
        return packages.str();
 }
 
@@ -615,6 +657,26 @@ string const LaTeXFeatures::getMacros() const
        // floats
        getFloatDefinitions(macros);
 
+       // change tracking
+       if (mustProvide("ct-dvipost")) {
+               macros << changetracking_dvipost_def;
+       }
+       if (mustProvide("ct-xcolor-soul")) {
+               RGBColor cadd = RGBColor(lcolor.getX11Name(Color::addedtext));
+               macros << "\\providecolor{lyxadded}{rgb}{"
+                      << cadd.r/255 << ',' << cadd.g/255 << ',' << cadd.b/255 << "}\n";
+
+               RGBColor cdel = RGBColor(lcolor.getX11Name(Color::deletedtext));
+               macros << "\\providecolor{lyxdeleted}{rgb}{"
+                      << cdel.r/255 << ',' << cdel.g/255 << ',' << cdel.b/255 << "}\n";
+
+               macros << "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
+                      << "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\st{#3}}}\n";
+       }
+       if (mustProvide("ct-none")) {
+               macros << changetracking_none_def;
+       }
+
        return macros.str();
 }