* do not lookup the same macro all the time

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f8cd82f252c5c99289b71bf95980230afc0aa53c..e2fd3f1658af89b58a5c2dddb50ed5d35e6cd963 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -480,7 +480,7 @@ 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";
@@ -653,8 +653,8 @@ string const LaTeXFeatures::getMacros() const
                macros << "\\providecolor{lyxdeleted}{rgb}{" 
                       << cdel.r/255 << ',' << cdel.g/255 << ',' << cdel.b/255 << "}\n";
 
-               macros << "\\newcommand{\\lyxadded}[3]{\\textcolor{lyxadded}{#3}}\n"
-                      << "\\newcommand{\\lyxdeleted}[3]{\\textcolor{lyxdeleted}{\\st{#3}}}\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;