From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Mon, 14 Jan 2008 10:08:08 +0000 (+0000)
Subject: * src/LaTeXFeatures.cpp:
X-Git-Tag: 1.6.10~6617
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=59c8ede0a30d89ce0cee89e4ebd0c3821edf1223;p=lyx.git

* src/LaTeXFeatures.cpp:
	- load xcolor.sty the same way than color.sty, and only load one of them
	  (xcolor, if requested, else color).

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

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 80bb7cf29d..b383f0fb10 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -521,7 +521,6 @@ char const * simplefeatures[] = {
 	"framed",
 	"soul",
 	"textcomp",
-	"xcolor",
 	"pmboxdraw",
 	"bbding",
 	"ifsym",
@@ -589,14 +588,16 @@ string const LaTeXFeatures::getPackages() const
 	    (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
 		packages << "\\usepackage{wasysym}\n";
 
-	// color.sty
-	if (mustProvide("color")) {
+	// [x]color.sty
+	if (mustProvide("color") || mustProvide("xcolor")) {
+		string const package =
+			(mustProvide("xcolor") ? "xcolor" : "color");
 		if (params_.graphicsDriver == "default")
-			packages << "\\usepackage{color}\n";
+			packages << "\\usepackage{" << package << "}\n";
 		else
 			packages << "\\usepackage["
 				 << params_.graphicsDriver
-				 << "]{color}\n";
+				 << "]{" << package << "}\n";
 	}
 
 	// pdfcolmk must be loaded after color