From: Bo Peng <bpeng@lyx.org>
Date: Sun, 20 May 2007 02:53:19 +0000 (+0000)
Subject: Remove color dependency of framed note, fix bug 3598
X-Git-Tag: 1.6.10~9688
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e658f71f07bbf8f5e7a15fefb8c4427938a97bb2;p=features.git

Remove color dependency of framed note, fix bug 3598

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

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 10afdf33fd..e2fd3f1658 100644
--- 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";
diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 55fc6911d7..cff547b5b2 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -365,10 +365,8 @@ void InsetNote::validate(LaTeXFeatures & features) const
 		features.require("color");
 		features.require("framed");
 	}
-	if (params_.type == InsetNoteParams::Framed) {
-		features.require("color");
+	if (params_.type == InsetNoteParams::Framed)
 		features.require("framed");
-	}
 	InsetText::validate(features);
 }