From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Thu, 26 Jan 2006 10:37:33 +0000 (+0000)
Subject: resolve beamer/color conflict (bug 2169)
X-Git-Tag: 1.6.10~13667
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cf9e9c930ab93574e67940f22f78635b25bc9407;p=features.git

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 3e91e1a0c5..da39916d4b 100644
--- 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 4bf391479c..2b363bdde4 100644
--- 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 429907f18a..d6929614c1 100644
--- 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