X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=3f422774c1215bf7f3c39abfd9fcb07a19196c7e;hb=33103ebc371a9c27add7dc7621e54a7c110fbd05;hp=37055027862167ce14776f1b327c751b17d2dcce;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 3705502786..3f422774c1 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"
@@ -161,7 +162,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (params_.type == params.type)
 		  break;
 
-		cur.recordUndoInset(ATOMIC_UNDO, this);
+		cur.recordUndoInset(this);
 		string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
 		// what we really want here is a TOC update, but that means
@@ -207,20 +208,24 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
+						 UpdateType utype) 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().forOutliner(str, TOC_ENTRY_LENGTH);
-	toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
+	docstring tooltip;
+	text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
+	docstring str = translateIfPossible(il.labelstring()) + ": " + tooltip;
+	tooltip = support::wrapParas(tooltip, 0, 60, 2);
+	
+	shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
+	toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
 
 	// Proceed with the rest of the inset.
 	bool doing_output = output_active && producesOutput();
-	InsetCollapsable::addToToc(cpit, doing_output);
+	InsetCollapsable::addToToc(cpit, doing_output, utype);
 }
 
 
@@ -324,15 +329,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: