[PATCH] BUG 3598. Was: wrong fix committed for bug 3598

[Bo Peng]

Uwe,

Please test the attached patch. I will wait for another OK to commit.

Cheers,
Bo

Index: src/insets/InsetNote.cpp
===================================================================
--- src/insets/InsetNote.cpp	(revision 18413)
+++ src/insets/InsetNote.cpp	(working copy)
@@ -365,10 +365,8 @@
 		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);
 }
 
Index: src/LaTeXFeatures.cpp
===================================================================
--- src/LaTeXFeatures.cpp	(revision 18413)
+++ src/LaTeXFeatures.cpp	(working copy)
@@ -480,7 +480,7 @@
 				 << "]{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";