#include "BufferView.h"
#include "ColorSet.h"
#include "Cursor.h"
-#include "DispatchResult.h"
#include "Exporter.h"
+#include "FontInfo.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "InsetLayout.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "LyXRC.h"
-#include "OutputParams.h"
#include "output_docbook.h"
-#include "ParIterator.h"
-#include "TextClass.h"
-#include "TocBackend.h"
#include "support/debug.h"
#include "support/docstream.h"
{
switch (params_.type) {
case InsetNoteParams::Comment:
- if (features.runparams().flavor == OutputParams::HTML)
+ if (features.runparams().flavor == Flavor::Html)
// we do output this but set display to "none" by default,
// but people might want to use it.
InsetCollapsible::validate(features);
FontInfo InsetNote::getFont() const
{
FontInfo font = getLayout().font();
- // FIXME: This hardcoded color is a hack!
if (params_.type == InsetNoteParams::Greyedout
- && buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) {
+ && buffer().params().isnotefontcolor) {
ColorCode c = lcolor.getFromLyXName("notefontcolor");
if (c != Color_none)
font.setColor(c);
+ // This is the local color (not overridden by other documents)
+ ColorCode lc = lcolor.getFromLyXName("notefontcolor@" + buffer().fileName().absFileName());
+ if (lc != Color_none)
+ font.setPaintColor(lc);
}
return font;
}