X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=d5e7fb324c5fc720bf6ae681c0740b115fab8059;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=e483cf2e104a6ab9db38d223e843d362b3b97b03;hpb=cf64064db71ddedb4deb888e63325cea8619a9cd;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index e483cf2e10..d5e7fb324c 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -213,15 +213,14 @@ void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
 {
 	DocIterator pit = cpit;
 	pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
-	
+
 	InsetLayout const & il = getLayout();
-	docstring tooltip;
-	text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
-	docstring str = translateIfPossible(il.labelstring()) + ": " + tooltip;
-	tooltip = support::wrapParas(tooltip, 0, 60, 2);
-	
+	docstring str;
+	text().forOutliner(str, TOC_ENTRY_LENGTH);
+	str = translateIfPossible(il.labelstring()) + ": " + str;
+
 	shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
-	toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
+	toc->push_back(TocItem(pit, 0, str, output_active));
 
 	// Proceed with the rest of the inset.
 	bool doing_output = output_active && producesOutput();
@@ -329,15 +328,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: