* 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 c5f73a9cdf4e1cadead2ccabf85a0f096e6d3c3a..d03f964d035744d6a7c3a600f0e26c4d5a5d7eb6 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -178,18 +178,13 @@ static string const changetracking_dvipost_def =
        "\\dvipost{osend color pop}\n"
        "\\dvipost{cbstart color push Blue}\n"
        "\\dvipost{cbend color pop}\n"
-       "\\newcommand{\\lyxinserted}[3]{\\changestart#3\\changeend}\n"
+       "\\newcommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n"
        "\\newcommand{\\lyxdeleted}[3]{%\n"
        "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n";
 
-// TODO
-//static string const changetracking_soul_def =
-//     "\\newcommand{\\lyxinserted}[3]{\\uwave{\\textcolor{blue}{#3}}}\n"
-//     "\\newcommand{\\lyxdeleted}[3]{\\sout{\\textcolor{red}{#3}}}";
-
 static string const changetracking_none_def =
-       "\\newcommand{\\lyxinserted}[3]{#3}\n"
-       "\\newcommand{\\lyxdeleted}[3]{}";
+       "\\newcommand{\\lyxadded}[3]{#3}\n"
+       "\\newcommand{\\lyxdeleted}[3]{}\n";
 
 
 /////////////////////////////////////////////////////////////////////
@@ -393,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",
@@ -411,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 *);
@@ -482,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
@@ -518,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";
 
@@ -563,15 +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();
 }
 
@@ -643,10 +658,24 @@ string const LaTeXFeatures::getMacros() const
        getFloatDefinitions(macros);
 
        // change tracking
-       if (mustProvide("dvipost"))
+       if (mustProvide("ct-dvipost")) {
                macros << changetracking_dvipost_def;
-       if (mustProvide("ct-none"))
+       }
+       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();
 }