resolve beamer/color conflict (bug 2169)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10778 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e91e1a0c54ca68307abcf566696aced4be8425b..da39916d4b8f6c699585ae3a3a8bd44eafac3c75 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-26  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * buffer.C: change tracking (dvipost) doesn't require
+       color.sty anymore.
+
+       * LaTeXFeatures.C (getPackages): no need for the color
+       option "usenames" (bug 2169).
+
 2006-01-23  Helge Hafting <helge.hafting@aitel.hist.no>
        * buffer_funcs.C: Trivial fix - added {} around
        the statements to be affected by a if-test. Now

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 4bf391479ceca3ff925df5f4ccfac540e6341df6..2b363bdde440e907b1b3a07de85a3cd5be80e0f8 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -282,11 +282,10 @@ string const LaTeXFeatures::getPackages() const
        // color.sty
        if (isRequired("color")) {
                if (params_.graphicsDriver == "default")
-                       packages << "\\usepackage[usenames]{color}\n";
+                       packages << "\\usepackage{color}\n";
                else
                        packages << "\\usepackage["
                                 << params_.graphicsDriver
-                                << ",usenames"
                                 << "]{color}\n";
        }
 

diff --git a/src/buffer.C b/src/buffer.C
index 429907f18ac17076db2828ad70f51d5e4f806cce..d6929614c1c75121f44011a3e86f40aeb22d094c 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1157,10 +1157,8 @@ void Buffer::validate(LaTeXFeatures & features) const
        LyXTextClass const & tclass = params().getLyXTextClass();
 
        if (features.isAvailable("dvipost") && params().tracking_changes
-               && params().output_changes) {
+           && params().output_changes)
                features.require("dvipost");
-               features.require("color");
-       }
 
        // AMS Style is at document level
        if (params().use_amsmath == BufferParams::AMS_ON