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 10afdf33fdc47555bde87773e74919e64efea872..e2fd3f1658af89b58a5c2dddb50ed5d35e6cd963 100644 (file)
--- 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 55fc6911d7c433cb279297c4c83f806e69602346..cff547b5b2ef1803e09fcbceeda8b10fbaaf31ee 100644 (file)
--- 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);
 }