* 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 69546187dce356abef0cbc8333771386833023f4..e2fd3f1658af89b58a5c2dddb50ed5d35e6cd963 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";
 
 
 /////////////////////////////////////////////////////////////////////
@@ -411,7 +406,10 @@ char const * simplefeatures[] = {
        "nicefrac",
        "tipa",
        "framed",
+       "pdfcolmk",
+       "soul",
        "textcomp",
+       "xcolor",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -482,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";
@@ -568,6 +566,9 @@ string const LaTeXFeatures::getPackages() const
                            "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
                            "\\makenomenclature\n";
        }
+
+       if (mustProvide("listings"))
+               packages << "\\usepackage{listings}\n";
  
        return packages.str();
 }
@@ -640,10 +641,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();
 }