Fix conflicting inset font defaults (bug #8874)

[lyx.git] / src / insets / InsetNote.cpp

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index da9dd3366974382eb3c655828bbce06e49d1d393..19f6035e0738e54b7007954109597f49ec6c497e 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -18,6 +18,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "ColorSet.h"
 #include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
@@ -194,18 +195,20 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit) const
+void InsetNote::addToToc(DocIterator const & cpit, bool output_active) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
-
+       
        Toc & toc = buffer().tocBackend().toc("note");
        InsetLayout const & il = getLayout();
        docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
        text().forToc(str, TOC_ENTRY_LENGTH);
-       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
+       toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
+
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit);
+       bool doing_output = output_active && producesOutput();
+       InsetCollapsable::addToToc(cpit, doing_output);
 }
 
 
@@ -252,8 +255,8 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 }
 
 
-int InsetNote::plaintext(odocstream & os,
-                        OutputParams const & runparams_in) const
+int InsetNote::plaintext(odocstringstream & os,
+                        OutputParams const & runparams_in, size_t max_length) const
 {
        if (params_.type == InsetNoteParams::Note)
                return 0;
@@ -265,7 +268,7 @@ int InsetNote::plaintext(odocstream & os,
                runparams.exportdata.reset(new ExportData);
        }
        os << '[' << buffer().B_("note") << ":\n";
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -310,6 +313,10 @@ void InsetNote::validate(LaTeXFeatures & features) const
        switch (params_.type) {
        case InsetNoteParams::Comment:
                features.require("verbatim");
+               if (features.runparams().flavor == OutputParams::HTML)
+                       // we do output this but set display to "none" by default,
+                       // but people might want to use it.
+                       InsetCollapsable::validate(features);
                break;
        case InsetNoteParams::Greyedout:
                features.require("color");
@@ -322,9 +329,9 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenuName() const
+string InsetNote::contextMenuName() const
 {
-       return from_ascii("context-note");
+       return "context-note";
 }
 
 bool InsetNote::allowSpellCheck() const
@@ -332,6 +339,19 @@ bool InsetNote::allowSpellCheck() const
        return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes);
 }
 
+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")) {
+               ColorCode c = lcolor.getFromLyXName("notefontcolor");
+               if (c != Color_none)
+                       font.setColor(c);
+       }
+       return font;
+}
+
 
 string InsetNote::params2string(InsetNoteParams const & params)
 {