X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=1ee573c9e6352d9a11c6ef9886ebf278c50881d8;hb=b73879691f816b0874d9dec0c09e2db7889c4e8e;hp=6fcf2794bb649d81f1dee8622df22dcc9cab769a;hpb=d5a5fbb8ee87d4a8ae1c55f9ba72819251bb6fb7;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 6fcf2794bb..1ee573c9e6 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -37,6 +37,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -68,7 +69,7 @@ NoteTranslator const & notetranslator()
 }
 
 
-} // anon
+} // namespace
 
 
 InsetNoteParams::InsetNoteParams()
@@ -207,24 +208,6 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
-						 UpdateType utype) const
-{
-	DocIterator pit = cpit;
-	pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
-	
-	shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
-	InsetLayout const & il = getLayout();
-	docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
-	text().forOutliner(str, TOC_ENTRY_LENGTH);
-	toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
-
-	// Proceed with the rest of the inset.
-	bool doing_output = output_active && producesOutput();
-	InsetCollapsable::addToToc(cpit, doing_output, utype);
-}
-
-
 bool InsetNote::isMacroScope() const
 {
 	// LyX note has no latex output
@@ -245,7 +228,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
-	} 
+	}
 
 	// the space after the comment in 'a[comment] b' will be eaten by the
 	// comment environment since the space before b is ignored with the
@@ -325,15 +308,15 @@ 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);
+		else
+			// Only do the requires
+			features.useInsetLayout(getLayout());
 		break;
 	case InsetNoteParams::Greyedout:
-		features.require("color");
-		features.require("lyxgreyedout");
 		InsetCollapsable::validate(features);
 		break;
 	case InsetNoteParams::Note: