* lib/layouts.memoir.layout:

	- memoir.cls provides framed.sty.
* src/LaTeXFeatures.cpp:
	- also output the shadecolor definition if framed.sty
	  is provided by a class.

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 959728429ee57051dad18109b537b5f88fe7a273..252f8bdc95651b9eb8a8197cfae1d1b581ad4905 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -13,7 +13,8 @@ SecNumDepth        2
 TocDepth           2
 DefaultStyle       Standard
 PageStyle          Headings
-Provides makeidx    1
+Provides makeidx   1
+Provides framed    1
 
 
 ClassOptions

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index e63507db45999724f340b112a4b88ad6448ec39f..72ce130ca0f1ab3bca5f01cfe74dcd6725742822 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -516,7 +516,7 @@ string const LaTeXFeatures::getPackages() const
                                 << "]{graphicx}\n";
        }
        // shadecolor for shaded
-       if (mustProvide("framed") && mustProvide("color")) {
+       if (isRequired("framed") && mustProvide("color")) {
                RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
                //255.0 to force conversion to double
                //NOTE As Jürgen Spitzmüller pointed out, an alternative would be