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 874a6aaf1a0aa64b9b0948b8ba08bd1b08264a35..19f6035e0738e54b7007954109597f49ec6c497e 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -195,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);
 }
 
 
@@ -253,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;
@@ -266,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